Some minor stuff.
This commit is contained in:
parent
d60ce597ac
commit
2956880d10
@ -35,8 +35,8 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget *parent)
|
|||||||
m_ui->m_lblServerSideUpdateInformation->setText(tr("Leaving this option on causes that updates "
|
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."));
|
"of feeds will be probably much slower and may time-out often."));
|
||||||
m_ui->m_lblDescription->setText(tr("Note that at least version %1 is required.").arg(MINIMAL_OC_VERSION));
|
m_ui->m_lblDescription->setText(tr("Note that at least version %1 is required.").arg(MINIMAL_OC_VERSION));
|
||||||
m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your TT-RSS account"));
|
m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your ownCloud account"));
|
||||||
m_ui->m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your TT-RSS 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_txtUrl->lineEdit()->setPlaceholderText(tr("URL of your ownCloud server, without any API path"));
|
||||||
m_ui->m_lblTestResult->setStatus(WidgetWithStatus::Information,
|
m_ui->m_lblTestResult->setStatus(WidgetWithStatus::Information,
|
||||||
tr("No test done yet."),
|
tr("No test done yet."),
|
||||||
@ -111,9 +111,9 @@ void FormEditOwnCloudAccount::performTest() {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
m_ui->m_lblTestResult->setStatus(WidgetWithStatus::Ok,
|
m_ui->m_lblTestResult->setStatus(WidgetWithStatus::Ok,
|
||||||
tr("OwnCloud News server is okay, running with version %1, while at least version %2 is required.").arg(result.version(),
|
tr("ownCloud News server is okay, running with version %1, while at least version %2 is required.").arg(result.version(),
|
||||||
MINIMAL_OC_VERSION),
|
MINIMAL_OC_VERSION),
|
||||||
tr("OwnCloud News server is okay."));
|
tr("ownCloud News server is okay."));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (factory.lastError() != QNetworkReply::NoError) {
|
else if (factory.lastError() != QNetworkReply::NoError) {
|
||||||
|
@ -195,7 +195,7 @@ void OwnCloudServiceRoot::saveAccountDataToDatabase() {
|
|||||||
itemChanged(QList<RootItem*>() << this);
|
itemChanged(QList<RootItem*>() << this);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qWarning("OwnCloud: Updating account failed: '%s'.", qPrintable(query.lastError().text()));
|
qWarning("ownCloud: Updating account failed: '%s'.", qPrintable(query.lastError().text()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -205,7 +205,7 @@ void OwnCloudServiceRoot::saveAccountDataToDatabase() {
|
|||||||
|
|
||||||
// First obtain the ID, which can be assigned to this new account.
|
// First obtain the ID, which can be assigned to this new account.
|
||||||
if (!query.exec("SELECT max(id) FROM Accounts;") || !query.next()) {
|
if (!query.exec("SELECT max(id) FROM Accounts;") || !query.next()) {
|
||||||
qWarning("OwnCloud: Getting max ID from Accounts table failed: '%s'.", qPrintable(query.lastError().text()));
|
qWarning("ownCloud: Getting max ID from Accounts table failed: '%s'.", qPrintable(query.lastError().text()));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -234,7 +234,7 @@ void OwnCloudServiceRoot::saveAccountDataToDatabase() {
|
|||||||
updateTitle();
|
updateTitle();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qWarning("OwnCloud: Saving of new account failed: '%s'.", qPrintable(query.lastError().text()));
|
qWarning("ownCloud: Saving of new account failed: '%s'.", qPrintable(query.lastError().text()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user