From 309cd39927b613c378346a29330333be727c2a99 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 4 Aug 2011 11:43:23 +0200 Subject: Tools Action Menu - Removed showDeveloperTools action - Moved adblock GUI to adblock part - renamed toolsMenu and developerMenu to reflect their real/new roles - Added UserAgent action to the tools menu REVIEW:102170 REVIEWED-BY: fritz_van_tom --- src/settings/adblockwidget.cpp | 2 +- src/settings/adblockwidget.h | 66 -------------- src/settings/settings_adblock.ui | 190 --------------------------------------- src/settings/settings_webkit.ui | 7 -- src/settings/settingsdialog.cpp | 11 --- 5 files changed, 1 insertion(+), 275 deletions(-) delete mode 100644 src/settings/adblockwidget.h delete mode 100644 src/settings/settings_adblock.ui (limited to 'src/settings') 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 -* -* -* 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 ADBLOCK_WIDGET_H -#define ADBLOCK_WIDGET_H - - -// Ui Includes -#include "ui_settings_adblock.h" - -// Qt Includes -#include -#include - - -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 @@ - - - adblock - - - - 0 - 0 - 601 - 507 - - - - - - - &Enable Ad Block - - - - - - - &Hide filtered elements - - - - - - - - - - 0 - - - - Automatic Filters - - - - - - false - - - false - - - - 1 - - - - - - - - - - Update automatic filters every: - - - - - - - - 120 - 0 - - - - - - - 7 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Manual Filters - - - - - - - - Search: - - - - - - - - - - - - - - - TextLabel - - - - - - - - - - - - Add filter expression - - - ... - - - - - - - Remove filter expression - - - ... - - - - - - - - - - - - - - KListWidget - QListWidget -
klistwidget.h
- - - KIntSpinBox - QSpinBox -
knuminput.h
- - - KLineEdit - QLineEdit -
klineedit.h
- - - KTabWidget - QTabWidget -
ktabwidget.h
- 1 - - - KListWidgetSearchLine - KLineEdit -
klistwidgetsearchline.h
- - - - - 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 @@ - - - - Show web developer tools - - - 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(); ; -- cgit v1.2.1