[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase
From:       Ivor Hewitt <ivor () ivor ! org>
Date:       2005-05-06 11:55:03
Message-ID: 1115380503.959973.3065.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 409997 by ivor:

Control panel for new AdBlocK feature.

BUG:15848



 M  +20 -0     trunk/KDE/kdebase/doc/kcontrol/khtml/index.docbook  
 M  +3 -2      trunk/KDE/kdebase/kcontrol/konqhtml/Makefile.am  
 A             trunk/KDE/kdebase/kcontrol/konqhtml/filteropts.cpp   [License: GPL \
(v2+)]  A             trunk/KDE/kdebase/kcontrol/konqhtml/filteropts.h   [License: \
GPL (v2+)]  A             trunk/KDE/kdebase/kcontrol/konqhtml/khtml_filter.desktop  
 M  +6 -1      trunk/KDE/kdebase/kcontrol/konqhtml/main.cpp  
 M  +2 -1      trunk/KDE/kdebase/konqueror/konq_factory.cc  
 M  +1 -0      trunk/KDE/kdebase/konqueror/konq_mainwindow.cc  


--- trunk/KDE/kdebase/doc/kcontrol/khtml/index.docbook #409996:409997
@@ -305,6 +305,26 @@
 
 </sect2>
 
+<sect2 id="kbrowse-adblock">
+<title>AdBlocK</title>
+
+<para>&konqueror; AdBlocK can be configured to replace or remove
+images or frames from web pages that match a series of filters</para>
+
+<para>The setting <guilabel>Enable filters</guilabel> enables or
+disables the use of filters.</para>
+<para>If <guilabel>Hide filtered images</guilabel> is enabled then
+blocked images are completely removed from the page and the space they
+occupied is reclaimed. If the option is disabled then a placeholder
+image is used where images are filtered.</para>
+
+<para><guilabel>URL expressions to filter</guilabel> is a list of
+URLs that will be compared against image and frame names to decide
+on fitlering actions. The wildcards can be given as filename style
+regular expressions.</para>
+
+</sect2>
+
 <sect2 id="kbrowse-plugins">
 <title>Plugins</title>
 
--- trunk/KDE/kdebase/kcontrol/konqhtml/Makefile.am #409996:409997
@@ -9,12 +9,13 @@
 			     javaopts.cpp pluginopts.cpp appearance.cpp \
 			     khttpoptdlg.cpp policydlg.cpp main.cpp \
 			     jspolicies.cpp nsconfigwidget.ui policies.cpp \
-			     domainlistview.cpp advancedTabOptions.ui
+			     domainlistview.cpp advancedTabOptions.ui \
+			     filteropts.cpp
 
 kcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
 kcm_konqhtml_la_LIBADD = -lkhtml -lkdeui
 
-xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop
+xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop \
khtml_filter.desktop  
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kcmkonqhtml.pot
--- trunk/KDE/kdebase/kcontrol/konqhtml/main.cpp #409996:409997
@@ -35,6 +35,7 @@
 #include "pluginopts.h"
 #include "appearance.h"
 #include "htmlopts.h"
+#include "filteropts.h"
 
 #include "main.h"
 #include <kaboutdata.h>
@@ -66,7 +67,11 @@
 		return new KPluginOptions(c, "Java/JavaScript Settings", parent, name);
 	}
 
-
+        KDE_EXPORT KCModule *create_khtml_filter(QWidget *parent, const char *name )
+        {
+	    KConfig *c = new KConfig( "khtmlrc", false, false );
+            return new KCMFilter(c, "Filter Settings", parent, name);
+        }
 }
 
 
--- trunk/KDE/kdebase/konqueror/konq_factory.cc #409996:409997
@@ -212,7 +212,7 @@
                         KONQUEROR_VERSION,
                         I18N_NOOP("Web browser, file manager, ..."),
                         KAboutData::License_GPL,
-                        I18N_NOOP("(c) 1999-2004, The Konqueror developers"),
+                        I18N_NOOP("(c) 1999-2005, The Konqueror developers"),
                         0,
                         I18N_NOOP("http://konqueror.kde.org") );
     s_aboutData->addAuthor( "David Faure", I18N_NOOP("developer (framework, parts, \
JavaScript, I/O lib) and maintainer"), "faure@kde.org" ); @@ -248,6 +248,7 @@
     s_aboutData->addAuthor( "Torsten Rahn", I18N_NOOP("graphics/icons"), \
                "torsten@kde.org" );
     s_aboutData->addAuthor( "Torben Weis", I18N_NOOP("kfm author"), "weis@kde.org" \
                );
     s_aboutData->addAuthor( "Joseph Wenninger", I18N_NOOP("developer (navigation \
panel framework)"),"jowenn@kde.org"); +    s_aboutData->addAuthor( "Ivor Hewitt", \
I18N_NOOP("developer (AdBlock filter)"),"ivor@ivor.org");  }
   return s_aboutData;
 }
--- trunk/KDE/kdebase/konqueror/konq_mainwindow.cc #409996:409997
@@ -3688,6 +3688,7 @@
   m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" \
<<  "kde-filepreviews.desktop" << "kde-filetypes.desktop" <<
       "kde-khtml_behavior.desktop" << "kde-khtml_java_js.desktop" <<
+      "kde-khtml_filter.desktop" <<
       "kde-khtml_fonts.desktop" << "kde-ebrowsing.desktop" <<
       "kde-kcmhistory.desktop" << "kde-cookies.desktop" <<
       "kde-cache.desktop" << "kde-proxy.desktop" << "kde-kcmcss.desktop" <<


[prev in list] [next in list] [prev in thread] [next in thread]