diff options
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/analyzer/analyzerpanel.cpp | 103 | ||||
| -rw-r--r-- | src/analyzer/analyzerpanel.h | 69 | ||||
| -rw-r--r-- | src/analyzer/networkanalyzer.cpp | 199 | ||||
| -rw-r--r-- | src/analyzer/networkanalyzer.h | 77 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 25 | ||||
| -rw-r--r-- | src/mainwindow.h | 6 | ||||
| -rw-r--r-- | src/networkaccessmanager.cpp | 15 | ||||
| -rw-r--r-- | src/networkaccessmanager.h | 5 | ||||
| -rw-r--r-- | src/urlbar/completionwidget.cpp | 2 | ||||
| -rw-r--r-- | src/webpage.cpp | 15 | ||||
| -rw-r--r-- | src/webpage.h | 5 | 
12 files changed, 514 insertions, 11 deletions
| diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a6055ce7..6926630e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,6 +54,9 @@ SET( rekonq_KDEINIT_SRCS      urlbar/urlresolver.cpp      urlbar/listitem.cpp      urlbar/rsswidget.cpp +    #---------------------------------------- +    analyzer/analyzerpanel.cpp +    analyzer/networkanalyzer.cpp  ) @@ -78,6 +81,7 @@ INCLUDE_DIRECTORIES (   ${CMAKE_CURRENT_SOURCE_DIR}                          ${CMAKE_CURRENT_SOURCE_DIR}/history                          ${CMAKE_CURRENT_SOURCE_DIR}/rekonqpage                          ${CMAKE_CURRENT_SOURCE_DIR}/settings +                        ${CMAKE_CURRENT_SOURCE_DIR}/analyzer                          ${CMAKE_CURRENT_BINARY_DIR}                          ${KDE4_INCLUDES}                          ${QT4_INCLUDES} diff --git a/src/analyzer/analyzerpanel.cpp b/src/analyzer/analyzerpanel.cpp new file mode 100644 index 00000000..be346300 --- /dev/null +++ b/src/analyzer/analyzerpanel.cpp @@ -0,0 +1,103 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2010 by Matthieu Gicquel <matgic78 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/>. +* +* ============================================================ */ + + +// Self Includes +#include "analyzerpanel.h" +#include "analyzerpanel.moc" + +// Local Includes +#include "networkanalyzer.h" +#include "networkaccessmanager.h" +#include "webtab.h" +#include "webview.h" +#include "webpage.h" + +// KDE Includes +#include "KAction" + + +NetworkAnalyzerPanel::NetworkAnalyzerPanel(const QString &title, QWidget *parent) +        : QDockWidget(title, parent) +        , _viewer(new NetworkAnalyzer(this)) +{ +    setObjectName("networkAnalyzerDock"); +    setWidget(_viewer); +} + + +NetworkAnalyzerPanel::~NetworkAnalyzerPanel() +{ +    delete _viewer; +} + + +void NetworkAnalyzerPanel::closeEvent(QCloseEvent *event) +{ +    Q_UNUSED(event); +    toggle(false); +} + + +MainWindow* NetworkAnalyzerPanel::mainWindow() +{ +    return qobject_cast< MainWindow* >(parentWidget()); +} + + +void NetworkAnalyzerPanel::toggle(bool enable) +{ +    mainWindow()->actionByName("net_analyzer")->setChecked(enable); +    WebPage *page = mainWindow()->currentTab()->page(); +    NetworkAccessManager *manager = qobject_cast<NetworkAccessManager *>(page->networkAccessManager()); +     +    if (enable) +    { +        connect(page, SIGNAL(loadStarted()), _viewer, SLOT(clear())); +        connect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *)), +                    _viewer, SLOT(addRequest(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *) ) ); + +                     +//         mainWindow()->currentTab()->page()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true); +//         findChild<QWebInspector *>()->setPage(mainWindow()->currentTab()->page()); +        show(); +    } +    else +    { +        disconnect(page, SIGNAL(loadStarted()), _viewer, SLOT(clear())); +        disconnect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *)), +                    _viewer, SLOT(addRequest(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *) ) ); + +        hide(); +//         mainWindow()->currentTab()->view()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, false); +    } +} + + +void NetworkAnalyzerPanel::changeCurrentPage() +{ +    bool enable = mainWindow()->currentTab()->view()->settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled); +    toggle(enable); +} diff --git a/src/analyzer/analyzerpanel.h b/src/analyzer/analyzerpanel.h new file mode 100644 index 00000000..d98206f1 --- /dev/null +++ b/src/analyzer/analyzerpanel.h @@ -0,0 +1,69 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2010 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 ANALYZER_PANEL_H +#define ANALYZER_PANEL_H + + +// Rekonq Includes +#include "rekonq_defines.h" + +// Local Includes +#include "mainwindow.h" + +// Qt Includes +#include <QDockWidget> + +// Forward Declarations +class NetworkAnalyzer; + + +/** +    Docked network analyzer +    behaviour : hide/show by tab, not globally +*/ +class REKONQ_TESTS_EXPORT NetworkAnalyzerPanel : public QDockWidget +{ +    Q_OBJECT +public: +    NetworkAnalyzerPanel(const QString &title, QWidget *parent); +    ~NetworkAnalyzerPanel(); + +     +public slots: +    void toggle(bool enable); +    void changeCurrentPage(); + +protected: +    virtual void closeEvent(QCloseEvent *event); + +    MainWindow *mainWindow(); + +private: +    NetworkAnalyzer *_viewer; +}; + +#endif // NET_ANALYZER_PANEL_H diff --git a/src/analyzer/networkanalyzer.cpp b/src/analyzer/networkanalyzer.cpp new file mode 100644 index 00000000..53972a9c --- /dev/null +++ b/src/analyzer/networkanalyzer.cpp @@ -0,0 +1,199 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2009, 2010 by Richard J. Moore <rich@kde.org> +* Copyright (C) 2010 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/>. +* +* ============================================================ */ + + +// Self Includes +#include "networkanalyzer.h" +#include "networkanalyzer.moc" + +// KDE Includes +#include <klocalizedstring.h> +#include <KPassivePopup> + +// Qt Includes +#include <QtGui/QTreeWidget> +#include <QtGui/QVBoxLayout> +#include <QtGui/QHeaderView> +#include <QtGui/QLabel> + +#include <QSignalMapper> + + +NetworkAnalyzer::NetworkAnalyzer(QWidget *parent) +    : QWidget(parent) +    , _mapper(new QSignalMapper(this)) +    , _requestList(new QTreeWidget(this)) +{ +    QStringList headers; +    headers << i18n("Method") << i18n("Url") << i18n("Response") << i18n("Length") << i18n("Content Type") << i18n("Info"); +    _requestList->setHeaderLabels( headers ); +     +    _requestList->header()->setResizeMode(0, QHeaderView::ResizeToContents); +    _requestList->header()->setResizeMode(1, QHeaderView::Stretch); +    _requestList->header()->setResizeMode(2, QHeaderView::ResizeToContents); +    _requestList->header()->setResizeMode(3, QHeaderView::ResizeToContents); +    _requestList->header()->setResizeMode(4, QHeaderView::ResizeToContents); +     +    _requestList->setAlternatingRowColors(true); +     +    QVBoxLayout *lay = new QVBoxLayout(this); +    lay->addWidget( _requestList ); +     +    connect( _mapper, SIGNAL(mapped(QObject *)), this, SLOT(requestFinished(QObject *)) ); + +    connect( _requestList, SIGNAL(itemDoubleClicked( QTreeWidgetItem*, int ) ), this, SLOT( showItemDetails( QTreeWidgetItem *) ) ); +} + + +NetworkAnalyzer::~NetworkAnalyzer() +{ +} + + +void NetworkAnalyzer::addRequest( QNetworkAccessManager::Operation op, const QNetworkRequest &req, QNetworkReply *reply ) +{ +    // Add to list of requests +    QStringList cols; +    switch( op )  +    { +    case   QNetworkAccessManager::HeadOperation: +        cols << QL1S("HEAD"); +        break; +    case   QNetworkAccessManager::GetOperation: +        cols << QL1S("GET"); +        break; +    case   QNetworkAccessManager::PutOperation: +        cols << QL1S("PUT"); +        break; +    case   QNetworkAccessManager::PostOperation: +        cols << QL1S("POST"); +        break; +    default: +        kDebug() << "Unknown network operation"; +    } +    cols << req.url().toString(); +    cols << i18n("Pending"); + +    QTreeWidgetItem *item = new QTreeWidgetItem( cols ); +    _requestList->addTopLevelItem( item ); + +    // Add to maps +    _requestMap.insert( reply, req ); +    _itemMap.insert( reply, item ); +    _itemRequestMap.insert( item, req ); + +    _mapper->setMapping( reply, reply ); +    connect( reply, SIGNAL( finished() ), _mapper, SLOT( map() ) ); +} + + +void NetworkAnalyzer::clear() +{ +    _requestMap.clear(); +    _itemMap.clear(); +    _itemReplyMap.clear(); +    _itemRequestMap.clear(); +    _requestList->clear(); +} + + +void NetworkAnalyzer::requestFinished( QObject *replyObject ) +{ +    QNetworkReply *reply = qobject_cast<QNetworkReply *>( replyObject ); +    if ( !reply ) { +        kDebug() << "Failed to downcast reply"; +        return; +    } + +    QTreeWidgetItem *item = _itemMap[reply]; + +    // Record the reply headers +    QList<QByteArray> headerValues; +    foreach(const QByteArray &header, reply->rawHeaderList() )  +    { +        headerValues += reply->rawHeader( header ); +    } +     +    QPair< QList<QByteArray>, QList<QByteArray> > replyHeaders; +    replyHeaders.first = reply->rawHeaderList(); +    replyHeaders.second = headerValues; +    _itemReplyMap[item] = replyHeaders; + +    // Display the request +    int status = reply->attribute( QNetworkRequest::HttpStatusCodeAttribute ).toInt(); +    QString reason = reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute ).toString(); +    item->setText( 2, i18n("%1 %2", status, reason) ); + +    QString length = reply->header( QNetworkRequest::ContentLengthHeader ).toString(); +    item->setText( 3, length ); + +    QString contentType = reply->header( QNetworkRequest::ContentTypeHeader ).toString(); +    item->setText( 4, contentType ); + +    if ( status == 302 ) { +        QUrl target = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl(); +        item->setText( 5, i18n("Redirect: %1", target.toString() ) ); +    } +} + + +void NetworkAnalyzer::showItemDetails( QTreeWidgetItem *item ) +{ +    // Show request details +    QString details; +     +    QNetworkRequest req = _itemRequestMap[item]; +    details += QL1S("<h3>Request Details</h3>"); +    details += QL1S("<ul>"); +    foreach(const QByteArray &header, req.rawHeaderList() )  +    { +        details += QL1S("<li>"); +        details += QL1S( header ); +        details += QL1S(": "); +        details += QL1S( req.rawHeader( header ) ); +        details += QL1S("</li>"); +    } +    details += QL1S("</ul>"); +     +    QPair< QList<QByteArray>, QList<QByteArray> > replyHeaders = _itemReplyMap[item]; +    details += QL1S("<h3>Response Details</h3>"); +    details += QL1S("<ul>"); +    for ( int i = 0; i < replyHeaders.first.count(); i++ )  +    { +        details += QL1S("<li>"); +        details += QL1S( replyHeaders.first[i] ); +        details += QL1S(": "); +        details += QL1S( replyHeaders.second[i] );  +        details += QL1S("</li>"); +    } +    details += QL1S("</ul>"); +     +//     QLabel *label = new QLabel(details, this); +//     KPassivePopup *popup = new KPassivePopup(this); +//     popup->setView(label); +//     popup->show(_requestList->mapToGlobal(_requestList->pos())); +    KPassivePopup::message(details,this); +} diff --git a/src/analyzer/networkanalyzer.h b/src/analyzer/networkanalyzer.h new file mode 100644 index 00000000..9e38663f --- /dev/null +++ b/src/analyzer/networkanalyzer.h @@ -0,0 +1,77 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2009, 2010 by Richard J. Moore <rich@kde.org> +* Copyright (C) 2010 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 NETWORK_ANALYZER_H +#define NETWORK_ANALYZER_H + + +// Rekonq Includes +#include "rekonq_defines.h" + +// Qt Includes +#include <QtCore/QMap> +#include <QtCore/QList> + +#include <QtGui/QWidget> + +#include <QtNetwork/QNetworkAccessManager> +#include <QtNetwork/QNetworkReply> +#include <QtNetwork/QNetworkRequest> + +// Forward Declarations +class QTreeWidgetItem; +class QSignalMapper; +class QTreeWidget; + + +class NetworkAnalyzer : public QWidget +{ +    Q_OBJECT + +public: +    NetworkAnalyzer(QWidget *parent = 0); +    ~NetworkAnalyzer(); + +private slots: +    void addRequest( QNetworkAccessManager::Operation op, const QNetworkRequest &req, QNetworkReply *reply ); + +    void clear(); +    void requestFinished( QObject *replyObject ); +    void showItemDetails( QTreeWidgetItem *item ); + +private: +    QMap<QNetworkReply *, QNetworkRequest> _requestMap; +    QMap<QTreeWidgetItem *, QNetworkRequest> _itemRequestMap; +    QMap<QNetworkReply *, QTreeWidgetItem *> _itemMap; +    QMap<QTreeWidgetItem *, QPair< QList<QByteArray>, QList<QByteArray> > > _itemReplyMap; + +    QSignalMapper *_mapper; +    QTreeWidget *_requestList; +}; + +#endif // NETWORK_ANALYZER_H diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index a598128b..ef665cc7 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -47,6 +47,7 @@  #include "urlbar.h"  #include "tabbar.h"  #include "adblockmanager.h" +#include "analyzerpanel.h"  // Ui Includes  #include "ui_cleardata.h" @@ -99,6 +100,7 @@ MainWindow::MainWindow()          , m_historyPanel(0)          , m_bookmarksPanel(0)          , m_webInspectorPanel(0) +        , m_analyzerPanel(0)          , m_historyBackMenu(0)          , m_encodingMenu(new KMenu(this))          , m_mainBar(new KToolBar(QString("MainToolBar"), this, Qt::TopToolBarArea, true, true, true)) @@ -494,9 +496,10 @@ void MainWindow::setupTools()      toolsMenu->addSeparator(); -    KActionMenu *webMenu = new KActionMenu(KIcon("applications-development-web"), i18n("Web Development"), this); +    KActionMenu *webMenu = new KActionMenu(KIcon("applications-development-web"), i18n("Development"), this);      webMenu->addAction(actionByName(QL1S("web_inspector")));      webMenu->addAction(actionByName(QL1S("page_source"))); +    webMenu->addAction(actionByName(QL1S("net_analyzer")));      toolsMenu->addAction(webMenu);      toolsMenu->addSeparator(); @@ -565,6 +568,19 @@ void MainWindow::setupPanels()      addDockWidget(Qt::BottomDockWidgetArea, m_webInspectorPanel);      m_webInspectorPanel->hide(); +     +    // STEP 4 +    // Setup Network analyzer panel +    m_analyzerPanel = new NetworkAnalyzerPanel( i18n("Network Analyzer"), this); +    connect(mainView(), SIGNAL(currentChanged(int)), m_analyzerPanel, SLOT(changeCurrentPage())); + +    a = new KAction(KIcon("document-edit-decrypt-verify"), i18n("Network Analyzer"), this); +    a->setCheckable(true); +    actionCollection()->addAction(QL1S("net_analyzer"), a); +    connect(a, SIGNAL(triggered(bool)), this, SLOT(enableNetworkAnalysis(bool))); + +    addDockWidget(Qt::BottomDockWidgetArea, m_analyzerPanel); +    m_analyzerPanel->hide();  } @@ -1262,3 +1278,10 @@ void MainWindow::populateEncodingMenu()              action->setChecked(true);      }  } + + +void MainWindow::enableNetworkAnalysis(bool b) +{ +    currentTab()->page()->enableNetworkAnalyzer(b); +    m_analyzerPanel->toggle(b); +} diff --git a/src/mainwindow.h b/src/mainwindow.h index 6ca4cbfb..55e3f8cf 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -47,6 +47,7 @@ class BookmarksPanel;  class WebInspectorPanel;  class WebTab;  class MainView; +class NetworkAnalyzerPanel;  class KAction;  class KPassivePopup; @@ -159,6 +160,8 @@ private slots:      void setEncoding(QAction *);      void populateEncodingMenu(); +    void enableNetworkAnalysis(bool); +      private:      MainView *m_view;      FindBar *m_findBar; @@ -166,7 +169,8 @@ private:      HistoryPanel *m_historyPanel;      BookmarksPanel *m_bookmarksPanel;      WebInspectorPanel *m_webInspectorPanel; - +    NetworkAnalyzerPanel *m_analyzerPanel; +          KAction *m_stopReloadAction;      KMenu *m_historyBackMenu;      KMenu *m_encodingMenu; diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index 765604dc..e1d2e6eb 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -39,6 +39,9 @@  #include <KLocale>  #include <KProtocolManager> +// Qt Includes +#include <QtNetwork/QNetworkReply> +  NetworkAccessManager::NetworkAccessManager(QObject *parent)          : AccessManager(parent) @@ -53,7 +56,7 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)  } -QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) +QNetworkReply *NetworkAccessManager::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData)  {      WebPage *parentPage = qobject_cast<WebPage *>(parent()); @@ -89,9 +92,13 @@ QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkR      if (op == QNetworkAccessManager::GetOperation)      {          reply = Application::adblockManager()->block(req, parentPage); -        if (reply) -            return reply;      } -    return AccessManager::createRequest(op, req, outgoingData); +    if(!reply) +        reply = AccessManager::createRequest(op, req, outgoingData); + +    if(parentPage->hasNetworkAnalyzerEnabled()) +        emit networkData( op, req, reply );  + +    return reply;  } diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h index aefd1a25..a012f0d5 100644 --- a/src/networkaccessmanager.h +++ b/src/networkaccessmanager.h @@ -50,7 +50,10 @@ public:      NetworkAccessManager(QObject *parent);  protected: -    virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0); +    virtual QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0); + +signals: +    void networkData(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QNetworkReply *reply);   private:      QByteArray _acceptLanguage; diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp index 6dae6285..1bb01785 100644 --- a/src/urlbar/completionwidget.cpp +++ b/src/urlbar/completionwidget.cpp @@ -278,5 +278,3 @@ void CompletionWidget::suggestUrls(const QString &text)          popup();      }  } - - diff --git a/src/webpage.cpp b/src/webpage.cpp index 99a1a6d2..8d71ab5a 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -101,6 +101,7 @@ static bool domainSchemeMatch(const QUrl& u1, const QUrl& u2)  WebPage::WebPage(QWidget *parent)          : KWebPage(parent, KWalletIntegration) +        , _networkAnalyzer(false)  {      // ----- handling unsupported content...      setForwardUnsupportedContent(true); @@ -576,8 +577,6 @@ void WebPage::showSSLInfo(QPoint)  } - -  void WebPage::updateImage(bool ok)  {      if (ok) @@ -586,3 +585,15 @@ void WebPage::updateImage(bool ok)          p.snapFinished();      }  } + + +bool WebPage::hasNetworkAnalyzerEnabled() const +{ +    return _networkAnalyzer; +} + + +void WebPage::enableNetworkAnalyzer(bool b) +{ +    _networkAnalyzer = b; +} diff --git a/src/webpage.h b/src/webpage.h index c729a883..74695f35 100644 --- a/src/webpage.h +++ b/src/webpage.h @@ -60,6 +60,9 @@ public:      explicit WebPage(QWidget *parent = 0);      ~WebPage(); +    bool hasNetworkAnalyzerEnabled() const; +    void enableNetworkAnalyzer(bool); +      public slots:      virtual void downloadRequest(const QNetworkRequest &request);      void downloadAllContentsWithKGet(QPoint); @@ -84,6 +87,8 @@ private:      ProtocolHandler _protHandler;      WebSslInfo _sslInfo; +     +    bool _networkAnalyzer;  };  #endif | 
