From c3cdee8dcbf871b328e557749cd8604abf737e40 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 5 Aug 2009 17:27:01 +0200 Subject: Removed old unuseful files.. --- src/CMakeLists.txt | 4 +- src/cookiedialog.cpp | 215 -------------------------------- src/cookiedialog.h | 83 ------------- src/cookieexceptiondialog.cpp | 276 ------------------------------------------ src/cookieexceptiondialog.h | 100 --------------- src/cookies.ui | 94 -------------- src/cookiesexceptions.ui | 171 -------------------------- src/settings.cpp | 4 +- 8 files changed, 4 insertions(+), 943 deletions(-) delete mode 100644 src/cookiedialog.cpp delete mode 100644 src/cookiedialog.h delete mode 100644 src/cookieexceptiondialog.cpp delete mode 100644 src/cookieexceptiondialog.h delete mode 100644 src/cookies.ui delete mode 100644 src/cookiesexceptions.ui (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c782864f..65315be8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,8 +30,8 @@ SET( rekonq_SRCS KDE4_ADD_UI_FILES( rekonq_SRCS - cookies.ui - cookiesexceptions.ui +# cookies.ui +# cookiesexceptions.ui password.ui proxy.ui settings_general.ui diff --git a/src/cookiedialog.cpp b/src/cookiedialog.cpp deleted file mode 100644 index 39c43988..00000000 --- a/src/cookiedialog.cpp +++ /dev/null @@ -1,215 +0,0 @@ -/* ============================================================ -* -* This file is a part of the rekonq project -* -* Copyright (C) 2008-2009 by Andrea Diamantini -* -* -* 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) version 3 or any later version -* accepted by the membership of KDE e.V. (or its successor approved -* by the membership of KDE e.V.), which shall act as a proxy -* defined in Section 14 of version 3 of the license. -* -* 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, see . -* -* ============================================================ */ - -// Self Includes -#include "cookiedialog.h" -#include "cookiedialog.moc" - -// Local Includes -#include "cookiejar.h" - -// KDE Includes -#include - -CookieModel::CookieModel(CookieJar *cookieJar, QObject *parent) - : QAbstractTableModel(parent) - , m_cookieJar(cookieJar) -{ - connect(m_cookieJar, SIGNAL(cookiesChanged()), this, SLOT(cookiesChanged())); -} - - -QVariant CookieModel::headerData(int section, Qt::Orientation orientation, int role) const -{ - if (role == Qt::SizeHintRole) - { - QFont font; - font.setPointSize(10); - QFontMetrics fm(font); - int height = fm.height() + fm.height() / 3; - int width = fm.width(headerData(section, orientation, Qt::DisplayRole).toString()); - return QSize(width, height); - } - - if (orientation == Qt::Horizontal) - { - if (role != Qt::DisplayRole) - return QVariant(); - - switch (section) - { - case 0: - return i18n("Website"); - case 1: - return i18n("Name"); - case 2: - return i18n("Path"); - case 3: - return i18n("Secure"); - case 4: - return i18n("Expires"); - case 5: - return i18n("Contents"); - default: - return QVariant(); - } - } - return QAbstractTableModel::headerData(section, orientation, role); -} - - -QVariant CookieModel::data(const QModelIndex &index, int role) const -{ - QList lst; - if (m_cookieJar) - lst = m_cookieJar->allCookies(); - if (index.row() < 0 || index.row() >= lst.size()) - return QVariant(); - - switch (role) - { - case Qt::DisplayRole: - case Qt::EditRole: - { - QNetworkCookie cookie = lst.at(index.row()); - switch (index.column()) - { - case 0: - return cookie.domain(); - case 1: - return cookie.name(); - case 2: - return cookie.path(); - case 3: - return cookie.isSecure(); - case 4: - return cookie.expirationDate(); - case 5: - return cookie.value(); - } - } - case Qt::FontRole: - { - QFont font; - font.setPointSize(10); - return font; - } - } - - return QVariant(); -} - - -int CookieModel::columnCount(const QModelIndex &parent) const -{ - return (parent.isValid()) ? 0 : 6; -} - - -int CookieModel::rowCount(const QModelIndex &parent) const -{ - return (parent.isValid() || !m_cookieJar) ? 0 : m_cookieJar->allCookies().count(); -} - - -bool CookieModel::removeRows(int row, int count, const QModelIndex &parent) -{ - if (parent.isValid() || !m_cookieJar) - return false; - int lastRow = row + count - 1; - beginRemoveRows(parent, row, lastRow); - QList lst = m_cookieJar->allCookies(); - for (int i = lastRow; i >= row; --i) - { - lst.removeAt(i); - } - m_cookieJar->setAllCookies(lst); - endRemoveRows(); - return true; -} - - -void CookieModel::cookiesChanged() -{ - reset(); -} - - -// --------------------------------------------------------------------------------------- - - -// Ui Includes -#include "ui_cookies.h" - -// Qt Includes -#include -#include - -#include - - -CookiesDialog::CookiesDialog(CookieJar *cookieJar, QWidget *parent) - : KDialog(parent) -{ - setWindowFlags(Qt::Sheet); - setCaption("Cookies"); - setButtons( KDialog::Close ); - - Ui::CookiesWidget *cookieWidget = new Ui::CookiesWidget; - QWidget *widget = new QWidget(this); - cookieWidget->setupUi(widget); - setMainWidget(widget); - - CookieModel *model = new CookieModel(cookieJar, this); - m_proxyModel = new QSortFilterProxyModel(this); - - // connecting signals and slots - connect(cookieWidget->search, SIGNAL(textChanged(QString)), m_proxyModel, SLOT(setFilterFixedString(QString))); - connect(cookieWidget->removeButton, SIGNAL(clicked()), cookieWidget->cookiesTable, SLOT(removeOne())); - connect(cookieWidget->removeAllButton, SIGNAL(clicked()), cookieWidget->cookiesTable, SLOT(removeAll())); - - m_proxyModel->setSourceModel(model); - - cookieWidget->cookiesTable->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - cookieWidget->cookiesTable->verticalHeader()->hide(); - cookieWidget->cookiesTable->setSelectionBehavior(QAbstractItemView::SelectRows); - cookieWidget->cookiesTable->setModel(m_proxyModel); - cookieWidget->cookiesTable->setAlternatingRowColors(true); - cookieWidget->cookiesTable->setTextElideMode(Qt::ElideMiddle); - cookieWidget->cookiesTable->setShowGrid(false); - cookieWidget->cookiesTable->setSortingEnabled(true); - - // Fixing header dimension - QHeaderView *headerView = cookieWidget->cookiesTable->horizontalHeader(); - headerView->setResizeMode(QHeaderView::Stretch); -} - - -QSize CookiesDialog::sizeHint() const -{ - QRect desktopRect = QApplication::desktop()->screenGeometry(); - QSize size = desktopRect.size() * 0.8; - return size; -} diff --git a/src/cookiedialog.h b/src/cookiedialog.h deleted file mode 100644 index d2d00fcc..00000000 --- a/src/cookiedialog.h +++ /dev/null @@ -1,83 +0,0 @@ -/* ============================================================ -* -* This file is a part of the rekonq project -* -* Copyright (C) 2008-2009 by Andrea Diamantini -* -* -* 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) version 3 or any later version -* accepted by the membership of KDE e.V. (or its successor approved -* by the membership of KDE e.V.), which shall act as a proxy -* defined in Section 14 of version 3 of the license. -* -* 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, see . -* -* ============================================================ */ - - -#ifndef COOKIEDIALOG_H -#define COOKIEDIALOG_H - -// Local Includes -#include "cookiejar.h" - -// KDE Includes -#include - -// Qt Includes -#include -#include - -#include -#include - - - -class CookieModel : public QAbstractTableModel -{ - Q_OBJECT - -public: - explicit CookieModel(CookieJar *jar, QObject *parent = 0); - - QVariant headerData(int section, Qt::Orientation orientation, int role) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()); - -private slots: - void cookiesChanged(); - -private: - CookieJar *m_cookieJar; -}; - - - -// ----------------------------------------------------------------------------------------------------------------- - - -class CookiesDialog : public KDialog -{ - Q_OBJECT - -public: - explicit CookiesDialog(CookieJar *cookieJar, QWidget *parent = 0); - - QSize sizeHint() const; - -private: - QSortFilterProxyModel *m_proxyModel; -}; - -#endif diff --git a/src/cookieexceptiondialog.cpp b/src/cookieexceptiondialog.cpp deleted file mode 100644 index ee662b5e..00000000 --- a/src/cookieexceptiondialog.cpp +++ /dev/null @@ -1,276 +0,0 @@ -/* ============================================================ -* -* This file is a part of the rekonq project -* -* Copyright (C) 2008-2009 by Andrea Diamantini -* -* -* 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) version 3 or any later version -* accepted by the membership of KDE e.V. (or its successor approved -* by the membership of KDE e.V.), which shall act as a proxy -* defined in Section 14 of version 3 of the license. -* -* 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, see . -* -* ============================================================ */ - - -// Self Includes -#include "cookieexceptiondialog.h" -#include "cookieexceptiondialog.moc" - -// Local Includes - -// Qt Includes -#include - - -CookieExceptionsModel::CookieExceptionsModel(CookieJar *cookiejar, QObject *parent) - : QAbstractTableModel(parent) - , m_cookieJar(cookiejar) -{ - m_allowedCookies = m_cookieJar->allowedCookies(); - m_blockedCookies = m_cookieJar->blockedCookies(); - m_sessionCookies = m_cookieJar->allowForSessionCookies(); -} - - -QVariant CookieExceptionsModel::headerData(int section, Qt::Orientation orientation, int role) const -{ - if (role == Qt::SizeHintRole) - { - QFont font; - font.setPointSize(10); - QFontMetrics fm(font); - int height = fm.height() + fm.height() / 3; - int width = fm.width(headerData(section, orientation, Qt::DisplayRole).toString()); - return QSize(width, height); - } - - if (orientation == Qt::Horizontal - && role == Qt::DisplayRole) - { - switch (section) - { - case 0: - return i18n("Website"); - case 1: - return i18n("Status"); - } - } - return QAbstractTableModel::headerData(section, orientation, role); -} - - -QVariant CookieExceptionsModel::data(const QModelIndex &index, int role) const -{ - if (index.row() < 0 || index.row() >= rowCount()) - return QVariant(); - - switch (role) - { - case Qt::DisplayRole: - case Qt::EditRole: - { - int row = index.row(); - if (row < m_allowedCookies.count()) - { - switch (index.column()) - { - case 0: - return m_allowedCookies.at(row); - case 1: - return i18n("Allow"); - } - } - row = row - m_allowedCookies.count(); - if (row < m_blockedCookies.count()) - { - switch (index.column()) - { - case 0: - return m_blockedCookies.at(row); - case 1: - return i18n("Block"); - } - } - row = row - m_blockedCookies.count(); - if (row < m_sessionCookies.count()) - { - switch (index.column()) - { - case 0: - return m_sessionCookies.at(row); - case 1: - return i18n("Allow For Session"); - } - } - } - case Qt::FontRole: - { - QFont font; - font.setPointSize(10); - return font; - } - } - return QVariant(); -} - - -int CookieExceptionsModel::columnCount(const QModelIndex &parent) const -{ - return (parent.isValid()) ? 0 : 2; -} - - -int CookieExceptionsModel::rowCount(const QModelIndex &parent) const -{ - return (parent.isValid() || !m_cookieJar) ? 0 : m_allowedCookies.count() + m_blockedCookies.count() + m_sessionCookies.count(); -} - - -bool CookieExceptionsModel::removeRows(int row, int count, const QModelIndex &parent) -{ - if (parent.isValid() || !m_cookieJar) - return false; - - int lastRow = row + count - 1; - beginRemoveRows(parent, row, lastRow); - for (int i = lastRow; i >= row; --i) - { - if (i < m_allowedCookies.count()) - { - m_allowedCookies.removeAt(row); - continue; - } - i = i - m_allowedCookies.count(); - if (i < m_blockedCookies.count()) - { - m_blockedCookies.removeAt(row); - continue; - } - i = i - m_blockedCookies.count(); - if (i < m_sessionCookies.count()) - { - m_sessionCookies.removeAt(row); - continue; - } - } - m_cookieJar->setAllowedCookies(m_allowedCookies); - m_cookieJar->setBlockedCookies(m_blockedCookies); - m_cookieJar->setAllowForSessionCookies(m_sessionCookies); - endRemoveRows(); - return true; -} - - - - -// ---------------------------------------------------------------------------------------------------------------- - - -// Qt Includes -#include -#include - -#include -#include - - -CookiesExceptionsDialog::CookiesExceptionsDialog(CookieJar *cookieJar, QWidget *parent) - : KDialog(parent) - , m_cookieJar(cookieJar) - , m_exceptionsWidget(new Ui::CookiesExceptionsWidget) -{ - setWindowFlags(Qt::Sheet); - setCaption("Cookies Exceptions"); - setButtons( KDialog::Close ); - - QWidget *widget = new QWidget(this); - m_exceptionsWidget->setupUi(widget); - setMainWidget(widget); - - connect(m_exceptionsWidget->removeButton, SIGNAL(clicked()), m_exceptionsWidget->exceptionTable, SLOT(removeOne())); - connect(m_exceptionsWidget->removeAllButton, SIGNAL(clicked()), m_exceptionsWidget->exceptionTable, SLOT(removeAll())); - - m_exceptionsWidget->exceptionTable->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - m_exceptionsWidget->exceptionTable->verticalHeader()->hide(); - m_exceptionsWidget->exceptionTable->setSelectionBehavior(QAbstractItemView::SelectRows); - m_exceptionsWidget->exceptionTable->setAlternatingRowColors(true); - m_exceptionsWidget->exceptionTable->setTextElideMode(Qt::ElideMiddle); - m_exceptionsWidget->exceptionTable->setShowGrid(false); - m_exceptionsWidget->exceptionTable->setSortingEnabled(true); - m_exceptionsModel = new CookieExceptionsModel(cookieJar, this); - m_proxyModel = new QSortFilterProxyModel(this); - m_proxyModel->setSourceModel(m_exceptionsModel); - - connect(m_exceptionsWidget->search, SIGNAL(textChanged(QString)), m_proxyModel, SLOT(setFilterFixedString(QString))); - - m_exceptionsWidget->exceptionTable->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - m_exceptionsWidget->exceptionTable->setModel(m_proxyModel); - - connect(m_exceptionsWidget->domainLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(textChanged(const QString &))); - connect(m_exceptionsWidget->blockButton, SIGNAL(clicked()), this, SLOT(block())); - connect(m_exceptionsWidget->allowButton, SIGNAL(clicked()), this, SLOT(allow())); - connect(m_exceptionsWidget->allowForSessionButton, SIGNAL(clicked()), this, SLOT(allowForSession())); - - // Fixing header dimension - QHeaderView *headerView = m_exceptionsWidget->exceptionTable->horizontalHeader(); - headerView->setResizeMode(QHeaderView::Stretch); -} - - -void CookiesExceptionsDialog::textChanged(const QString &text) -{ - bool enabled = !text.isEmpty(); - m_exceptionsWidget->blockButton->setEnabled(enabled); - m_exceptionsWidget->allowButton->setEnabled(enabled); - m_exceptionsWidget->allowForSessionButton->setEnabled(enabled); -} - - -void CookiesExceptionsDialog::block() -{ - if (m_exceptionsWidget->domainLineEdit->text().isEmpty()) - return; - m_exceptionsModel->m_blockedCookies.append(m_exceptionsWidget->domainLineEdit->text()); - m_cookieJar->setBlockedCookies(m_exceptionsModel->m_blockedCookies); - m_exceptionsModel->reset(); -} - - -void CookiesExceptionsDialog::allow() -{ - if (m_exceptionsWidget->domainLineEdit->text().isEmpty()) - return; - m_exceptionsModel->m_allowedCookies.append(m_exceptionsWidget->domainLineEdit->text()); - m_cookieJar->setAllowedCookies(m_exceptionsModel->m_allowedCookies); - m_exceptionsModel->reset(); -} - - -void CookiesExceptionsDialog::allowForSession() -{ - if (m_exceptionsWidget->domainLineEdit->text().isEmpty()) - return; - m_exceptionsModel->m_sessionCookies.append(m_exceptionsWidget->domainLineEdit->text()); - m_cookieJar->setAllowForSessionCookies(m_exceptionsModel->m_sessionCookies); - m_exceptionsModel->reset(); -} - - -QSize CookiesExceptionsDialog::sizeHint() const -{ - QRect desktopRect = QApplication::desktop()->screenGeometry(); - QSize size = desktopRect.size() * 0.6; - return size; -} diff --git a/src/cookieexceptiondialog.h b/src/cookieexceptiondialog.h deleted file mode 100644 index 627f1096..00000000 --- a/src/cookieexceptiondialog.h +++ /dev/null @@ -1,100 +0,0 @@ -/* ============================================================ -* -* This file is a part of the rekonq project -* -* Copyright (C) 2008-2009 by Andrea Diamantini -* -* -* 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) version 3 or any later version -* accepted by the membership of KDE e.V. (or its successor approved -* by the membership of KDE e.V.), which shall act as a proxy -* defined in Section 14 of version 3 of the license. -* -* 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, see . -* -* ============================================================ */ - - -#ifndef COOKIEEXCEPTIONDIALOG_H -#define COOKIEEXCEPTIONDIALOG_H - - -// Local Includes -#include "cookiejar.h" - -// Qt Includes -#include - -// Forward Declarations -class QString; -class QStringList; -class QModelIndex; -class QVariant; - -class CookieExceptionsModel : public QAbstractTableModel -{ - Q_OBJECT - friend class CookiesExceptionsDialog; - -public: - explicit CookieExceptionsModel(CookieJar *cookieJar, QObject *parent = 0); - - QVariant headerData(int section, Qt::Orientation orientation, int role) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()); - -private: - CookieJar *m_cookieJar; - - // Domains we allow, Domains we block, Domains we allow for this session - QStringList m_allowedCookies; - QStringList m_blockedCookies; - QStringList m_sessionCookies; -}; - - -// ----------------------------------------------------------------------------------------------- - - -// Ui Includes -#include "ui_cookiesexceptions.h" - -//Forward Declarations -class QSortFilterProxyModel; - - -class CookiesExceptionsDialog : public KDialog -{ - Q_OBJECT - -public: - explicit CookiesExceptionsDialog(CookieJar *cookieJar, QWidget *parent = 0); - - QSize sizeHint() const; - -private slots: - void block(); - void allow(); - void allowForSession(); - void textChanged(const QString &text); - -private: - CookieExceptionsModel *m_exceptionsModel; - QSortFilterProxyModel *m_proxyModel; - CookieJar *m_cookieJar; - - Ui::CookiesExceptionsWidget *m_exceptionsWidget; -}; - -#endif diff --git a/src/cookies.ui b/src/cookies.ui deleted file mode 100644 index 992cd995..00000000 --- a/src/cookies.ui +++ /dev/null @@ -1,94 +0,0 @@ - - - CookiesWidget - - - - 0 - 0 - 859 - 478 - - - - - 0 - 0 - - - - - - - - - - 0 - 0 - - - - Search: - - - - - - - true - - - - - - - - - - - - - - &Remove - - - - - - - Remove &All Cookies - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - KLineEdit - QLineEdit -
klineedit.h
- - - EditTableView - QTableView -
edittableview.h
- - - - - diff --git a/src/cookiesexceptions.ui b/src/cookiesexceptions.ui deleted file mode 100644 index 0d8ae84f..00000000 --- a/src/cookiesexceptions.ui +++ /dev/null @@ -1,171 +0,0 @@ - - - CookiesExceptionsWidget - - - - 0 - 0 - 1000 - 400 - - - - - - - New Exception - - - - - - - - Domain: - - - - - - - true - - - - - - - - - - - Qt::Horizontal - - - - 81 - 25 - - - - - - - - false - - - Block - - - - - - - false - - - Allow For Session - - - - - - - false - - - Allow - - - - - - - - - - - - Exceptions - - - - - - - - - 0 - 0 - - - - Search: - - - - - - - true - - - - - - - - - - - - - - &Remove - - - - - - - Remove &All - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - KLineEdit - QLineEdit -
klineedit.h
- - - EditTableView - QTableView -
edittableview.h
- - - - - diff --git a/src/settings.cpp b/src/settings.cpp index 61056a71..3144dec6 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -36,8 +36,8 @@ // Local Includes #include "application.h" #include "mainwindow.h" -#include "cookiedialog.h" -#include "cookieexceptiondialog.h" +// #include "cookiedialog.h" +// #include "cookieexceptiondialog.h" #include "history.h" #include "networkaccessmanager.h" #include "webview.h" -- cgit v1.2.1