From 5a04882bc696080f0fe9bec0a306bdbe20fbdda9 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 19 Apr 2016 10:09:09 +0200 Subject: [PATCH] Raise version. --- CMakeLists.txt | 4 ++-- resources/text/CHANGELOG | 7 +++++++ .../owncloud/gui/formeditowncloudfeed.cpp | 18 +++++------------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index addc04a20..36407e7f2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,8 +61,8 @@ project(rssguard) set(APP_NAME "RSS Guard") set(APP_LOW_NAME "rssguard") -set(APP_VERSION "3.2.1") -set(FILE_VERSION "3,2,1,0") +set(APP_VERSION "3.2.2") +set(FILE_VERSION "3,2,2,0") set(APP_AUTHOR "Martin Rotter") set(APP_URL "http://bitbucket.org/skunkos/rssguard") set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues") diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index cf5737585..5914c583b 100755 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -1,3 +1,10 @@ +3.2.2 +————— + +Added: + +▪ ownCloud plugin now allows to add feeds. + 3.2.1 ————— diff --git a/src/services/owncloud/gui/formeditowncloudfeed.cpp b/src/services/owncloud/gui/formeditowncloudfeed.cpp index 5f7b54145..a06349c33 100644 --- a/src/services/owncloud/gui/formeditowncloudfeed.cpp +++ b/src/services/owncloud/gui/formeditowncloudfeed.cpp @@ -91,11 +91,9 @@ void FormEditOwnCloudFeed::onAutoUpdateTypeChanged(int new_index) { void FormEditOwnCloudFeed::performAction() { if (m_loadedFeed != NULL) { - // Edit given feed. saveFeed(); } else { - // TODO: Add new feed. addNewFeed(); } @@ -206,28 +204,22 @@ void FormEditOwnCloudFeed::saveFeed() { } void FormEditOwnCloudFeed::addNewFeed() { - RootItem *parent = static_cast(m_ui->m_cmbParentCategory->itemData(m_ui->m_cmbParentCategory->currentIndex()).value()); + const RootItem *parent = static_cast(m_ui->m_cmbParentCategory->itemData(m_ui->m_cmbParentCategory->currentIndex()).value()); 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); - - /*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) { + if (response) { // Feed was added online. accept(); 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 { reject(); qApp->showGuiMessage(tr("Cannot add feed"), tr("Feed was not added due to error."), QSystemTrayIcon::Critical, qApp->mainForm(), true); - }*/ + } } void FormEditOwnCloudFeed::loadCategories(const QList categories, RootItem *root_item) {