Images: use class QNetworkAccessManager

source/fb2edit.pro

@@ -4,14 +4,16 @@ HEADERS = \
     fb2main.h \
     fb2read.h \
     fb2text.h \
-    fb2tree.h
+    fb2tree.h \
+    fb2view.h
 
 SOURCES = \
     fb2app.cpp \
     fb2doc.cpp \
     fb2main.cpp \
     fb2read.cpp \
-    fb2tree.cpp
+    fb2tree.cpp \
+    fb2view.cpp
 
 RESOURCES = \
     fb2edit.qrc
@@ -22,5 +24,6 @@ VERSION = 0.01.1
 
 QT += xml
 QT += webkit
+QT += network
 
 LIBS += -lqscintilla2

source/fb2main.cpp

@@ -9,6 +9,8 @@
 #include "fb2read.h"
 #include "fb2text.h"
 #include "fb2tree.h"
+#include "fb2view.h"
+#include "fb2main.h"
 
 #include <Qsci/qsciscintilla.h>
 #include <Qsci/qscilexerxml.h>
@@ -232,6 +234,7 @@ void MainWindow::createActions()
     QAction * act;
     QMenu * menu;
     QToolBar * tool;
+    QList<QAction*> actions;
 
     menu = menuBar()->addMenu(tr("&File"));
     tool = addToolBar(tr("File"));
@@ -416,10 +419,13 @@ void MainWindow::connectTextDocument(QTextDocument * document)
 
 void MainWindow::createText()
 {
-    textEdit = new QWebView(this);
-    textEdit->page()->setContentEditable(true);
+    textEdit = new Fb2WebView(this);
     setCentralWidget(textEdit);
     textEdit->setFocus();
+
+    connect(actionZoomIn, SIGNAL(triggered()), textEdit, SLOT(zoomIn()));
+    connect(actionZoomOut, SIGNAL(triggered()), textEdit, SLOT(zoomOut()));
+    connect(actionZoomOrig, SIGNAL(triggered()), textEdit, SLOT(zoomOrig()));
 }
 
 void MainWindow::createQsci()
@@ -550,8 +556,7 @@ void MainWindow::setCurrentFile(const QString &filename, const QString &html)
     }
     title += QString(" - ") += qApp->applicationName();
 
-    textEdit->setHtml(html);
-    textEdit->page()->setContentEditable(true);
+    textEdit->setHtml(html, QUrl("fb2://s/"));
 
     setWindowModified(false);
     setWindowFilePath(curFile);

source/fb2main.h

@@ -100,9 +100,9 @@ private:
         *actionTextStrike,
         *actionTextSub,
         *actionTextSup,
-        *actionZoomOrig,
         *actionZoomIn,
-        *actionZoomOut
+        *actionZoomOut,
+        *actionZoomOrig
     ;
 };
 

source/fb2read.cpp

@@ -280,6 +280,7 @@ Fb2Handler::ImageHandler::ImageHandler(QXmlStreamWriter &writer, const QString &
     : BodyHandler(writer, name, attributes, "img")
 {
     QString href = Value(attributes, "href");
+    while (href.left(1) == "#") href.remove(0, 1);
     writer.writeAttribute("src", href);
 }
 

source/fb2view.cpp

@@ -0,0 +1,55 @@
+#include "fb2view.h"
+#include <QtDebug>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+
+//---------------------------------------------------------------------------
+//  Fb2NetworkAccessManager
+//
+//    http://doc.trolltech.com/qq/32/qq32-webkit-protocols.html
+//---------------------------------------------------------------------------
+
+Fb2NetworkAccessManager::Fb2NetworkAccessManager(QObject *parent)
+    : QNetworkAccessManager(parent)
+{
+}
+
+QNetworkReply * Fb2NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
+{
+    qCritical() << request.url().toString();
+    return QNetworkAccessManager::createRequest(op, request, outgoingData);
+}
+
+//---------------------------------------------------------------------------
+//  Fb2WebView
+//---------------------------------------------------------------------------
+
+Fb2WebView::Fb2WebView(QWidget *parent)
+    : QWebView(parent)
+{
+    page()->setContentEditable(true);
+    QWebSettings *settings = page()->settings();
+    settings->setAttribute(QWebSettings::JavaEnabled, false);
+    settings->setAttribute(QWebSettings::JavascriptEnabled, true);
+    settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
+    settings->setAttribute(QWebSettings::PluginsEnabled, false);
+    settings->setAttribute(QWebSettings::ZoomTextOnly, true);
+    page()->setNetworkAccessManager(&m_network);
+}
+
+void Fb2WebView::zoomIn()
+{
+    qreal zoom = zoomFactor();
+    setZoomFactor(zoom * 1.1);
+}
+
+void Fb2WebView::zoomOut()
+{
+    qreal zoom = zoomFactor();
+    setZoomFactor(zoom * 0.9);
+}
+
+void Fb2WebView::zoomOrig()
+{
+    setZoomFactor(1);
+}

source/fb2view.h

@@ -0,0 +1,36 @@
+#ifndef FB2VIEW_H
+#define FB2VIEW_H
+
+#include <QWebView>
+#include <QNetworkAccessManager>
+
+class Fb2NetworkAccessManager : public QNetworkAccessManager
+{
+    Q_OBJECT
+public:
+    explicit Fb2NetworkAccessManager(QObject *parent = 0);
+
+protected:
+    virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0);
+
+};
+
+class Fb2WebView : public QWebView
+{
+    Q_OBJECT
+public:
+    explicit Fb2WebView(QWidget *parent = 0);
+    
+signals:
+    
+public slots:
+    void zoomIn();
+    void zoomOut();
+    void zoomOrig();
+
+private:
+    Fb2NetworkAccessManager m_network;
+
+};
+
+#endif // FB2VIEW_H