From af9184c284534f9f34c6a094e961744e2e44237d Mon Sep 17 00:00:00 2001 From: martinrotter Date: Thu, 27 Apr 2017 07:48:07 +0200 Subject: [PATCH] Rename + bump version. --- rssguard.pro | 14 ++-- src/services/owncloud/owncloudserviceroot.cpp | 2 +- ...itaccount.cpp => formeditttrssaccount.cpp} | 64 +++++++++---------- ...rmeditaccount.h => formeditttrssaccount.h} | 13 ++-- ...editaccount.ui => formeditttrssaccount.ui} | 4 +- .../tt-rss/ttrssserviceentrypoint.cpp | 4 +- src/services/tt-rss/ttrssserviceroot.cpp | 4 +- 7 files changed, 52 insertions(+), 53 deletions(-) rename src/services/tt-rss/gui/{formeditaccount.cpp => formeditttrssaccount.cpp} (86%) rename src/services/tt-rss/gui/{formeditaccount.h => formeditttrssaccount.h} (81%) rename src/services/tt-rss/gui/{formeditaccount.ui => formeditttrssaccount.ui} (95%) diff --git a/rssguard.pro b/rssguard.pro index 5ea644670..59fbcdf55 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -73,7 +73,7 @@ APP_LOW_NAME = "rssguard" APP_LOW_H_NAME = ".rssguard" APP_AUTHOR = "Martin Rotter" APP_COPYRIGHT = "(C) 2011-2016 $$APP_AUTHOR" -APP_VERSION = "3.4.0" +APP_VERSION = "3.4.1" APP_LONG_NAME = "$$APP_NAME $$APP_VERSION" APP_EMAIL = "rotter.martinos@gmail.com" APP_URL = "https://github.com/martinrotter/rssguard" @@ -305,7 +305,6 @@ HEADERS += src/core/feeddownloader.h \ src/services/standard/standardserviceentrypoint.h \ src/services/standard/standardserviceroot.h \ src/services/tt-rss/definitions.h \ - src/services/tt-rss/gui/formeditaccount.h \ src/services/tt-rss/gui/formttrssfeeddetails.h \ src/services/tt-rss/network/ttrssnetworkfactory.h \ src/services/tt-rss/ttrsscategory.h \ @@ -328,7 +327,8 @@ HEADERS += src/core/feeddownloader.h \ src/services/standard/rdfparser.h \ src/services/standard/rssparser.h \ src/miscellaneous/serviceoperator.h \ - src/services/abstract/cacheforserviceroot.h + src/services/abstract/cacheforserviceroot.h \ + src/services/tt-rss/gui/formeditttrssaccount.h SOURCES += src/core/feeddownloader.cpp \ src/core/feedsmodel.cpp \ @@ -425,7 +425,6 @@ SOURCES += src/core/feeddownloader.cpp \ src/services/standard/standardfeedsimportexportmodel.cpp \ src/services/standard/standardserviceentrypoint.cpp \ src/services/standard/standardserviceroot.cpp \ - src/services/tt-rss/gui/formeditaccount.cpp \ src/services/tt-rss/gui/formttrssfeeddetails.cpp \ src/services/tt-rss/network/ttrssnetworkfactory.cpp \ src/services/tt-rss/ttrsscategory.cpp \ @@ -448,7 +447,8 @@ SOURCES += src/core/feeddownloader.cpp \ src/services/standard/rdfparser.cpp \ src/services/standard/rssparser.cpp \ src/miscellaneous/serviceoperator.cpp \ - src/services/abstract/cacheforserviceroot.cpp + src/services/abstract/cacheforserviceroot.cpp \ + src/services/tt-rss/gui/formeditttrssaccount.cpp FORMS += src/gui/toolbareditor.ui \ src/network-web/downloaditem.ui \ @@ -465,7 +465,6 @@ FORMS += src/gui/toolbareditor.ui \ src/services/owncloud/gui/formeditowncloudaccount.ui \ src/services/standard/gui/formstandardcategorydetails.ui \ src/services/standard/gui/formstandardimportexport.ui \ - src/services/tt-rss/gui/formeditaccount.ui \ src/gui/settings/settingsgeneral.ui \ src/gui/settings/settingsdatabase.ui \ src/gui/settings/settingsshortcuts.ui \ @@ -473,7 +472,8 @@ FORMS += src/gui/toolbareditor.ui \ src/gui/settings/settingslocalization.ui \ src/gui/settings/settingsbrowsermail.ui \ src/gui/settings/settingsfeedsmessages.ui \ - src/gui/settings/settingsdownloads.ui + src/gui/settings/settingsdownloads.ui \ + src/services/tt-rss/gui/formeditttrssaccount.ui equals(USE_WEBENGINE, true) { HEADERS += src/gui/locationlineedit.h \ diff --git a/src/services/owncloud/owncloudserviceroot.cpp b/src/services/owncloud/owncloudserviceroot.cpp index 1a800b446..c1671b092 100755 --- a/src/services/owncloud/owncloudserviceroot.cpp +++ b/src/services/owncloud/owncloudserviceroot.cpp @@ -182,7 +182,7 @@ void OwnCloudServiceRoot::updateTitle() { host = m_network->url(); } - setTitle(m_network->authUsername() + QL1S("@") + host + QSL(" (ownCloud News)")); + setTitle(m_network->authUsername() + QL1S("@") + host + QSL(" (Nextcloud News)")); } void OwnCloudServiceRoot::saveAccountDataToDatabase() { diff --git a/src/services/tt-rss/gui/formeditaccount.cpp b/src/services/tt-rss/gui/formeditttrssaccount.cpp similarity index 86% rename from src/services/tt-rss/gui/formeditaccount.cpp rename to src/services/tt-rss/gui/formeditttrssaccount.cpp index f18dd76c7..406cd572c 100755 --- a/src/services/tt-rss/gui/formeditaccount.cpp +++ b/src/services/tt-rss/gui/formeditttrssaccount.cpp @@ -16,7 +16,7 @@ // along with RSS Guard. If not, see . -#include "services/tt-rss/gui/formeditaccount.h" +#include "services/tt-rss/gui/formeditttrssaccount.h" #include "services/tt-rss/definitions.h" #include "services/tt-rss/ttrssserviceroot.h" @@ -25,8 +25,8 @@ #include "network-web/networkfactory.h" -FormEditAccount::FormEditAccount(QWidget *parent) - : QDialog(parent), m_ui(new Ui::FormEditAccount), m_editableRoot(nullptr) { +FormEditTtRssAccount::FormEditTtRssAccount(QWidget *parent) + : QDialog(parent), m_ui(new Ui::FormEditTtRssAccount), m_editableRoot(nullptr) { m_ui->setupUi(this); m_btnOk = m_ui->m_buttonBox->button(QDialogButtonBox::Ok); @@ -57,21 +57,21 @@ FormEditAccount::FormEditAccount(QWidget *parent) setTabOrder(m_ui->m_checkShowHttpPassword, m_ui->m_btnTestSetup); setTabOrder(m_ui->m_btnTestSetup, m_ui->m_buttonBox); - connect(m_ui->m_checkShowPassword, &QCheckBox::toggled, this, &FormEditAccount::displayPassword); - connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &FormEditAccount::onClickedOk); - connect(m_ui->m_buttonBox, &QDialogButtonBox::rejected, this, &FormEditAccount::onClickedCancel); - connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::onPasswordChanged); - connect(m_ui->m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::onUsernameChanged); - connect(m_ui->m_txtHttpPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::onHttpPasswordChanged); - connect(m_ui->m_txtHttpUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::onHttpUsernameChanged); - connect(m_ui->m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::onUrlChanged); - connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::checkOkButton); - connect(m_ui->m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::checkOkButton); - connect(m_ui->m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::checkOkButton); - connect(m_ui->m_btnTestSetup, &QPushButton::clicked, this, &FormEditAccount::performTest); - connect(m_ui->m_gbHttpAuthentication, &QGroupBox::toggled, this, &FormEditAccount::onHttpPasswordChanged); - connect(m_ui->m_gbHttpAuthentication, &QGroupBox::toggled, this, &FormEditAccount::onHttpUsernameChanged); - connect(m_ui->m_checkShowHttpPassword, &QCheckBox::toggled, this, &FormEditAccount::displayHttpPassword); + connect(m_ui->m_checkShowPassword, &QCheckBox::toggled, this, &FormEditTtRssAccount::displayPassword); + connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &FormEditTtRssAccount::onClickedOk); + connect(m_ui->m_buttonBox, &QDialogButtonBox::rejected, this, &FormEditTtRssAccount::onClickedCancel); + connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditTtRssAccount::onPasswordChanged); + connect(m_ui->m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditTtRssAccount::onUsernameChanged); + connect(m_ui->m_txtHttpPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditTtRssAccount::onHttpPasswordChanged); + connect(m_ui->m_txtHttpUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditTtRssAccount::onHttpUsernameChanged); + connect(m_ui->m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditTtRssAccount::onUrlChanged); + connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditTtRssAccount::checkOkButton); + connect(m_ui->m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditTtRssAccount::checkOkButton); + connect(m_ui->m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditTtRssAccount::checkOkButton); + connect(m_ui->m_btnTestSetup, &QPushButton::clicked, this, &FormEditTtRssAccount::performTest); + connect(m_ui->m_gbHttpAuthentication, &QGroupBox::toggled, this, &FormEditTtRssAccount::onHttpPasswordChanged); + connect(m_ui->m_gbHttpAuthentication, &QGroupBox::toggled, this, &FormEditTtRssAccount::onHttpUsernameChanged); + connect(m_ui->m_checkShowHttpPassword, &QCheckBox::toggled, this, &FormEditTtRssAccount::displayHttpPassword); onPasswordChanged(); onUsernameChanged(); @@ -83,16 +83,16 @@ FormEditAccount::FormEditAccount(QWidget *parent) displayHttpPassword(false); } -FormEditAccount::~FormEditAccount() { +FormEditTtRssAccount::~FormEditTtRssAccount() { } -TtRssServiceRoot *FormEditAccount::execForCreate() { +TtRssServiceRoot *FormEditTtRssAccount::execForCreate() { setWindowTitle(tr("Add new Tiny Tiny RSS account")); exec(); return m_editableRoot; } -void FormEditAccount::execForEdit(TtRssServiceRoot *existing_root) { +void FormEditTtRssAccount::execForEdit(TtRssServiceRoot *existing_root) { setWindowTitle(tr("Edit existing Tiny Tiny RSS account")); m_editableRoot = existing_root; @@ -107,15 +107,15 @@ void FormEditAccount::execForEdit(TtRssServiceRoot *existing_root) { exec(); } -void FormEditAccount::displayPassword(bool display) { +void FormEditTtRssAccount::displayPassword(bool display) { m_ui->m_txtPassword->lineEdit()->setEchoMode(display ? QLineEdit::Normal : QLineEdit::Password); } -void FormEditAccount::displayHttpPassword(bool display) { +void FormEditTtRssAccount::displayHttpPassword(bool display) { m_ui->m_txtHttpPassword->lineEdit()->setEchoMode(display ? QLineEdit::Normal : QLineEdit::Password); } -void FormEditAccount::performTest() { +void FormEditTtRssAccount::performTest() { TtRssNetworkFactory factory; factory.setUsername(m_ui->m_txtUsername->lineEdit()->text()); @@ -173,7 +173,7 @@ void FormEditAccount::performTest() { } } -void FormEditAccount::onClickedOk() { +void FormEditTtRssAccount::onClickedOk() { bool editing_account = true; if (m_editableRoot == nullptr) { @@ -201,11 +201,11 @@ void FormEditAccount::onClickedOk() { } } -void FormEditAccount::onClickedCancel() { +void FormEditTtRssAccount::onClickedCancel() { reject(); } -void FormEditAccount::onUsernameChanged() { +void FormEditTtRssAccount::onUsernameChanged() { const QString username = m_ui->m_txtUsername->lineEdit()->text(); if (username.isEmpty()) { @@ -216,7 +216,7 @@ void FormEditAccount::onUsernameChanged() { } } -void FormEditAccount::onPasswordChanged() { +void FormEditTtRssAccount::onPasswordChanged() { const QString password = m_ui->m_txtPassword->lineEdit()->text(); if (password.isEmpty()) { @@ -227,7 +227,7 @@ void FormEditAccount::onPasswordChanged() { } } -void FormEditAccount::onHttpUsernameChanged() { +void FormEditTtRssAccount::onHttpUsernameChanged() { const bool is_username_ok = !m_ui->m_gbHttpAuthentication->isChecked() || !m_ui->m_txtHttpUsername->lineEdit()->text().isEmpty(); m_ui->m_txtHttpUsername->setStatus(is_username_ok ? @@ -238,7 +238,7 @@ void FormEditAccount::onHttpUsernameChanged() { tr("Username is empty.")); } -void FormEditAccount::onHttpPasswordChanged() { +void FormEditTtRssAccount::onHttpPasswordChanged() { const bool is_username_ok = !m_ui->m_gbHttpAuthentication->isChecked() || !m_ui->m_txtHttpPassword->lineEdit()->text().isEmpty(); m_ui->m_txtHttpPassword->setStatus(is_username_ok ? @@ -249,7 +249,7 @@ void FormEditAccount::onHttpPasswordChanged() { tr("Password is empty.")); } -void FormEditAccount::onUrlChanged() { +void FormEditTtRssAccount::onUrlChanged() { const QString url = m_ui->m_txtUrl->lineEdit()->text(); if (url.isEmpty()) { @@ -263,7 +263,7 @@ void FormEditAccount::onUrlChanged() { } } -void FormEditAccount::checkOkButton() { +void FormEditTtRssAccount::checkOkButton() { m_btnOk->setEnabled(!m_ui->m_txtUsername->lineEdit()->text().isEmpty() && !m_ui->m_txtPassword->lineEdit()->text().isEmpty() && !m_ui->m_txtUrl->lineEdit()->text().isEmpty()); diff --git a/src/services/tt-rss/gui/formeditaccount.h b/src/services/tt-rss/gui/formeditttrssaccount.h similarity index 81% rename from src/services/tt-rss/gui/formeditaccount.h rename to src/services/tt-rss/gui/formeditttrssaccount.h index 8a431813d..827cd4a9c 100755 --- a/src/services/tt-rss/gui/formeditaccount.h +++ b/src/services/tt-rss/gui/formeditttrssaccount.h @@ -15,27 +15,26 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . - #ifndef FORMEDITACCOUNT_H #define FORMEDITACCOUNT_H #include -#include "ui_formeditaccount.h" +#include "ui_formeditttrssaccount.h" namespace Ui { - class FormEditAccount; + class FormEditTtRssAccount; } class TtRssServiceRoot; -class FormEditAccount : public QDialog { +class FormEditTtRssAccount : public QDialog { Q_OBJECT public: - explicit FormEditAccount(QWidget *parent = 0); - virtual ~FormEditAccount(); + explicit FormEditTtRssAccount(QWidget *parent = 0); + virtual ~FormEditTtRssAccount(); TtRssServiceRoot *execForCreate(); void execForEdit(TtRssServiceRoot *existing_root); @@ -55,7 +54,7 @@ class FormEditAccount : public QDialog { void checkOkButton(); private: - QScopedPointer m_ui; + QScopedPointer m_ui; TtRssServiceRoot *m_editableRoot; QPushButton *m_btnOk; }; diff --git a/src/services/tt-rss/gui/formeditaccount.ui b/src/services/tt-rss/gui/formeditttrssaccount.ui similarity index 95% rename from src/services/tt-rss/gui/formeditaccount.ui rename to src/services/tt-rss/gui/formeditttrssaccount.ui index 07422e9c1..a0f42bf28 100755 --- a/src/services/tt-rss/gui/formeditaccount.ui +++ b/src/services/tt-rss/gui/formeditttrssaccount.ui @@ -1,7 +1,7 @@ - FormEditAccount - + FormEditTtRssAccount + 0 diff --git a/src/services/tt-rss/ttrssserviceentrypoint.cpp b/src/services/tt-rss/ttrssserviceentrypoint.cpp index dc2f2dbaa..577402d03 100755 --- a/src/services/tt-rss/ttrssserviceentrypoint.cpp +++ b/src/services/tt-rss/ttrssserviceentrypoint.cpp @@ -22,7 +22,7 @@ #include "miscellaneous/databasequeries.h" #include "services/tt-rss/definitions.h" #include "services/tt-rss/ttrssserviceroot.h" -#include "services/tt-rss/gui/formeditaccount.h" +#include "services/tt-rss/gui/formeditttrssaccount.h" #include @@ -66,7 +66,7 @@ QString TtRssServiceEntryPoint::code() const { } ServiceRoot *TtRssServiceEntryPoint::createNewRoot() const { - QScopedPointer form_acc(new FormEditAccount(qApp->mainFormWidget())); + QScopedPointer form_acc(new FormEditTtRssAccount(qApp->mainFormWidget())); return form_acc->execForCreate(); } diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/services/tt-rss/ttrssserviceroot.cpp index 6e9b00e5f..1c909c460 100755 --- a/src/services/tt-rss/ttrssserviceroot.cpp +++ b/src/services/tt-rss/ttrssserviceroot.cpp @@ -30,7 +30,7 @@ #include "services/tt-rss/ttrsscategory.h" #include "services/tt-rss/definitions.h" #include "services/tt-rss/network/ttrssnetworkfactory.h" -#include "services/tt-rss/gui/formeditaccount.h" +#include "services/tt-rss/gui/formeditttrssaccount.h" #include "services/tt-rss/gui/formttrssfeeddetails.h" #include @@ -68,7 +68,7 @@ QString TtRssServiceRoot::code() const { } bool TtRssServiceRoot::editViaGui() { - QScopedPointer form_pointer(new FormEditAccount(qApp->mainFormWidget())); + QScopedPointer form_pointer(new FormEditTtRssAccount(qApp->mainFormWidget())); form_pointer.data()->execForEdit(this); return true;