Update QtWebEngine te 1.8

When running with AppImage and on Ubuntu I'm getting the error that
QtWebEngine 1.7 is not installed, it seems that per default 1.8 is
installed nowadays.

.travis.yml

@@ -2,12 +2,15 @@ language: cpp
 compiler: gcc
 sudo: require
 dist: trusty
+
 before_install:
     - sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
     - sudo apt-get update -qq
+    
 install: 
     - sudo apt-get -y install qt58base qt58webengine qt58quickcontrols 
     - source /opt/qt58/bin/qt58-env.sh
+
 script:
   - qmake PREFIX=/usr
   - make -j4
@@ -15,19 +18,7 @@ script:
   - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
   - chmod a+x linuxdeployqt*.AppImage
   - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-- "./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -qmldir=./qml/
+  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -qmldir=./qml/ -bundle-non-qt-libs
-  -bundle-non-qt-libs"
+  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -qmldir=./qml/ -appimage
-- "./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -qmldir=./qml/
+  - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
-  -appimage"
+  - curl -F "file=@$(echo FeedTheMonkey*.AppImage)" https://file.io
-- find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " "
-  -f 2-3 | sort | uniq
-- mv FeedTheMonkey*.AppImage FeedTheMonkey.AppImage
-deploy:
-  provider: releases
-  api_key:
-    secure: d+hHwOnmeLPVvuue6VDCs2LwLS+BFzJF/BB5iObtkCYBwQ8ybnVzUcgnjJKOt37SHI0T9kLegI+Lq/843ECYiGiDjQg4PvCF69V8ODgHv3v1qiN5oG/eroBXd83a0+xhi4BuJt0SwcV9mcv4uD9bCPhj944rmMLH+3qD4ysgImBmbYSbbLecE9+QAs7bfrCwQRfdCePBORX3FHa/p12NEtln7xv6ZRyku9LdJSzAcdgm4zc95ggTAVC1+aQB6J0q2QzWPlQcOkLx+ZYmOqClhbSMFpIyPXP8UpXjYyvUlTAd0+wH8BGf0O3lpOqACc7IKIbj9d5oPmghVZo55SyW+RR77G+az+IbGJ7iXZsMfQZsMvtB7hNYhNvUUxQrAau7Y/ve+6sMQmvA7aMHV8kDUvnNW/c2r2jAWwk+N8QzGcP/rclDCKeOWZqZABmrzTViXZVAeXh4hJ8r6mbq8iwagBUPCsVYhVuerQt/KIoWxyn6/1GmMfKGi3dA/v3u1qU61vzrz3yLlJBmUAVPxZdVmqfRweh4BXjImxFMFmf5PYm5FnDg1gmw8rWsgii7+IPYw7DjTAHpjYbtXvDwDgG1nRXiRp2TGtPPgKW1/Uk8r/j5vfB5WcEZ7exLUgsPPjny5MGvzjqOxeLvwK1Pg9jFBFXIx7l1tNMJQxQU0r3DmBg=
-  file: FeedTheMonkey.AppImage
-  on:
-    repo: jeena/FeedTheMonkey
-  skip_cleanup: true
-  draft: true

README.md

@@ -1,6 +1,6 @@
 # FeedTheMonkey
 
