From 58b8bdbd31701dfcf6ab5a4346bd38210bb21336 Mon Sep 17 00:00:00 2001
From: Jeena <spam@jeenaparadies.net>
Date: Tue, 3 Feb 2015 23:44:03 +0100
Subject: [PATCH] removed webkit

---
 Content.qml      | 113 ++++++++++++++++++++++++++++++++++++-----------
 PostListItem.qml |  11 ++---
 2 files changed, 94 insertions(+), 30 deletions(-)

diff --git a/Content.qml b/Content.qml
index 1b7ada7..d44968d 100644
--- a/Content.qml
+++ b/Content.qml
@@ -1,12 +1,10 @@
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
+import QtQuick 2.0
 import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.3
 import TTRSS 1.0
 
 ScrollView {
-    id: content
     property Post post
     Layout.minimumWidth: 400
 
@@ -14,31 +12,96 @@ ScrollView {
         transientScrollBars: true
     }
 
-    WebView {
-        id: webView
-        url: "content.html"
+    Item {
+        height: column.height + 20
+        width: parent.parent.width
 
-        property Post post: content.post
+        Rectangle {
+            anchors.fill: parent
+            width: parent.width
+            height: column.height
+            anchors.margins: 30
+            color: "transparent"
 
-        function setPost() {
-            if(post) {
-                experimental.evaluateJavaScript("setArticle(" + post.jsonString + ")")
+            Column {
+                id: column
+                spacing: 10
+                width: parent.width
+
+                Label {
+                    text: {
+                        if(post) {
+                            var str = post.feedTitle
+                            if(post.author) {
+                                str += " - " + post.author;
+                            }
+                            return str;
+                        } else {
+                            return ""
+                        }
+                    }
+                    color: "gray"
+                    font.pointSize: 16
+                    wrapMode: Text.Wrap
+                    width: parent.width
+                }
+
+                Label {
+                    text: post ? post.title : ""
+                    font.pointSize: 30
+                    wrapMode: Text.Wrap
+                    width: parent.width
+                }
+
+                Label {
+                    text: post ? post.date.toLocaleString(Qt.locale(), Locale.LongFormat) : ""
+                    color: "gray"
+                    font.pointSize: 16
+                    wrapMode: Text.Wrap
+                    width: parent.width
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: 14
+                    color: "transparent"
+
+                    Rectangle {
+                        width: parent.width
+                        height: 1
+                        anchors.top: parent.top
+                        anchors.topMargin: 15
+                        color: "lightgray"
+                        visible: {
+                            if(post) {
+                                return true;
+                            }
+                            return false;
+                        }
+                    }
+                }
+
+                Rectangle {
+                    height: contentLabel.height + 20
+                    width: parent.width
+                    color: "transparent"
+
+                    Label {
+                        id: contentLabel
+                        text: post ? post.content : ""
+                        font.pointSize: 16
+                        wrapMode: Text.Wrap
+                        width: parent.width
+                        anchors.top: parent.top
+                        anchors.topMargin: 20
+                        lineHeight: 1.3
+                        linkColor: "#555"
+                        onLinkActivated: {
+                            Qt.openUrlExternally(link)
+                        }
+                    }
+                }
             }
         }
-
-        // Enable communication between QML and WebKit
-        experimental.preferences.navigatorQtObjectEnabled: true;
-
-        onNavigationRequested: {
-            if (request.navigationType != WebView.LinkClickedNavigation) {
-                request.action = WebView.AcceptRequest;
-            } else {
-                request.action = WebView.IgnoreRequest;
-                Qt.openUrlExternally(request.url);
-            }
-        }
-
-        onLoadingChanged: setPost()
-        onPostChanged: setPost()
     }
 }
diff --git a/PostListItem.qml b/PostListItem.qml
index c7e427d..7a89d9a 100644
--- a/PostListItem.qml
+++ b/PostListItem.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.0
+import QtQuick.Controls 1.3
 
 Component {
     id: component
@@ -25,26 +26,26 @@ Component {
 
                     Row {
                         spacing: 10
-                        Text {
+                        Label {
                             text: feedTitle
                             font.pointSize: 12
                             color: "gray"
                             wrapMode: Text.Wrap
                         }
-                        Text {
-                            text: date.toLocaleString(null)
+                        Label {
+                            text: date.toLocaleString(Qt.locale(), Locale.ShortFormat)
                             font.pointSize: 12
                             color: "gray"
                             wrapMode: Text.Wrap
                         }
                     }
-                    Text {
+                    Label {
                         text: title
                         font.pointSize: 16
                         wrapMode: Text.Wrap
                         width: parent.width
                     }
-                    Text {
+                    Label {
                         text: excerpt
                         font.pointSize: 12
                         color: "gray"