diff --git a/doc/konqueror/index.docbook b/doc/konqueror/index.docbook
--- a/doc/konqueror/index.docbook
+++ b/doc/konqueror/index.docbook
@@ -1710,14 +1710,6 @@
Copy Image copies the &URL; of the picture
to the clipboard.
-To save a complete web page, including images, select
-Archive Web Page... from the Tools menu.
-Note that this feature is provided by a plugin
- and may not have been installed on your system. The web page will be
-saved as a single file with a .war
-extension and can be opened by left clicking
-on the filename in &konqueror; running in File Manager mode.
-
Printing a copy of the page you are viewing is easily done with the
Menubar FilePrint... or Print
@@ -2251,7 +2243,7 @@
Browser Mode
-
-Archive Web Page (KHTML view only)
-Invoked with Tools
-Archive Web Page, this tool creates an archive
-(.war ) file containing the web page being
-viewed including the images. Left click on the
-archive file name to view the saved page.
-
-Auto Refresh (KHTML view only)
diff --git a/konqueror.categories b/konqueror.categories
--- a/konqueror.categories
+++ b/konqueror.categories
@@ -1,4 +1,3 @@
org.kde.webenginepart webenginepart IDENTIFIER [WEBENGINEPART_LOG]
org.kde.konqueror konqueror IDENTIFIER [KONQUEROR_LOG]
org.kde.konqueror.minitools minitools (konqueror plugin) IDENTIFIER [MINITOOLSPLUGIN_LOG]
-org.kde.konqueror.webarchiver webarchiver (konqueror plugin) IDENTIFIER [WEBARCHIVERPLUGIN_LOG]
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -8,7 +8,6 @@
add_subdirectory( dirfilter )
# TODO add_subdirectory( uachanger )
add_subdirectory( babelfish )
-add_subdirectory( webarchiver )
if (Qt5TextToSpeech_FOUND)
add_subdirectory(ttsplugin)
diff --git a/plugins/webarchiver/16-actions-webarchiver.png b/plugins/webarchiver/16-actions-webarchiver.png
deleted file mode 100644
index 0f5b62ef465dbb21ef3483078e42f2d92dc45a6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@l|UFM$d?6XdIjd=4s++uz2|sglGZ1Ab52h3{GR8$;?}L(pIy8(
zc{7=I5*o0Cp?nf?($qxS5Ju+g+67qI4L!G9FHG_oP-g6E5fb1ytSKWGw8IIUrTdk#OS_!#Zs1pzMP=5TcM2sAm1sO
z7)anXB5Y+yScdzxE{5DJGvYjpHJ6d+yLhw=3Je{Iw&}FN-f_s|qgH$e+Y*G4Akc=>
zBpE>OP&ZeP6dT{|t45ZLg0{4Q!hXPNTzw#?=*>tFF+gklmZ0c`w2q6I0PF#afB!nN
zwv9LQ6i{hszQ12#IIl=21#T^(+6d9woWY~vVg7vk38|4dpj(igB^39{n@<7j#ej!9
zK3$GO$~SBmn;aYlwATWW?qM<6!SqFk4`w>3R?5*~^57ZZ@nMUHg*u)W^5GkKIx;q*
z67k1!4I#i%f~JP!27o|__DBGuHEBy@8ZFiyd6erBFOE69e=Ubs3GnM7SEo9e985Ak
zkU}Ymlo9~dt`{+OL2`Z4VPw={_Hq|J84D@kqj%5YI4W+W&|Ztaj5ssL>21K>x!1VbSAXfyXVn0KlTsZ^Wc&`@&)awB+oi{w!tqGbF%LpE`e}
z*6@+t5y*gJ*JEd^f_qSd6OVM*;Dw2Crl+S#rBb`)a{0@(wY6WBZQFWcYRp`^Il{M}
z|G=B8?~oa{dHt0f7!VSq5FGC%snu#`eSLj*VPWCZrKP1i^Yin8ivL1PGr3&OT>toG
z?%n=HWS*FP)6ibt@rqSUMC1?Vm6zNDv{da71eOX9N<`
z4-4v_s02Y;LYQEp2qSIU=5m&9OSYD`o7-*fZo9kP?R(#!eV*^)*qEQYhv&yV&+GYo
z-k;BNV%y=vTi32@Y_AAL{eS~zHgyhtY@3Z~#OACAO5=wQ6WsVOmRSFCwdsvW4%^28
zDCQ=o{~qXnP2|Ydt#6h*(Pvaua*!+92>N(PJkT>dhtZS{-Lzm>Hgv;*PCc8)GaTy2
zr!ae_TIhNu07I3b(4qYs(#k;pJzfME&jFc&jSOte&M|-uo7|N}z_c7_x($P1Mbl=D
z<|Z`@LYag^_02eO=2!f+Cjw8%M=Z__T%-nB0vcCK3&NcbpY7Sw;H66~%n{rp174Y<
zbqBY)M{(!(0>OE_^Ylhsx^WNNzIhVUnLLw^!1JQHhv2H@_HG3IqeUcArVA2SSeVzb
zHY`A7bH|2B`{b1pc2{h`#RI*F9ry4c6S3G_PX{M-^!%%#Dj=Xarl4Hq!4t@$9}BvJ
z#3KW@<3)&u3}4O*TL6NaeR#vW1*ea7__Y=O$|c}L+Q5%JS*)*B;PY@u&6-Hha?ovu
zh3E#wOB__6imv<+z8?GmMMnd=0Z|Z;9?c4wG5PgHU^pKxC_(e9QHP;lx#{Sfd>Z%Gk3qee0mX>>3MyyfK7EO@&+IQ$mL9o
zJSxJpY*sxb2Lw(;%8ufnQ49OFg%I&`{)7hI0ODy2Rps+2j>1}!ycBtt7@5O^kpkjlMZDS?K~+@2rbZqQ
z#xz{*o*^AMx3)bV0g(!s>KZ5*90Z;RSOXS=*@N)VOcfktC}DT|vUqN78CsUBXbj7!
ziORUxF@F`{QM8)=>og
zBJ|}ZR7%+Ngog81#vu_@kx3SXM_ru{vTVUjO`>)4^9Y8*?sGRy6CE8LslL9x58B(?
zZ@U`DVllhz<9d8?>?95(+OVcBgra34q&j$Zy@F)Qf~Gt0DmH?`94ZtJW7LYe4xN(D
z?AoS@vuDq~OVINSx~M8hLl^$uCkOEPkx%jFS8qdjiz_{0uvXgpzt)9<)7{;j
zA_L!D0zuw)^0V_-x`Me*5HJkY+X>V-ph-=<4bk>h0}i&`S%UE;yY|
z_nkX;?ih(*vCywva5DVUgD-LYL^y?|#$GCO<_> rc.cpp
-$XGETTEXT *.cpp -o $podir/webarchiver.pot
diff --git a/plugins/webarchiver/archivedialog.h b/plugins/webarchiver/archivedialog.h
deleted file mode 100644
--- a/plugins/webarchiver/archivedialog.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- Copyright (C) 2003 Antonio Larrosa
- Copyright (C) 2008 Matthias Grimrath
-
- 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; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-#ifndef _ARCHIVEDIALOG_H_
-#define _ARCHIVEDIALOG_H_
-
-#include
-#include
-
-#include
-
-#include
-#include
-
-#include "ui_archiveviewbase.h"
-
-class QWidget;
-class KHTMLPart;
-class ArchiveViewBase;
-class QUrl;
-class KTar;
-class QTextStream;
-
-class ArchiveViewBase : public QWidget, public Ui::ArchiveViewBase
-{
-public:
- ArchiveViewBase(QWidget *parent) : QWidget(parent)
- {
- setupUi(this);
- }
-};
-
-/// Does all the hard work of downloading, manipulating and storing of
-/// HTML files and inlined images, stylesheets ...
-class ArchiveDialog : public KDialog
-{
- Q_OBJECT
-public:
- ArchiveDialog(QWidget *parent, const QString &targetFilename, KHTMLPart *part);
- ~ArchiveDialog() override;
-
- void archive();
-
-protected:
- /// Holds attributes that are not #CDATA
- class NonCDataAttr : public QSet
- {
- public:
- NonCDataAttr();
- };
-
- static NonCDataAttr non_cdata_attr;
-
- KIO::Job *startDownload(const QUrl &url, KHTMLPart *part);
-
-public:
-
- // Frame handling
-
- typedef QHash Name2Part;
-private:
- typedef QHash URL2Part;
-
- struct PartFrameData {
- Name2Part framesWithName;
- URL2Part framesWithURLOnly;
- };
-
- typedef QHash< KHTMLPart *, PartFrameData > FramesInPart;
- typedef QHash< QString, KHTMLPart * > TarName2Part;
- typedef QHash< KHTMLPart *, QString > Part2TarName;
-
- // Stylesheets
-
- typedef QHash< QUrl, DOM::CSSStyleSheet > CSSURLSet;
- typedef QHash< QString, QUrl > RawHRef2FullURL;
- typedef QHash< DOM::CSSStyleSheet, RawHRef2FullURL > URLsInStyleSheet;
- typedef QHash< DOM::Element, RawHRef2FullURL > URLsInStyleElement;
- typedef QHash< DOM::Node, DOM::CSSStyleSheet > Node2StyleSheet;
-
- // Recursive parsing and processing
-
- /// Databag to hold information that is gathered during recursive traversal of the DOM tree
- struct RecurseData {
- KHTMLPart *const part;
- QTextStream *const textStream;
- PartFrameData *const partFrameData;
- DOM::HTMLDocument document;
- bool baseSeen;
-
- RecurseData(KHTMLPart *_part, QTextStream *_textStream, PartFrameData *pfd);
- };
-
- struct DownloadInfo {
- QString tarName;
- KHTMLPart *part;
-
- DownloadInfo(const QString &_tarName = QString::null, KHTMLPart *_part = nullptr)
- : tarName(_tarName), part(_part) { }
- };
-
- typedef QMap< QUrl, DownloadInfo > UrlTarMap;
- typedef QList< UrlTarMap::Iterator > DownloadList;
-
- struct AttrElem {
- QString name;
- QString value;
-
- AttrElem() { }
- AttrElem(const QString &_n, const QString &_v) : name(_n), value(_v) { }
- };
- typedef QLinkedList< AttrElem > AttrList;
-
- /**
- * Looks for URL contained in attributes.
- */
- struct ExtractURLs {
- ExtractURLs(const QString &nodeName, const DOM::Element &element);
-
- AttrList attrList; /// copy of the attribute of @p element
- AttrList::iterator absURL; /// for links ala <a href= ... >
- AttrList::iterator transURL; /// for embedded objects like <img src=...>, favicons, background-images...
- AttrList::iterator frameURL; /// if @p element contains a frameURL
- AttrList::iterator frameName; /// if it is frame tag with a name element
- AttrList::iterator cssURL; /// for URLs that specify CSS
- };
-
-private:
- void downloadObjects();
- void downloadStyleSheets();
- void saveWebpages();
- void finishedArchiving(bool tarerror);
-
- void endProgressInfo(bool error);
-
- void obtainURLs();
- void obtainURLsLower(KHTMLPart *part, int level);
- void obtainPartURLsLower(const DOM::Node &pNode, int level, RecurseData &data);
- void obtainStyleSheetURLsLower(DOM::CSSStyleSheet styleSheet, RecurseData &data);
-
- bool insertTranslateURL(const QUrl &fullURL, RecurseData &data);
- bool insertHRefFromStyleSheet(const QString &hrefRaw, RawHRef2FullURL &raw2full,
- const QUrl &fullURL, RecurseData &data);
- void parseStyleDeclaration(const QUrl &baseURL, DOM::CSSStyleDeclaration decl,
- RawHRef2FullURL &urls, RecurseData &data /*, bool verbose = false*/);
-
- bool saveTopFrame();
- bool saveFrame(KHTMLPart *part, int level);
- void saveHTMLPart(RecurseData &data);
- void saveHTMLPartLower(const DOM::Node &pNode, int indent, RecurseData &data);
-
- QString extractCSSURL(const QString &text);
- QString &changeCSSURLs(QString &text, const RawHRef2FullURL &raw2full);
-
- static bool hasAttrWithValue(const DOM::Element &elem, const QString &attrName, const QString &attrValue);
- static bool hasChildNode(const DOM::Node &pNode, const QString &nodeName);
- static AttrList::Iterator getAttribute(AttrList &attrList, const QString &attr);
-
- static bool hasSubUrl(const QUrl &url);
-
- /**
- * completes a potentially partial URL in a HTML document (like <img href="...")
- * to a fully qualified one.
- *
- * It uses the URL of the document or the URL given in the <base ...>
- * element, depending on if and where a <base ...> appears on the document.
- *
- * Always use this method to get full URLs from href's or similar.
- *
- * Suppose the URL of the webpage is http://host.nowhere/. The head looks like this
- *