diff --git a/localization/rssguard_cs.ts b/localization/rssguard_cs.ts index 25efb55ab..57c7b203e 100644 --- a/localization/rssguard_cs.ts +++ b/localization/rssguard_cs.ts @@ -636,6 +636,10 @@ or this functionality is not implemented yet. Context menu for accounts Kontextové menu pro účty + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_da.ts b/localization/rssguard_da.ts index dd2e41b2f..79a788931 100644 --- a/localization/rssguard_da.ts +++ b/localization/rssguard_da.ts @@ -630,6 +630,10 @@ or this functionality is not implemented yet. Context menu for accounts Genvejsmenu for konti + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_de.ts b/localization/rssguard_de.ts index 375fa8bb1..038e0c7f8 100644 --- a/localization/rssguard_de.ts +++ b/localization/rssguard_de.ts @@ -632,6 +632,10 @@ or this functionality is not implemented yet. Context menu for accounts Kontextmenü für Benutzerkonten + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts index 51c4b66c1..5c25ad1ce 100644 --- a/localization/rssguard_en.ts +++ b/localization/rssguard_en.ts @@ -655,6 +655,10 @@ or this functionality is not implemented yet. Context menu for accounts + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_es.ts b/localization/rssguard_es.ts index 1427724a8..1abd4ddd7 100755 --- a/localization/rssguard_es.ts +++ b/localization/rssguard_es.ts @@ -633,6 +633,10 @@ o debido a que esta función aún no está implementada. Context menu for accounts Menú contextual para las cuentas + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_fr.ts b/localization/rssguard_fr.ts index 17fa08bc5..cc7ff9cec 100644 --- a/localization/rssguard_fr.ts +++ b/localization/rssguard_fr.ts @@ -633,6 +633,10 @@ ou cette fonctionnalité n'est pas encore implémentée. Context menu for accounts + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_gl.ts b/localization/rssguard_gl.ts index 739fef0d4..127b8ecbc 100644 --- a/localization/rssguard_gl.ts +++ b/localization/rssguard_gl.ts @@ -631,6 +631,10 @@ or this functionality is not implemented yet. Context menu for accounts Menú contextual para contas + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_he.ts b/localization/rssguard_he.ts index 90a6fe948..bb75d6a13 100644 --- a/localization/rssguard_he.ts +++ b/localization/rssguard_he.ts @@ -629,6 +629,10 @@ or this functionality is not implemented yet. Context menu for accounts + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_id.ts b/localization/rssguard_id.ts index 01ac70b3c..788cb8275 100644 --- a/localization/rssguard_id.ts +++ b/localization/rssguard_id.ts @@ -632,6 +632,10 @@ atau fungsi ini belum diimplementasikan. Context menu for accounts + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_it.ts b/localization/rssguard_it.ts index 4e445db16..850a19fc6 100644 --- a/localization/rssguard_it.ts +++ b/localization/rssguard_it.ts @@ -633,6 +633,10 @@ oppure questa funzionalità non è ancora implementata. Context menu for accounts + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_ja.ts b/localization/rssguard_ja.ts index 4bd0a0e6b..47d0e5623 100644 --- a/localization/rssguard_ja.ts +++ b/localization/rssguard_ja.ts @@ -629,6 +629,10 @@ or this functionality is not implemented yet. Context menu for accounts + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_lt.ts b/localization/rssguard_lt.ts index 688f29554..61e333cca 100644 --- a/localization/rssguard_lt.ts +++ b/localization/rssguard_lt.ts @@ -636,6 +636,10 @@ arba šis funkcionalumas dar nėra įgyvendintas. Context menu for accounts Kontekstinis meniu paskyroms + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_nl.ts b/localization/rssguard_nl.ts index faa7f2c2b..1cc467601 100644 --- a/localization/rssguard_nl.ts +++ b/localization/rssguard_nl.ts @@ -634,6 +634,10 @@ of omdat deze functie nog niet is geïmplementeerd. Context menu for accounts Rechtermuisknopmenu van accounts + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_pl.ts b/localization/rssguard_pl.ts index a046b61ba..0d4fe8d33 100644 --- a/localization/rssguard_pl.ts +++ b/localization/rssguard_pl.ts @@ -635,6 +635,10 @@ lub ta funkcja nie jest jeszcze zaimplementowana, Context menu for accounts + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_pt.ts b/localization/rssguard_pt.ts index ddc8e77f9..79b05c4a9 100644 --- a/localization/rssguard_pt.ts +++ b/localization/rssguard_pt.ts @@ -634,6 +634,10 @@ ou esta função ainda não foi implementada. Context menu for accounts Menu de contexto para contas + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_ru.ts b/localization/rssguard_ru.ts index 80a8bc1f5..6c1d99c95 100644 --- a/localization/rssguard_ru.ts +++ b/localization/rssguard_ru.ts @@ -635,6 +635,10 @@ or this functionality is not implemented yet. Context menu for accounts Контекстное меню для аккаунтов + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_sv.ts b/localization/rssguard_sv.ts index 4286169bc..b36c07423 100644 --- a/localization/rssguard_sv.ts +++ b/localization/rssguard_sv.ts @@ -634,6 +634,10 @@ att funktionen inte är implementerad än. Context menu for accounts Kontextmeny för konton + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_uk.ts b/localization/rssguard_uk.ts index 1cd0b8c3f..9893be9a0 100644 --- a/localization/rssguard_uk.ts +++ b/localization/rssguard_uk.ts @@ -632,6 +632,10 @@ or this functionality is not implemented yet. Context menu for accounts Контекстне меню для облікових записів + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_zh_CN.ts b/localization/rssguard_zh_CN.ts index 6e15781c2..62fab3bc7 100755 --- a/localization/rssguard_zh_CN.ts +++ b/localization/rssguard_zh_CN.ts @@ -632,6 +632,10 @@ or this functionality is not implemented yet. Context menu for accounts 账户的上下文菜单 + + Context menu for important messages + + FormAbout diff --git a/localization/rssguard_zh_TW.ts b/localization/rssguard_zh_TW.ts index cdd5a03d3..64dd86bb8 100755 --- a/localization/rssguard_zh_TW.ts +++ b/localization/rssguard_zh_TW.ts @@ -633,6 +633,10 @@ or this functionality is not implemented yet. Context menu for accounts 帳號之右鍵功能表 + + Context menu for important messages + + FormAbout diff --git a/resources/sql.qrc b/resources/sql.qrc index ce17db495..756e5d000 100755 --- a/resources/sql.qrc +++ b/resources/sql.qrc @@ -13,6 +13,7 @@ sql/db_update_mysql_10_11.sql sql/db_update_mysql_11_12.sql sql/db_update_mysql_12_13.sql + sql/db_update_mysql_13_14.sql sql/db_init_sqlite.sql sql/db_update_sqlite_1_2.sql @@ -27,5 +28,6 @@ sql/db_update_sqlite_10_11.sql sql/db_update_sqlite_11_12.sql sql/db_update_sqlite_12_13.sql + sql/db_update_sqlite_13_14.sql \ No newline at end of file diff --git a/resources/sql/db_init_mysql.sql b/resources/sql/db_init_mysql.sql index 589dba164..ef73f2f38 100644 --- a/resources/sql/db_init_mysql.sql +++ b/resources/sql/db_init_mysql.sql @@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS Information ( inf_value TEXT NOT NULL ); -- ! -INSERT INTO Information VALUES (1, 'schema_version', '13'); +INSERT INTO Information VALUES (1, 'schema_version', '14'); -- ! CREATE TABLE IF NOT EXISTS Accounts ( id INTEGER PRIMARY KEY, @@ -40,6 +40,7 @@ CREATE TABLE IF NOT EXISTS OwnCloudAccounts ( url TEXT NOT NULL, force_update INTEGER(1) NOT NULL DEFAULT 0 CHECK (force_update >= 0 AND force_update <= 1), msg_limit INTEGER NOT NULL DEFAULT -1 CHECK (msg_limit >= -1), + update_only_unread INTEGER(1) NOT NULL DEFAULT 0 CHECK (update_only_unread >= 0 AND update_only_unread <= 1), FOREIGN KEY (id) REFERENCES Accounts (id) ); diff --git a/resources/sql/db_init_sqlite.sql b/resources/sql/db_init_sqlite.sql index 55b389663..d7980c763 100644 --- a/resources/sql/db_init_sqlite.sql +++ b/resources/sql/db_init_sqlite.sql @@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS Information ( inf_value TEXT NOT NULL ); -- ! -INSERT INTO Information VALUES (1, 'schema_version', '13'); +INSERT INTO Information VALUES (1, 'schema_version', '14'); -- ! CREATE TABLE IF NOT EXISTS Accounts ( id INTEGER PRIMARY KEY, @@ -28,12 +28,13 @@ CREATE TABLE IF NOT EXISTS TtRssAccounts ( ); -- ! CREATE TABLE IF NOT EXISTS OwnCloudAccounts ( - id INTEGER, - username TEXT NOT NULL, - password TEXT, - url TEXT NOT NULL, - force_update INTEGER(1) NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0, - msg_limit INTEGER NOT NULL DEFAULT -1 CHECK (msg_limit >= -1), + id INTEGER, + username TEXT NOT NULL, + password TEXT, + url TEXT NOT NULL, + force_update INTEGER(1) NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0, + msg_limit INTEGER NOT NULL DEFAULT -1 CHECK (msg_limit >= -1), + update_only_unread INTEGER(1) NOT NULL CHECK (update_only_unread >= 0 AND update_only_unread <= 1) DEFAULT 0, FOREIGN KEY (id) REFERENCES Accounts (id) ); diff --git a/resources/sql/db_update_mysql_13_14.sql b/resources/sql/db_update_mysql_13_14.sql new file mode 100755 index 000000000..5fbbde118 --- /dev/null +++ b/resources/sql/db_update_mysql_13_14.sql @@ -0,0 +1,4 @@ +ALTER TABLE OwnCloudAccounts +ADD COLUMN update_only_unread INTEGER(1) NOT NULL DEFAULT 0 CHECK (update_only_unread >= 0 AND update_only_unread <= 1); +-- ! +UPDATE Information SET inf_value = '14' WHERE inf_key = 'schema_version'; \ No newline at end of file diff --git a/resources/sql/db_update_sqlite_13_14.sql b/resources/sql/db_update_sqlite_13_14.sql new file mode 100755 index 000000000..20dcd8ee2 --- /dev/null +++ b/resources/sql/db_update_sqlite_13_14.sql @@ -0,0 +1,22 @@ +CREATE TABLE backup_ta AS SELECT * FROM OwnCloudAccounts; +-- ! +DROP TABLE OwnCloudAccounts; +-- ! +CREATE TABLE IF NOT EXISTS OwnCloudAccounts ( + id INTEGER, + username TEXT NOT NULL, + password TEXT, + url TEXT NOT NULL, + force_update INTEGER(1) NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0, + msg_limit INTEGER NOT NULL DEFAULT -1 CHECK (msg_limit >= -1), + update_only_unread INTEGER(1) NOT NULL CHECK (update_only_unread >= 0 AND update_only_unread <= 1) DEFAULT 0, + + FOREIGN KEY (id) REFERENCES Accounts (id) +); +-- ! +INSERT INTO OwnCloudAccounts (id, username, password, url, force_update, msg_limit, update_only_unread) +SELECT id, username, password, url, force_update, msg_limit, 0 FROM backup_ta; +-- ! +DROP TABLE backup_ta; +-- ! +UPDATE Information SET inf_value = '14' WHERE inf_key = 'schema_version'; \ No newline at end of file diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h index f63578779..fd4a60a6c 100755 --- a/src/librssguard/definitions/definitions.h +++ b/src/librssguard/definitions/definitions.h @@ -113,7 +113,7 @@ #define APP_DB_SQLITE_FILE "database.db" // Keep this in sync with schema versions declared in SQL initialization code. -#define APP_DB_SCHEMA_VERSION "13" +#define APP_DB_SCHEMA_VERSION "14" #define APP_DB_UPDATE_FILE_PATTERN "db_update_%1_%2_%3.sql" #define APP_DB_COMMENT_SPLIT "-- !\n" #define APP_DB_NAME_PLACEHOLDER "##" diff --git a/src/librssguard/miscellaneous/databasefactory.cpp b/src/librssguard/miscellaneous/databasefactory.cpp index 81738e014..98fb27f20 100644 --- a/src/librssguard/miscellaneous/databasefactory.cpp +++ b/src/librssguard/miscellaneous/databasefactory.cpp @@ -143,7 +143,7 @@ QString DatabaseFactory::mysqlInterpretErrorCode(MySQLError error_code) const { default: //: Unknown MySQL error arised. - return tr("Unknown error."); + return tr("Unknown error: '%1'.").arg(int(error_code)); } } diff --git a/src/librssguard/miscellaneous/databasequeries.cpp b/src/librssguard/miscellaneous/databasequeries.cpp index f00fcb003..900753d1c 100755 --- a/src/librssguard/miscellaneous/databasequeries.cpp +++ b/src/librssguard/miscellaneous/databasequeries.cpp @@ -623,7 +623,7 @@ int DatabaseQueries::updateMessages(QSqlDatabase db, } else { // We can recognize existing messages via their custom ID. - // NOTE: This concerns messages from custom accounts, like TT-RSS or ownCloud News. + // NOTE: This concerns messages from custom accounts, like TT-RSS or Nextcloud News. query_select_with_id.bindValue(QSL(":account_id"), account_id); query_select_with_id.bindValue(QSL(":custom_id"), unnulifyString(message.m_customId)); @@ -1119,7 +1119,7 @@ bool DatabaseQueries::overwriteOwnCloudAccount(const QSqlDatabase& db, const QSt return true; } else { - qWarning("ownCloud: Updating account failed: '%s'.", qPrintable(query.lastError().text())); + qWarning("Nextcloud: Updating account failed: '%s'.", qPrintable(query.lastError().text())); return false; } } @@ -1142,7 +1142,7 @@ bool DatabaseQueries::createOwnCloudAccount(const QSqlDatabase& db, int id_to_as return true; } else { - qWarning("ownCloud: Inserting of new account failed: '%s'.", qPrintable(q.lastError().text())); + qWarning("Nextcloud: Inserting of new account failed: '%s'.", qPrintable(q.lastError().text())); return false; } } @@ -1193,7 +1193,7 @@ Assignment DatabaseQueries::getOwnCloudFeeds(const QSqlDatabase& db, int account q.bindValue(QSL(":account_id"), account_id); if (!q.exec()) { - qFatal("ownCloud: Query for obtaining feeds failed. Error message: '%s'.", qPrintable(q.lastError().text())); + qFatal("Nextcloud: Query for obtaining feeds failed. Error message: '%s'.", qPrintable(q.lastError().text())); if (ok != nullptr) { *ok = false; diff --git a/src/librssguard/miscellaneous/databasequeries.h b/src/librssguard/miscellaneous/databasequeries.h index 3c5839b76..fe1cc72cb 100644 --- a/src/librssguard/miscellaneous/databasequeries.h +++ b/src/librssguard/miscellaneous/databasequeries.h @@ -98,7 +98,7 @@ class DatabaseQueries { const QString& app_id, const QString& app_key, const QString& redirect_url, const QString& refresh_token, int batch_size); - // ownCloud account. + // Nextcloud account. static QList getOwnCloudAccounts(const QSqlDatabase& db, bool* ok = nullptr); static bool deleteOwnCloudAccount(const QSqlDatabase& db, int account_id); static bool overwriteOwnCloudAccount(const QSqlDatabase& db, const QString& username, const QString& password, diff --git a/src/librssguard/services/abstract/serviceroot.cpp b/src/librssguard/services/abstract/serviceroot.cpp index e209f57df..242dadf5e 100644 --- a/src/librssguard/services/abstract/serviceroot.cpp +++ b/src/librssguard/services/abstract/serviceroot.cpp @@ -534,7 +534,7 @@ bool ServiceRoot::onBeforeSwitchMessageImportance(RootItem* selected_item, const auto cache = dynamic_cast(this); if (cache != nullptr) { - // Now, we need to separate the changes because of ownCloud API limitations. + // Now, we need to separate the changes because of Nextcloud API limitations. QList mark_starred_msgs; QList mark_unstarred_msgs; diff --git a/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp b/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp index 00462ca9b..9fb008440 100644 --- a/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp +++ b/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp @@ -94,7 +94,6 @@ QList GmailNetworkFactory::messages(const QString& stream_id, Feed::Sta QEventLoop loop; QString bearer = m_oauth2->bearer().toLocal8Bit(); QString next_page_token; - QList messages; if (bearer.isEmpty()) { @@ -126,7 +125,6 @@ QList GmailNetworkFactory::messages(const QString& stream_id, Feed::Sta if (downloader.lastOutputError() == QNetworkReply::NetworkError::NoError) { // We parse this chunk. QString messages_data = downloader.lastOutputData(); - QList more_messages = decodeLiteMessages(messages_data, stream_id, next_page_token); QList full_messages; @@ -166,6 +164,7 @@ void GmailNetworkFactory::markMessagesRead(RootItem::ReadStatus status, const QS } QList> headers; + headers.append(QPair(QString(HTTP_HEADERS_AUTHORIZATION).toLocal8Bit(), m_oauth2->bearer().toLocal8Bit())); headers.append(QPair(QString(HTTP_HEADERS_CONTENT_TYPE).toLocal8Bit(), @@ -218,6 +217,7 @@ void GmailNetworkFactory::markMessagesStarred(RootItem::Importance importance, c } QList> headers; + headers.append(QPair(QString(HTTP_HEADERS_AUTHORIZATION).toLocal8Bit(), m_oauth2->bearer().toLocal8Bit())); headers.append(QPair(QString(HTTP_HEADERS_CONTENT_TYPE).toLocal8Bit(), @@ -492,7 +492,7 @@ QList GmailNetworkFactory::decodeLiteMessages(const QString& messages_j cats.insert(category->customId(), category); - // All categories in ownCloud are top-level. + // All categories in Nextcloud are top-level. parent->appendChild(category); } } diff --git a/src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp b/src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp index 9af44f94d..c16d88e5c 100644 --- a/src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp +++ b/src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp @@ -156,6 +156,7 @@ void InoreaderNetworkFactory::markMessagesRead(RootItem::ReadStatus status, cons } QList> headers; + headers.append(QPair(QString(HTTP_HEADERS_AUTHORIZATION).toLocal8Bit(), m_oauth2->bearer().toLocal8Bit())); @@ -224,6 +225,7 @@ void InoreaderNetworkFactory::markMessagesStarred(RootItem::Importance importanc } QList> headers; + headers.append(QPair(QString(HTTP_HEADERS_AUTHORIZATION).toLocal8Bit(), m_oauth2->bearer().toLocal8Bit())); @@ -363,8 +365,8 @@ QList InoreaderNetworkFactory::decodeMessages(const QString& messages_j RootItem* InoreaderNetworkFactory::decodeFeedCategoriesData(const QString& categories, const QString& feeds, bool obtain_icons) { auto* parent = new RootItem(); QJsonArray json = QJsonDocument::fromJson(categories.toUtf8()).object()["tags"].toArray(); - QMap cats; + cats.insert(QString(), parent); for (const QJsonValue& obj : json) { @@ -380,8 +382,6 @@ RootItem* InoreaderNetworkFactory::decodeFeedCategoriesData(const QString& categ category->setCustomId(label_id); cats.insert(category->customId(), category); - - // All categories in ownCloud are top-level. parent->appendChild(category); } } diff --git a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp index 3ec1fbe5e..a3576987d 100644 --- a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp +++ b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp @@ -14,14 +14,14 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent) m_ui->setupUi(this); m_btnOk = m_ui->m_buttonBox->button(QDialogButtonBox::Ok); - GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("owncloud"))); + GuiUtilities::applyDialogProperties(*this, qApp->icons()->miscIcon(QSL("nextcloud"))); 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_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your ownCloud account")); - m_ui->m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your ownCloud account")); - m_ui->m_txtUrl->lineEdit()->setPlaceholderText(tr("URL of your ownCloud server, without any API path")); + m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your Nextcloud account")); + m_ui->m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your Nextcloud account")); + m_ui->m_txtUrl->lineEdit()->setPlaceholderText(tr("URL of your Nextcloud server, without any API path")); m_ui->m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Information, tr("No test done yet."), tr("Here, results of connection test are shown.")); @@ -70,13 +70,13 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent) FormEditOwnCloudAccount::~FormEditOwnCloudAccount() = default; OwnCloudServiceRoot* FormEditOwnCloudAccount::execForCreate() { - setWindowTitle(tr("Add new ownCloud News account")); + setWindowTitle(tr("Add new Nextcloud News account")); exec(); return m_editableRoot; } void FormEditOwnCloudAccount::execForEdit(OwnCloudServiceRoot* existing_root) { - setWindowTitle(tr("Edit existing ownCloud News account")); + setWindowTitle(tr("Edit existing Nextcloud News account")); m_editableRoot = existing_root; m_ui->m_txtUsername->lineEdit()->setText(existing_root->network()->authUsername()); @@ -106,24 +106,24 @@ void FormEditOwnCloudAccount::performTest() { if (!SystemFactory::isVersionEqualOrNewer(result.version(), OWNCLOUD_MIN_VERSION)) { m_ui->m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Error, tr( - "Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.").arg( + "Selected Nextcloud News server is running unsupported version (%1). At least version %2 is required.").arg( result.version(), OWNCLOUD_MIN_VERSION), - tr("Selected ownCloud News server is running unsupported version.")); + tr("Selected Nextcloud News server is running unsupported version.")); } else { m_ui->m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Ok, tr( - "ownCloud News server is okay, running with version %1, while at least version %2 is required.").arg( + "Nextcloud News server is okay, running with version %1, while at least version %2 is required.").arg( result.version(), OWNCLOUD_MIN_VERSION), - tr("ownCloud News server is okay.")); + tr("Nextcloud News server is okay.")); } } else if (factory.lastError() != QNetworkReply::NoError) { m_ui->m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Error, tr("Network error: '%1'.").arg(NetworkFactory::networkErrorText(factory.lastError())), - tr("Network error, have you entered correct ownCloud endpoint and password?")); + tr("Network error, have you entered correct Nextcloud endpoint and password?")); } else { m_ui->m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Error, diff --git a/src/librssguard/services/owncloud/gui/formowncloudfeeddetails.cpp b/src/librssguard/services/owncloud/gui/formowncloudfeeddetails.cpp index 07e7f851c..da95a2aee 100644 --- a/src/librssguard/services/owncloud/gui/formowncloudfeeddetails.cpp +++ b/src/librssguard/services/owncloud/gui/formowncloudfeeddetails.cpp @@ -29,7 +29,7 @@ void FormOwnCloudFeedDetails::apply() { if (m_ui->m_txtTitle->lineEdit()->text() != m_editableFeed->title()) { if (!qobject_cast(m_serviceRoot)->network()->renameFeed(m_ui->m_txtTitle->lineEdit()->text(), m_editableFeed->customId())) { - qWarning("ownCloud: Problem with feed renaming ID '%s'.", qPrintable(m_editableFeed->customId())); + qWarning("Nextcloud: Problem with feed renaming ID '%s'.", qPrintable(m_editableFeed->customId())); } else { renamed = true; diff --git a/src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp b/src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp index f7bf76828..26ce2ba60 100644 --- a/src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp +++ b/src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp @@ -98,7 +98,7 @@ OwnCloudUserResponse OwnCloudNetworkFactory::userInfo() { OwnCloudUserResponse user_response(QString::fromUtf8(result_raw)); if (network_reply.first != QNetworkReply::NoError) { - qWarning("ownCloud: Obtaining user info failed with error %d.", network_reply.first); + qWarning("Nextcloud: Obtaining user info failed with error %d.", network_reply.first); } m_lastError = network_reply.first; @@ -121,7 +121,7 @@ OwnCloudStatusResponse OwnCloudNetworkFactory::status() { OwnCloudStatusResponse status_response(QString::fromUtf8(result_raw)); if (network_reply.first != QNetworkReply::NoError) { - qWarning("ownCloud: Obtaining status info failed with error %d.", network_reply.first); + qWarning("Nextcloud: Obtaining status info failed with error %d.", network_reply.first); } m_lastError = network_reply.first; @@ -143,7 +143,7 @@ OwnCloudGetFeedsCategoriesResponse OwnCloudNetworkFactory::feedsCategories() { headers); if (network_reply.first != QNetworkReply::NoError) { - qWarning("ownCloud: Obtaining of categories failed with error %d.", network_reply.first); + qWarning("Nextcloud: Obtaining of categories failed with error %d.", network_reply.first); m_lastError = network_reply.first; return OwnCloudGetFeedsCategoriesResponse(); } @@ -159,7 +159,7 @@ OwnCloudGetFeedsCategoriesResponse OwnCloudNetworkFactory::feedsCategories() { headers); if (network_reply.first != QNetworkReply::NoError) { - qWarning("ownCloud: Obtaining of feeds failed with error %d.", network_reply.first); + qWarning("Nextcloud: Obtaining of feeds failed with error %d.", network_reply.first); m_lastError = network_reply.first; return OwnCloudGetFeedsCategoriesResponse(); } @@ -187,7 +187,7 @@ bool OwnCloudNetworkFactory::deleteFeed(const QString& feed_id) { m_lastError = network_reply.first; if (network_reply.first != QNetworkReply::NoError) { - qWarning("ownCloud: Obtaining of categories failed with error %d.", network_reply.first); + qWarning("Nextcloud: Obtaining of categories failed with error %d.", network_reply.first); return false; } else { @@ -218,7 +218,7 @@ bool OwnCloudNetworkFactory::createFeed(const QString& url, int parent_id) { m_lastError = network_reply.first; if (network_reply.first != QNetworkReply::NoError) { - qWarning("ownCloud: Creating of category failed with error %d.", network_reply.first); + qWarning("Nextcloud: Creating of category failed with error %d.", network_reply.first); return false; } else { @@ -249,7 +249,7 @@ bool OwnCloudNetworkFactory::renameFeed(const QString& new_name, const QString& m_lastError = network_reply.first; if (network_reply.first != QNetworkReply::NoError) { - qWarning("ownCloud: Renaming of feed failed with error %d.", network_reply.first); + qWarning("Nextcloud: Renaming of feed failed with error %d.", network_reply.first); return false; } else { @@ -280,7 +280,7 @@ OwnCloudGetMessagesResponse OwnCloudNetworkFactory::getMessages(int feed_id) { OwnCloudGetMessagesResponse msgs_response(QString::fromUtf8(result_raw)); if (network_reply.first != QNetworkReply::NoError) { - qWarning("ownCloud: Obtaining messages failed with error %d.", network_reply.first); + qWarning("Nextcloud: Obtaining messages failed with error %d.", network_reply.first); } m_lastError = network_reply.first; @@ -317,7 +317,7 @@ QNetworkReply::NetworkError OwnCloudNetworkFactory::triggerFeedUpdate(int feed_i headers); if (network_reply.first != QNetworkReply::NoError) { - qWarning("ownCloud: Feeds update failed with error %d.", network_reply.first); + qWarning("Nextcloud: Feeds update failed with error %d.", network_reply.first); } return (m_lastError = network_reply.first); @@ -537,7 +537,7 @@ RootItem* OwnCloudGetFeedsCategoriesResponse::feedsCategories(bool obtain_icons) category->setCustomId(QString::number(item["id"].toInt())); cats.insert(category->customId(), category); - // All categories in ownCloud are top-level. + // All categories in Nextcloud are top-level. parent->appendChild(category); } diff --git a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp index 467414289..b8f2e2c64 100644 --- a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp +++ b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp @@ -14,7 +14,7 @@ FormEditTtRssAccount::FormEditTtRssAccount(QWidget* parent) m_ui->setupUi(this); m_btnOk = m_ui->m_buttonBox->button(QDialogButtonBox::Ok); - GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("tinytinyrss"))); + GuiUtilities::applyDialogProperties(*this, qApp->icons()->miscIcon(QSL("tt-rss"))); m_ui->m_lblTestResult->label()->setWordWrap(true); m_ui->m_lblServerSideUpdateInformation->setText(tr("Leaving this option on causes that updates "