-<img align=right src="http://jeena.net/feedthemonkey/feedthemonkey-icon.png" width='256' alt='Icon'>
+<img align=right src="http://jabs.nu/feedthemonkey/feedthemonkey-icon.png" width='256' alt='Icon'>
 
 FeedTheMonkey is a desktop client for [TinyTinyRSS](http://tt-rss.org). That means that
 it doesn't work as a standalone feed reader but only as a client for the TinyTinyRSS API
@@ -43,7 +43,7 @@ the use on a desktop computer but I'd like to see it on a mobile device too.
 
 ## Screenshot
 
-![Feed the Monkey screenshot](http://jeena.net/feedthemonkey/feedthemonkey-dark.png)
+![Feed the Monkey screenshot](http://jabs.nu/feedthemonkey/screenshot.png)
 
 ## License
 

html/content.css

@@ -25,12 +25,14 @@ html, body {
 body {
     background: #eee;
     font-family: sans-serif;
+    padding: 2em;
+    font-weight: lighter;
     word-wrap: break-word;
 }
 
 .nightmode {
-    background: #353535;
+    background: #111;
-    color: #ddd;
+    color: #aaa;
 }
 
 .nightmode::-webkit-scrollbar {
@@ -49,28 +51,32 @@ body {
 }
 
 h1 {
+    font-weight: lighter;
     font-size: 1.4em;
     margin: 0;
     padding: 0;
 }
 
+#date {
+    border-bottom: 1px solid #aaa;
+    margin-bottom: 1em;
+    padding-bottom: 1em;
+    display: block;
+}
+
+.nightmode #date {
+    border-bottom-color: #333;
+}
+
 .starred:after {
     content: "*";
 }
 
-header {
-    padding: 2em;
-    border-bottom: 1px solid #aaa;
-}
-
-.nightmode header {
-    border-bottom-color: #222;
-}
-
 header p {
-    color: #666;
+    color: #aaa;
     margin: 0;
     padding: 0;
+    font-size: 0.8em;
 }
 
 .nightmode header p {
@@ -84,7 +90,6 @@ a {
 
 article {
     line-height: 1.6;
-    margin: 2em;
 }
 
 article a {

html/content.html

@@ -81,13 +81,11 @@
 
     function checkKey(e) {
         e = e || window.event;
-
         if (e.keyCode === 37) {
             window.location.href = "feedthemonkey:previous";
-        } else if (e.keyCode === 39) {
+        }
+        else if (e.keyCode === 39) {
             window.location.href = "feedthemonkey:next";
-        } else if(e.keyCode == 13) {
-            window.location.href = "feedthemonkey:open";
         }
     }
 

qml/Content.qml

@@ -22,6 +22,7 @@ import QtQuick 2.0
 import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.3
+import QtQuick.Controls 1.3
 import TTRSS 1.0
 
 Item {
@@ -86,14 +87,13 @@ Item {
 
         onNavigationRequested: {
             if (request.url == "feedthemonkey:previous") {
-                request.action = WebEngineView.IgnoreRequest;
+                // This is commented out because for some reason this reloads the page forever.
+                // This will show the error that the feedthemonkey:previous location is not supported
+                //request.action = WebEngineNavigationRequest.IgnoreRequest;
                 app.showPreviousPost();
             } else if (request.url == "feedthemonkey:next") {
-                request.action = WebEngineView.IgnoreRequest;
+                //request.action = WebEngineNavigationRequest.IgnoreRequest;
                 app.showNextPost();
-            } else if (request.url == "feedthemonkey:open") {
-                request.action = WebEngineView.IgnoreRequest;
-                Qt.openUrlExternally(post.link)
             } else if (request.navigationType !== WebEngineNavigationRequest.LinkClickedNavigation) {
                 request.action = WebEngineView.AcceptRequest;
             } else {

qml/PostListItem.qml

@@ -33,7 +33,7 @@ Item {
     }
 
     id: item
-    height: d.height + t.height + e.height + 2
+    height: d.height + t.height + e.height + 20
 
     Item {
         anchors.fill: parent
@@ -81,7 +81,7 @@ Item {
                 Label {
                     id: t
                     text: title
-                    color: nightmode ? (read ? "#888" : "#ddd") : (read ? "gray" : "black")
+                    color: nightmode ? (read ? "#555" : "#aaa") : (read ? "gray" : "black")
                     font.pointSize: textFontSize
                     textFormat: Text.PlainText
                     wrapMode: Text.WrapAnywhere

qml/Sidebar.qml

@@ -48,21 +48,6 @@ ScrollView {
         }
     }
 
-    onWidthChanged: {
-        // Hide sidebar if smaller than 200px wide
-        if(width < 200) {
-            width = 0;
-        }
-    }
-
-    Rectangle {
-        width: 1
-        color: app.nightmode ? "#111" : "lightgray"
-        anchors.right: parent.right
-        anchors.top: parent.top
-        height: parent.height
-    }
-
     ListView {
         id: listView
 
@@ -82,12 +67,12 @@ ScrollView {
         highlightFollowsCurrentItem: false
         highlight: Component {
             Rectangle {
-                width: listView.currentItem.width -1
+                width: listView.currentItem.width
                 height: listView.currentItem.height
-                color: nightmode ? "#15539e" : "lightblue"
+                color: nightmode ? "#444" : "lightblue"
+                opacity: 0.5
                 y: listView.currentItem.y
             }
-
         }
 
         onCurrentItemChanged: {
@@ -100,6 +85,8 @@ ScrollView {
             }
 
             item.content.post = server.posts[currentIndex]
+            //content.flickableItem.contentY = 0
+
             previousPost = item.content.post
         }
     }

qml/TheMenuBar.qml

@@ -35,11 +35,6 @@ MenuBar {
     Menu {
         visible: menuBar.visible
         title: qsTr("File")
-        MenuItem {
-            text: qsTr("Close &Window")
-            shortcut: "Ctrl+W"
-            onTriggered: Qt.quit()
-        }
         MenuItem {
             text: qsTr("Exit")
             shortcut: "Ctrl+Q"
@@ -137,7 +132,7 @@ MenuBar {
         title: qsTr("Help")
         MenuItem {
             text: qsTr("About")
-            onTriggered: Qt.openUrlExternally("http://jeena.net/feedthemonkey/index.html");
+            onTriggered: Qt.openUrlExternally("http://jabs.nu/feedthemonkey");
         }
     }
 

qml/main.qml

@@ -29,7 +29,7 @@ ApplicationWindow {
     id: app
     title: "FeedTheMonkey"
     visible: true
-    color: nightmode ? "#2d2d2d" : "#eee"
+    color: nightmode ? "#111" : "#eee"
 
     minimumWidth: 480
     minimumHeight: 320
@@ -159,6 +159,10 @@ ApplicationWindow {
         case Qt.Key_Return:
             Qt.openUrlExternally(content.post.link)
             break
+        case Qt.Key_S: {
+            console.log(Qt.openUrlExternally("speaker:"+ removeHTML(content.post.content)))
+            break
+        }
         default:
             break
         }
@@ -180,6 +184,7 @@ ApplicationWindow {
             content: content
             server: server
 
+            Layout.minimumWidth: 200
             implicitWidth: 300
             textFontSize: app.textFontSize
             nightmode: app.nightmode

src/main.cpp

@@ -31,7 +31,6 @@
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QGuiApplication app(argc, argv);
     app.setOrganizationName("Jeena");
     app.setOrganizationDomain("jeena.net");