Fix problem with HDPI screens

On high dpi screens the thml was shown way too small, this let's it
scale properly.

.travis.yml

@@ -2,23 +2,32 @@ language: cpp
 compiler: gcc
 sudo: require
 dist: trusty
-
 before_install:
-    - sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
+- sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
-    - sudo apt-get update -qq
+- sudo apt-get update -qq
-    
+install:
-install: 
+- sudo apt-get -y install qt58base qt58webengine qt58quickcontrols
-    - sudo apt-get -y install qt58base qt58webengine qt58quickcontrols 
+- source /opt/qt58/bin/qt58-env.sh
-    - source /opt/qt58/bin/qt58-env.sh
-
 script:
-  - qmake PREFIX=/usr
+- qmake PREFIX=/usr
-  - make -j4
+- make -j4
-  - sudo make INSTALL_ROOT=appdir install ; sudo chown -R $USER appdir ; find appdir/
+- sudo make INSTALL_ROOT=appdir install ; sudo chown -R $USER appdir ; find appdir/
-  - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
+- wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-  - chmod a+x linuxdeployqt*.AppImage
+- chmod a+x linuxdeployqt*.AppImage
-  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+- unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -qmldir=./qml/ -bundle-non-qt-libs
+- "./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -qmldir=./qml/
-  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -qmldir=./qml/ -appimage
+  -bundle-non-qt-libs"
-  - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+- "./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -qmldir=./qml/
-  - curl --upload-file ./FeedTheMonkey*.AppImage https://transfer.sh/FeedTheMonkey-git.$(git rev-parse --short HEAD)-x86_64.AppImage
+  -appimage"
+- 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://jabs.nu/feedthemonkey/feedthemonkey-icon.png" width='256' alt='Icon'>
+<img align=right src="http://jeena.net/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://jabs.nu/feedthemonkey/screenshot.png)
+![Feed the Monkey screenshot](http://jeena.net/feedthemonkey/feedthemonkey-dark.png)
 
 ## License
 

html/content.css

@@ -25,14 +25,12 @@ html, body {
 body {
     background: #eee;
     font-family: sans-serif;
-    padding: 2em;
-    font-weight: lighter;
     word-wrap: break-word;
 }
 
 .nightmode {
-    background: #111;
+    background: #353535;
-    color: #aaa;
+    color: #ddd;
 }
 
 .nightmode::-webkit-scrollbar {
@@ -51,32 +49,28 @@ 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: #aaa;
+    color: #666;
     margin: 0;
     padding: 0;
-    font-size: 0.8em;
 }
 
 .nightmode header p {
@@ -90,6 +84,7 @@ a {
 
 article {
     line-height: 1.6;
+    margin: 2em;
 }
 
 article a {

html/content.html

@@ -4,7 +4,96 @@
     <meta charset="utf-8">
     <title>TTRSS</title>
     <link href="content.css" media="all" rel="stylesheet">
-    <script type="text/javascript" src="content.js"></script>
+    <script type="text/javascript">
+    /*
+     * This file is part of FeedTheMonkey.
+     *
+     * Copyright 2015 Jeena
+     *
+     * FeedTheMonkey 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 3 of the License, or
+     * (at your option) any later version.
+     *
+     * FeedTheMonkey 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 FeedTheMonkey.  If not, see <http://www.gnu.org/licenses/>.
+     */
+
+    function $(id) {
+        return document.getElementById(id);
+    }
+
+    function setArticle(article) {
+        window.scrollTo(0, 0);
+
+        $("date").innerHTML = "";
+        $("title").innerHTML = "";
+        $("title").href = "";
+        $("title").title = "";
+        $("feed_title").innerHTML = "";
+        $("author").innerHTML = "";
+        $("article").innerHTML = "";
+
+        if(article === "empty") {
+
+            $("article").innerHTML = "No unread articles to display.";
+
+        } else if(article === "loading") {
+
+            $("article").innerHTML = "Loading <blink>&hellip;</blink>";
+
+        } else if (article === "logout") {
+
+        } else if(article) {
+
+            $("date").innerHTML = (new Date(parseInt(article.updated, 10) * 1000));
+            $("title").innerHTML = article.title;
+            $("title").href = article.link;
+            $("title").title = article.link;
+            $("feed_title").innerHTML = article.feed_title;
+            $("title").className = article.marked ? "starred" : "";
+            $("author").innerHTML = "";
+            if(article.author && article.author.length > 0)
+                $("author").innerHTML = "&ndash; " + article.author
+            $("article").innerHTML = article.content;
+
+            var as = $("article").getElementsByTagName("a");
+            for(var i = 0; i < as.length; i++) {
+                as[i].target = "";
+            }
+        }
+    }
+
+    function setFont(font, size) {
+        document.body.style.fontFamily = font;
+        document.body.style.fontSize = size + "pt";
+    }
+
+    function setNightmode(nightmode) {
+        if(nightmode) document.body.className = "nightmode";
+        else document.body.className = "";
+    }
+
+    function checkKey(e) {
+        e = e || window.event;
+
+        if (e.keyCode === 37) {
+            window.location.href = "feedthemonkey:previous";
+        } else if (e.keyCode === 39) {
+            window.location.href = "feedthemonkey:next";
+        } else if(e.keyCode == 13) {
+            window.location.href = "feedthemonkey:open";
+        }
+    }
+
+    window.addEventListener("keydown", checkKey);
+
+    </script>
     <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
 </head>
 <body class=''>

html/content.js

@@ -1,85 +0,0 @@
-/*
- * This file is part of FeedTheMonkey.
- *
- * Copyright 2015 Jeena
- *
- * FeedTheMonkey 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 3 of the License, or
- * (at your option) any later version.
- *
- * FeedTheMonkey 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 FeedTheMonkey.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-function $(id) {
-    return document.getElementById(id);
-}
-
-function setArticle(article) {
-    window.scrollTo(0, 0);
-
-    $("date").innerHTML = "";
-    $("title").innerHTML = "";
-    $("title").href = "";
-    $("title").title = "";
-    $("feed_title").innerHTML = "";
-    $("author").innerHTML = "";
-    $("article").innerHTML = "";
-
-    if(article === "empty") {
-
-        $("article").innerHTML = "No unread articles to display.";
-
-    } else if(article === "loading") {
-
-        $("article").innerHTML = "Loading <blink>&hellip;</blink>";
-
-    } else if (article === "logout") {
-
-    } else if(article) {
-
-        $("date").innerHTML = (new Date(parseInt(article.updated, 10) * 1000));
-        $("title").innerHTML = article.title;
-        $("title").href = article.link;
-        $("title").title = article.link;
-        $("feed_title").innerHTML = article.feed_title;
-        $("title").className = article.marked ? "starred" : "";
-        $("author").innerHTML = "";
-        if(article.author && article.author.length > 0)
-            $("author").innerHTML = "&ndash; " + article.author
-        $("article").innerHTML = article.content;
-
-        var as = $("article").getElementsByTagName("a");
-        for(var i = 0; i < as.length; i++) {
-            as[i].target = "";
-        }
-    }
-}
-
-function setFont(font, size) {
-    document.body.style.fontFamily = font;
-    document.body.style.fontSize = size + "pt";
-}
-
-function setNightmode(nightmode) {
-    if(nightmode) document.body.className = "nightmode";
-    else document.body.className = "";
-}
-
-document.onkeydown = checkKey;
-
-function checkKey(e) {
-    e = e || window.event;
-    if (e.keyCode == '37') {
-        window.location.href = "feedthemonkey:previous";
-    }
-    else if (e.keyCode == '39') {
-        window.location.href = "feedthemonkey:next";
-    }
-}

html/html.qrc

@@ -2,6 +2,5 @@
     <qresource prefix="/html">
         <file>content.css</file>
         <file>content.html</file>
-        <file>content.js</file>
     </qresource>
 </RCC>

qml/Content.qml

@@ -17,12 +17,11 @@
  * along with FeedTheMonkey.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtWebEngine 1.0
+import QtWebEngine 1.8
 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 {
@@ -92,7 +91,10 @@ Item {
             } else if (request.url == "feedthemonkey:next") {
                 request.action = WebEngineView.IgnoreRequest;
                 app.showNextPost();
-            } else if (request.navigationType != WebEngineView.LinkClickedNavigation) {
+            } 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 {
                 request.action = WebEngineView.IgnoreRequest;

qml/PostListItem.qml

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

qml/Sidebar.qml

@@ -48,6 +48,21 @@ 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
 
@@ -67,12 +82,12 @@ ScrollView {
         highlightFollowsCurrentItem: false
         highlight: Component {
             Rectangle {
-                width: listView.currentItem.width
+                width: listView.currentItem.width -1
                 height: listView.currentItem.height
-                color: nightmode ? "#444" : "lightblue"
+                color: nightmode ? "#15539e" : "lightblue"
-                opacity: 0.5
                 y: listView.currentItem.y
             }
+
         }
 
         onCurrentItemChanged: {
@@ -85,8 +100,6 @@ ScrollView {
             }
 
             item.content.post = server.posts[currentIndex]
-            //content.flickableItem.contentY = 0
-
             previousPost = item.content.post
         }
     }

qml/TheMenuBar.qml

@@ -35,6 +35,11 @@ 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"
@@ -132,7 +137,7 @@ MenuBar {
         title: qsTr("Help")
         MenuItem {
             text: qsTr("About")
-            onTriggered: Qt.openUrlExternally("http://jabs.nu/feedthemonkey");
+            onTriggered: Qt.openUrlExternally("http://jeena.net/feedthemonkey/index.html");
         }
     }
 

qml/main.qml

@@ -29,7 +29,7 @@ ApplicationWindow {
     id: app
     title: "FeedTheMonkey"
     visible: true
-    color: nightmode ? "#111" : "#eee"
+    color: nightmode ? "#2d2d2d" : "#eee"
 
     minimumWidth: 480
     minimumHeight: 320
@@ -60,7 +60,6 @@ ApplicationWindow {
         __contentItem.visible: visible
     }
 
-
     Settings {
         id: settings
         category: "window"
@@ -160,10 +159,6 @@ 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
         }
@@ -185,7 +180,6 @@ ApplicationWindow {
             content: content
             server: server
 
-            Layout.minimumWidth: 200
             implicitWidth: 300
             textFontSize: app.textFontSize
             nightmode: app.nightmode

src/main.cpp

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

src/tinytinyrsslogin.cpp

@@ -99,6 +99,18 @@ void TinyTinyRSSLogin::reply()
                 qWarning() << mLoginError;
                 emit loginErrorChanged(mLoginError);
 
+                if(mLoginError == "NOT_LOGGED_IN") {
+                    mSessionId = nullptr;
+                    mServerUrl = nullptr;
+
+                    QSettings settings;
+                    settings.remove("sessionId");
+                    settings.remove("serverUrl");
+                    settings.sync();
+
+                    emit sessionIdChanged(mSessionId);
+                }
+
             } else {
                 mSessionId = json.object().value("content").toObject().value("session_id").toString();