diff --git a/src/gui/rss/cookiesdlg.cpp b/src/gui/rss/cookiesdlg.cpp deleted file mode 100644 index ed4ce9c41..000000000 --- a/src/gui/rss/cookiesdlg.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Bittorrent Client using Qt4 and libtorrent. - * Copyright (C) 2010 Christophe Dumez - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * In addition, as a special exception, the copyright holders give permission to - * link this program with the OpenSSL project's "OpenSSL" library (or with - * modified versions of it that use the same license as the "OpenSSL" library), - * and distribute the linked executables. You must obey the GNU General Public - * License in all respects for all of the code used other than "OpenSSL". If you - * modify file(s), you may extend this exception to your version of the file(s), - * but you are not obligated to do so. If you do not wish to do so, delete this - * exception statement from your version. - * - * Contact : chris@qbittorrent.org arnaud@qbittorrent.org - */ - -#include "cookiesdlg.h" -#include "ui_cookiesdlg.h" -#include "guiiconprovider.h" -#include "base/net/downloadmanager.h" - -#include -#include - -enum CookiesCols { COOKIE_KEY, COOKIE_VALUE}; - -CookiesDlg::CookiesDlg(const QUrl &url, QWidget *parent) : - QDialog(parent), - ui(new Ui::CookiesDlg) -{ - ui->setupUi(this); - // Icons - ui->add_btn->setIcon(GuiIconProvider::instance()->getIcon("list-add")); - ui->del_btn->setIcon(GuiIconProvider::instance()->getIcon("list-remove")); - - ui->infos_lbl->setText(tr("Common keys for cookies are: '%1', '%2'.\nYou should get this information from your Web browser preferences.").arg("uid").arg("pass")); - - QList cookies = Net::DownloadManager::instance()->cookiesForUrl(url); - foreach (const QNetworkCookie &cookie, cookies) { - const int i = ui->cookiesTable->rowCount(); - ui->cookiesTable->setRowCount(i+1); - ui->cookiesTable->setItem(i, COOKIE_KEY, new QTableWidgetItem(QString(cookie.name()))); - ui->cookiesTable->setItem(i, COOKIE_VALUE, new QTableWidgetItem(QString(cookie.value()))); - } -} - -CookiesDlg::~CookiesDlg() -{ - delete ui; -} - -void CookiesDlg::on_add_btn_clicked() { - ui->cookiesTable->setRowCount(ui->cookiesTable->rowCount()+1); - // Edit first column - ui->cookiesTable->editItem(ui->cookiesTable->item(ui->cookiesTable->rowCount()-1, COOKIE_KEY)); -} - -void CookiesDlg::on_del_btn_clicked() { - // Get selected cookie - QList selection = ui->cookiesTable->selectedItems(); - if (!selection.isEmpty()) { - ui->cookiesTable->removeRow(selection.first()->row()); - } -} - -QList CookiesDlg::getCookies() const { - QList ret; - auto now = QDateTime::currentDateTime(); - for (int i=0; icookiesTable->rowCount(); ++i) { - QString key; - if (ui->cookiesTable->item(i, COOKIE_KEY)) - key = ui->cookiesTable->item(i, COOKIE_KEY)->text().trimmed(); - QString value; - if (ui->cookiesTable->item(i, COOKIE_VALUE)) - value = ui->cookiesTable->item(i, COOKIE_VALUE)->text().trimmed(); - if (!key.isEmpty() && !value.isEmpty()) { - QNetworkCookie cookie(key.toUtf8(), value.toUtf8()); - // TODO: Delete this hack when advanced Cookie dialog will be implemented. - cookie.setExpirationDate(now.addYears(10)); - qDebug("Cookie: %s", cookie.toRawForm().data()); - ret << cookie; - } - } - return ret; -} - -bool CookiesDlg::askForCookies(QWidget *parent, const QUrl &url, QList &out) -{ - CookiesDlg dlg(url, parent); - if (dlg.exec()) { - out = dlg.getCookies(); - return true; - } - - return false; -} diff --git a/src/gui/rss/cookiesdlg.h b/src/gui/rss/cookiesdlg.h deleted file mode 100644 index e9e6fc733..000000000 --- a/src/gui/rss/cookiesdlg.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Bittorrent Client using Qt4 and libtorrent. - * Copyright (C) 2010 Christophe Dumez - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * In addition, as a special exception, the copyright holders give permission to - * link this program with the OpenSSL project's "OpenSSL" library (or with - * modified versions of it that use the same license as the "OpenSSL" library), - * and distribute the linked executables. You must obey the GNU General Public - * License in all respects for all of the code used other than "OpenSSL". If you - * modify file(s), you may extend this exception to your version of the file(s), - * but you are not obligated to do so. If you do not wish to do so, delete this - * exception statement from your version. - * - * Contact : chris@qbittorrent.org arnaud@qbittorrent.org - */ - -#ifndef COOKIESDLG_H -#define COOKIESDLG_H - -#include -#include - -class QNetworkCookie; -class QUrl; - -namespace Ui { - class CookiesDlg; -} - -class CookiesDlg : public QDialog -{ - Q_OBJECT - -public: - explicit CookiesDlg(const QUrl &url, QWidget *parent = 0); - ~CookiesDlg(); - QList getCookies() const; - static bool askForCookies(QWidget *parent, const QUrl &url, QList &out); - - protected slots: - void on_add_btn_clicked(); - void on_del_btn_clicked(); - -private: - Ui::CookiesDlg *ui; -}; - -#endif // COOKIESDLG_H diff --git a/src/gui/rss/cookiesdlg.ui b/src/gui/rss/cookiesdlg.ui deleted file mode 100644 index ebaf4e03f..000000000 --- a/src/gui/rss/cookiesdlg.ui +++ /dev/null @@ -1,172 +0,0 @@ - - - CookiesDlg - - - - 0 - 0 - 400 - 300 - - - - Cookies management - - - - - - true - - - QAbstractItemView::SingleSelection - - - true - - - false - - - false - - - - Key - - - - - Value - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - 20 - 20 - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 5 - - - - - - - - - - - - 20 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - TextLabel - - - - - - - - - buttonBox - accepted() - CookiesDlg - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - CookiesDlg - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/src/gui/rss/rss.pri b/src/gui/rss/rss.pri index 01df487de..76975d4c0 100644 --- a/src/gui/rss/rss.pri +++ b/src/gui/rss/rss.pri @@ -4,17 +4,14 @@ HEADERS += $$PWD/rss_imp.h \ $$PWD/rsssettingsdlg.h \ $$PWD/feedlistwidget.h \ $$PWD/automatedrssdownloader.h \ - $$PWD/cookiesdlg.h \ $$PWD/htmlbrowser.h SOURCES += $$PWD/rss_imp.cpp \ $$PWD/rsssettingsdlg.cpp \ $$PWD/feedlistwidget.cpp \ $$PWD/automatedrssdownloader.cpp \ - $$PWD/cookiesdlg.cpp \ $$PWD/htmlbrowser.cpp FORMS += $$PWD/rss.ui \ $$PWD/rsssettingsdlg.ui \ - $$PWD/automatedrssdownloader.ui \ - $$PWD/cookiesdlg.ui + $$PWD/automatedrssdownloader.ui diff --git a/src/gui/rss/rss.ui b/src/gui/rss/rss.ui index 61b015297..768095b43 100644 --- a/src/gui/rss/rss.ui +++ b/src/gui/rss/rss.ui @@ -197,11 +197,6 @@ New folder... - - - Manage cookies... - - diff --git a/src/gui/rss/rss_imp.cpp b/src/gui/rss/rss_imp.cpp index f3d7a0df4..85c571a08 100644 --- a/src/gui/rss/rss_imp.cpp +++ b/src/gui/rss/rss_imp.cpp @@ -41,7 +41,6 @@ #include "feedlistwidget.h" #include "base/bittorrent/session.h" #include "base/net/downloadmanager.h" -#include "cookiesdlg.h" #include "base/preferences.h" #include "rsssettingsdlg.h" #include "base/rss/rssmanager.h" @@ -84,8 +83,6 @@ void RSSImp::displayRSSListMenu(const QPoint& pos) myRSSListMenu.addSeparator(); if (m_feedList->isFolder(selectedItems.first())) myRSSListMenu.addAction(actionNew_folder); - else - myRSSListMenu.addAction(actionManage_cookies); } } else { @@ -138,25 +135,6 @@ void RSSImp::displayItemsListMenu(const QPoint&) myItemListMenu.exec(QCursor::pos()); } -void RSSImp::on_actionManage_cookies_triggered() -{ - Q_ASSERT(!m_feedList->selectedItems().empty()); - - // TODO: Create advanced application wide Cookie dialog and use it everywhere. - QUrl feedUrl = QUrl::fromEncoded(m_feedList->getItemID(m_feedList->selectedItems().first()).toUtf8()); - QList cookies; - if (CookiesDlg::askForCookies(this, feedUrl, cookies)) { - auto downloadManager = Net::DownloadManager::instance(); - QList oldCookies = downloadManager->cookiesForUrl(feedUrl); - foreach (const QNetworkCookie &oldCookie, oldCookies) { - if (!cookies.contains(oldCookie)) - downloadManager->deleteCookie(oldCookie); - } - - downloadManager->setCookiesFromUrl(cookies, feedUrl); - } -} - void RSSImp::askNewFolder() { QTreeWidgetItem* parent_item = 0; @@ -713,7 +691,6 @@ RSSImp::RSSImp(QWidget *parent): actionCopy_feed_URL->setIcon(GuiIconProvider::instance()->getIcon("edit-copy")); actionDelete->setIcon(GuiIconProvider::instance()->getIcon("edit-delete")); actionDownload_torrent->setIcon(GuiIconProvider::instance()->getIcon("download")); - actionManage_cookies->setIcon(GuiIconProvider::instance()->getIcon("preferences-web-browser-cookies")); actionMark_items_read->setIcon(GuiIconProvider::instance()->getIcon("mail-mark-read")); actionNew_folder->setIcon(GuiIconProvider::instance()->getIcon("folder-new")); actionNew_subscription->setIcon(GuiIconProvider::instance()->getIcon("list-add")); diff --git a/src/gui/rss/rss_imp.h b/src/gui/rss/rss_imp.h index 5395ef9f8..bd117d8f5 100644 --- a/src/gui/rss/rss_imp.h +++ b/src/gui/rss/rss_imp.h @@ -84,7 +84,6 @@ private slots: void askNewFolder(); void saveFoldersOpenState(); void loadFoldersOpenState(); - void on_actionManage_cookies_triggered(); void on_settingsButton_clicked(); void on_rssDownloaderBtn_clicked();