summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/adblockwidget.cpp2
-rw-r--r--src/settings/adblockwidget.h66
-rw-r--r--src/settings/settings_adblock.ui190
-rw-r--r--src/settings/settings_webkit.ui7
-rw-r--r--src/settings/settingsdialog.cpp11
5 files changed, 1 insertions, 275 deletions
diff --git a/src/settings/adblockwidget.cpp b/src/settings/adblockwidget.cpp
index ad8bd599..3c7ec38f 100644
--- a/src/settings/adblockwidget.cpp
+++ b/src/settings/adblockwidget.cpp
@@ -175,7 +175,7 @@ void AdBlockWidget::save()
}
localGroup.writeEntry("local-rules" , localRules);
- ReKonfig::setAdBlockEnabled(checkEnableAdblock->isChecked());
+ ReKonfig::setAdBlockEnabled(checkEnableAdblock->isChecked()); // TODO: REMOVE ME!!!!
ReKonfig::setHideAdsEnabled(checkHideAds->isChecked());
ReKonfig::setUpdateInterval(spinBox->value());
diff --git a/src/settings/adblockwidget.h b/src/settings/adblockwidget.h
deleted file mode 100644
index 08194ada..00000000
--- a/src/settings/adblockwidget.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
-*
-*
-* 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 <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-#ifndef ADBLOCK_WIDGET_H
-#define ADBLOCK_WIDGET_H
-
-
-// Ui Includes
-#include "ui_settings_adblock.h"
-
-// Qt Includes
-#include <QtGui/QWidget>
-#include <QtGui/QTreeWidgetItem>
-
-
-class AdBlockWidget : public QWidget, private Ui::adblock
-{
- Q_OBJECT
-
-public:
- AdBlockWidget(QWidget *parent = 0);
-
- void save();
- bool changed();
-
-signals:
- void changed(bool);
-
-private slots:
- void hasChanged();
-
- void slotInfoLinkActivated(const QString &);
- void insertRule();
- void removeRule();
-
-private:
- void load();
- void loadRules(QTreeWidgetItem *item);
-
- bool _changed;
-};
-
-#endif // ADBLOCK_WIDGET_H
diff --git a/src/settings/settings_adblock.ui b/src/settings/settings_adblock.ui
deleted file mode 100644
index 68fcf520..00000000
--- a/src/settings/settings_adblock.ui
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>adblock</class>
- <widget class="QWidget" name="adblock">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>601</width>
- <height>507</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QCheckBox" name="checkEnableAdblock">
- <property name="text">
- <string>&amp;Enable Ad Block</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkHideAds">
- <property name="text">
- <string>&amp;Hide filtered elements</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KTabWidget" name="tabWidget">
- <property name="toolTip">
- <string/>
- </property>
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="tab_3">
- <attribute name="title">
- <string>Automatic Filters</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QTreeWidget" name="treeWidget">
- <attribute name="headerVisible">
- <bool>false</bool>
- </attribute>
- <attribute name="headerVisible">
- <bool>false</bool>
- </attribute>
- <column>
- <property name="text">
- <string notr="true">1</string>
- </property>
- </column>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Update automatic filters every:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KIntSpinBox" name="spinBox">
- <property name="minimumSize">
- <size>
- <width>120</width>
- <height>0</height>
- </size>
- </property>
- <property name="suffix">
- <string/>
- </property>
- <property name="value">
- <number>7</number>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tab">
- <attribute name="title">
- <string>Manual Filters</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Search:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KListWidgetSearchLine" name="searchLine"/>
- </item>
- </layout>
- </item>
- <item>
- <widget class="KListWidget" name="listWidget"/>
- </item>
- <item>
- <widget class="QLabel" name="hintLabel">
- <property name="text">
- <string comment="KDE::DoNotExtract">TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="KLineEdit" name="addFilterLineEdit"/>
- </item>
- <item>
- <widget class="QToolButton" name="insertButton">
- <property name="toolTip">
- <string>Add filter expression</string>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="removeButton">
- <property name="toolTip">
- <string>Remove filter expression</string>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>KListWidget</class>
- <extends>QListWidget</extends>
- <header>klistwidget.h</header>
- </customwidget>
- <customwidget>
- <class>KIntSpinBox</class>
- <extends>QSpinBox</extends>
- <header>knuminput.h</header>
- </customwidget>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- <customwidget>
- <class>KTabWidget</class>
- <extends>QTabWidget</extends>
- <header>ktabwidget.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>KListWidgetSearchLine</class>
- <extends>KLineEdit</extends>
- <header>klistwidgetsearchline.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui
index 00bced99..58fbe459 100644
--- a/src/settings/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
@@ -120,13 +120,6 @@
</property>
</widget>
</item>
- <item row="7" column="0">
- <widget class="QCheckBox" name="kcfg_showDeveloperTools">
- <property name="text">
- <string>Show web developer tools</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index a8d5f5b0..061430d3 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -40,7 +40,6 @@
#include "opensearchmanager.h"
// Widget Includes
-#include "adblockwidget.h"
#include "networkwidget.h"
#include "generalwidget.h"
#include "appearancewidget.h"
@@ -70,7 +69,6 @@ private:
AppearanceWidget *appearanceWidg;
WebKitWidget *webkitWidg;
NetworkWidget *networkWidg;
- AdBlockWidget *adBlockWidg;
KCModuleProxy *ebrowsingModule;
@@ -116,12 +114,6 @@ Private::Private(SettingsDialog *parent)
pageItem = parent->addPage(networkWidg , i18n("Network"));
pageItem->setIcon(KIcon("preferences-system-network"));
- // -- 6
- adBlockWidg = new AdBlockWidget(parent);
- adBlockWidg->layout()->setMargin(0);
- pageItem = parent->addPage(adBlockWidg , i18n("Ad Block"));
- pageItem->setIcon(KIcon("preferences-web-browser-adblock"));
-
// -- 7
shortcutsEditor = new KShortcutsEditor(rApp->mainWindow()->actionCollection(), parent);
pageItem = parent->addPage(shortcutsEditor , i18n("Shortcuts"));
@@ -164,7 +156,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
connect(d->appearanceWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
connect(d->webkitWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
connect(d->networkWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
- connect(d->adBlockWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
connect(d->ebrowsingModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
connect(d->shortcutsEditor, SIGNAL(keyChange()), this, SLOT(updateButtons()));
@@ -199,7 +190,6 @@ void SettingsDialog::saveSettings()
d->appearanceWidg->save();
d->webkitWidg->save();
d->networkWidg->save();
- d->adBlockWidg->save();
d->shortcutsEditor->save();
d->ebrowsingModule->save();
@@ -219,7 +209,6 @@ bool SettingsDialog::hasChanged()
|| d->appearanceWidg->changed()
|| d->webkitWidg->changed()
|| d->networkWidg->changed()
- || d->adBlockWidg->changed()
|| d->ebrowsingModule->changed()
|| d->shortcutsEditor->isModified();
;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 07:02:29 +0000