FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-28 08:09:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Raise version.

Browse Source
This commit is contained in:
Martin Rotter 2016-04-19 10:09:09 +02:00
parent 8586c6c9e3
commit 5a04882bc6
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -61,8 +61,8 @@ project(rssguard)
set(APP_NAME "RSS Guard") set(APP_NAME "RSS Guard")
set(APP_LOW_NAME "rssguard") set(APP_LOW_NAME "rssguard")
set(APP_VERSION "3.2.1") set(APP_VERSION "3.2.2")
set(FILE_VERSION "3,2,1,0") set(FILE_VERSION "3,2,2,0")
set(APP_AUTHOR "Martin Rotter") set(APP_AUTHOR "Martin Rotter")
set(APP_URL "http://bitbucket.org/skunkos/rssguard") set(APP_URL "http://bitbucket.org/skunkos/rssguard")
set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues") set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues")

7
resources/text/CHANGELOG
View File

@ -1,3 +1,10 @@
3.2.2
—————
Added:
▪ ownCloud plugin now allows to add feeds.
3.2.1 3.2.1
————— —————

18
src/services/owncloud/gui/formeditowncloudfeed.cpp
View File

@ -91,11 +91,9 @@ void FormEditOwnCloudFeed::onAutoUpdateTypeChanged(int new_index) {
void FormEditOwnCloudFeed::performAction() { void FormEditOwnCloudFeed::performAction() {
if (m_loadedFeed != NULL) { if (m_loadedFeed != NULL) {
// Edit given feed.
saveFeed(); saveFeed();
} }
else { else {
// TODO: Add new feed.
addNewFeed(); addNewFeed();
} }
@ -206,28 +204,22 @@ void FormEditOwnCloudFeed::saveFeed() {
} }
void FormEditOwnCloudFeed::addNewFeed() { void FormEditOwnCloudFeed::addNewFeed() {
RootItem *parent = static_cast<RootItem*>(m_ui->m_cmbParentCategory->itemData(m_ui->m_cmbParentCategory->currentIndex()).value<void*>()); const RootItem *parent = static_cast<RootItem*>(m_ui->m_cmbParentCategory->itemData(m_ui->m_cmbParentCategory->currentIndex()).value<void*>());
const int category_id = parent->kind() == RootItemKind::ServiceRoot ? 0 : parent->customId(); const int category_id = parent->kind() == RootItemKind::ServiceRoot ? 0 : parent->customId();
const bool response = m_root->network()->createFeed(m_ui->m_txtUrl->lineEdit()->text(), category_id);
if (response) {
/*const TtRssSubscribeToFeedResponse response = root->network()->subscribeToFeed(m_ui->m_txtUrl->lineEdit()->text(),
category_id,
m_ui->m_gbAuthentication->isChecked(),
m_ui->m_txtUsername->lineEdit()->text(),
m_ui->m_txtPassword->lineEdit()->text());
*/
/*if (response.code() == STF_INSERTED) {
// Feed was added online. // Feed was added online.
accept(); accept();
qApp->showGuiMessage(tr("Feed added"), tr("Feed was added, triggering sync in now."), QSystemTrayIcon::Information); qApp->showGuiMessage(tr("Feed added"), tr("Feed was added, triggering sync in now."), QSystemTrayIcon::Information);
QTimer::singleShot(100, root, SLOT(syncIn())); QTimer::singleShot(100, m_root, SLOT(syncIn()));
} }
else { else {
reject(); reject();
qApp->showGuiMessage(tr("Cannot add feed"), qApp->showGuiMessage(tr("Cannot add feed"),
tr("Feed was not added due to error."), tr("Feed was not added due to error."),
QSystemTrayIcon::Critical, qApp->mainForm(), true); QSystemTrayIcon::Critical, qApp->mainForm(), true);
}*/ }
} }
void FormEditOwnCloudFeed::loadCategories(const QList<Category*> categories, RootItem *root_item) { void FormEditOwnCloudFeed::loadCategories(const QList<Category*> categories, RootItem *root_item) {