Working msg viewer.

rssguard.pro

@@ -193,7 +193,6 @@ HEADERS += src/core/feeddownloader.h \
            src/gui/messagessearchlineedit.h \
            src/gui/messagestoolbar.h \
            src/gui/messagesview.h \
-           src/gui/messagetextbrowser.h \
            src/gui/newspaperpreviewer.h \
            src/gui/plaintoolbutton.h \
            src/gui/squeezelabel.h \
@@ -304,7 +303,6 @@ SOURCES += src/core/feeddownloader.cpp \
            src/gui/messagessearchlineedit.cpp \
            src/gui/messagestoolbar.cpp \
            src/gui/messagesview.cpp \
-           src/gui/messagetextbrowser.cpp \
            src/gui/newspaperpreviewer.cpp \
            src/gui/plaintoolbutton.cpp \
            src/gui/squeezelabel.cpp \

src/gui/messagepreviewer.ui

@@ -23,7 +23,7 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="0" column="0">
+   <item row="0" column="1">
     <widget class="MessageBrowser" name="m_webMessage" native="true"/>
    </item>
   </layout>

src/gui/messagetextbrowser.cpp

@@ -1,35 +0,0 @@
-#include "gui/messagetextbrowser.h"
-
-#include "miscellaneous/application.h"
-#include "miscellaneous/iconfactory.h"
-#include "network-web/networkfactory.h"
-
-
-MessageTextBrowser::MessageTextBrowser(QWidget *parent) : QTextBrowser(parent) {
-}
-
-MessageTextBrowser::~MessageTextBrowser() {
-}
-
-QVariant MessageTextBrowser::loadResource(int type, const QUrl &name) {
-  Q_UNUSED(name)
-
-  switch (type) {
-    case QTextDocument::ImageResource: {
-      if (m_imagePlaceholder.isNull()) {
-        m_imagePlaceholder = qApp->icons()->miscPixmap(QSL("image-placeholder")).scaledToWidth(20, Qt::FastTransformation);
-      }
-
-      emit imageRequested(name.toString());
-      return m_imagePlaceholder;
-    }
-
-    default:
-      return QVariant();
-  }
-}
-
-void MessageTextBrowser::wheelEvent(QWheelEvent *e) {
-  QTextBrowser::wheelEvent(e);
-  qApp->settings()->setValue(GROUP(Messages), Messages::PreviewerFontStandard, font().toString());
-}

src/gui/messagetextbrowser.h

@@ -1,27 +0,0 @@
-#ifndef MESSAGETEXTBROWSER_H
-#define MESSAGETEXTBROWSER_H
-
-#include <QTextBrowser>
-
-
-
-class MessageTextBrowser : public QTextBrowser {
-    Q_OBJECT
-
-  public:
-    explicit MessageTextBrowser(QWidget *parent = 0);
-    virtual ~MessageTextBrowser();
-
-    QVariant loadResource(int type, const QUrl &name);
-
-  signals:
-    void imageRequested(const QString &image_url);
-
-  protected:
-    void wheelEvent(QWheelEvent *e);
-
-  private:
-    QPixmap m_imagePlaceholder;
-};
-
-#endif // MESSAGETEXTBROWSER_H