Print system font log only when verbose is enabled.

Reintroduce optional old burnin and improve highdpi support.

.travis.yml

@@ -0,0 +1,37 @@
+sudo: required
+dist: trusty
+language: c++
+
+install:
+  - sudo add-apt-repository -y ppa:beineri/opt-qt58-trusty
+  - sudo apt-get update -qq
+  - sudo apt-get -y install build-essential qt58declarative qt58graphicaleffects qt58quickcontrols libgl1-mesa-dev
+  - source /opt/qt*/bin/qt*-env.sh
+
+script:
+  - qmake CONFIG+=release PREFIX=/usr
+  - make -j$(nproc)
+  - mkdir -p appdir/usr/share/metainfo appdir/usr/bin
+  - cp packaging/appdata/cool-retro-term.appdata.xml appdir/usr/share/metainfo/
+  - cp cool-retro-term appdir/usr/bin/
+  - cp ./cool-retro-term.desktop appdir/
+  - cp ./app/icons/128x128/cool-retro-term.png appdir/
+  - cp -r ./app/qml appdir/usr/
+  - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78
+  - 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
+  - export VERSION=$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file
+  - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ # -verbose=3 2>&1 | grep "path:" -C 3
+  - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -verbose=2 -appimage
+  
+after_success:
+  - find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+  - # curl --upload-file Cool*.AppImage https://transfer.sh/Cool_Retro_Term-git.$(git rev-parse --short HEAD)-x86_64.AppImage
+  - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+  - bash upload.sh Cool*.AppImage*
+  
+branches:
+  except:
+    - # Do not build tags that we create when we upload to GitHub Releases
+    - /^(?i:continuous)/

app/main.cpp

@@ -33,6 +33,10 @@ int main(int argc, char *argv[])
     // This disables QT appmenu under Ubuntu, which is not working with QML apps.
     setenv("QT_QPA_PLATFORMTHEME", "", 1);
 
+#if defined (Q_OS_LINUX)
+    setenv("QSG_RENDER_LOOP", "threaded", 0);
+#endif
+
 #if defined(Q_OS_MAC)
     // This allows UTF-8 characters usage in OSX.
     setenv("LC_CTYPE", "UTF-8", 1);
@@ -70,8 +74,10 @@ int main(int argc, char *argv[])
         return 0;
     }
 
+    QString appVersion("1.1.1");
+
     if (args.contains("-v") || args.contains("--version")) {
-        qDebug() << "cool-retro-term 1.0.1";
+        qDebug() << ("cool-retro-term " + appVersion).toStdString().c_str();
 	return 0;
     }
 
@@ -82,6 +88,7 @@ int main(int argc, char *argv[])
     }
     QVariant command(cmdList.empty() ? QVariant() : cmdList[0]);
     QVariant commandArgs(cmdList.size() <= 1 ? QVariant() : QVariant(cmdList.mid(1)));
+    engine.rootContext()->setContextProperty("appVersion", appVersion);
     engine.rootContext()->setContextProperty("defaultCmd", command);
     engine.rootContext()->setContextProperty("defaultCmdArgs", commandArgs);
 

app/qml/ApplicationSettings.qml

@@ -24,7 +24,7 @@ import QtQuick.Controls 1.0
 import "utils.js" as Utils
 
 QtObject{
-    readonly property string version: "1.1.0"
+    readonly property string version: appVersion
     readonly property int profileVersion: 2
 
     // STATIC CONSTANTS ////////////////////////////////////////////////////////
@@ -134,7 +134,7 @@ QtObject{
 
     property FontLoader fontLoader: FontLoader { }
 
-    onFontScalingChanged: handleFontChanged();
+    onTotalFontScalingChanged: handleFontChanged();
     onFontWidthChanged: handleFontChanged();
 
     function getIndexByName(name) {

app/qml/Fonts.qml

@@ -236,7 +236,9 @@ QtObject{
     function addSystemFonts() {
         var families = monospaceSystemFonts;
         for (var i = 0; i < families.length; i++) {
-            console.log("Adding system font: ", families[i])
+            if (verbose) {
+                console.log("Adding system font: ", families[i])
+            }
             fontlist.append(convertToListElement(families[i]))
         }
     }

snap/snapcraft.yaml

@@ -1,15 +1,19 @@
 name: cool-retro-term # check to see if it's available
-version: '1.1.0' # this is freakin' awesome
+version: '1.1.1' # this is freakin' awesome
-summary: cool-retro-term is a terminal emulator. # 79 char long summary
+summary: cool-retro-term is a cool and retro terminal emulator. # 79 char long summary
 description: |
   cool-retro-term is a terminal emulator which mimics the look and feel of the old cathode tube screens. It has been designed to be eye-candy, customizable, and reasonably lightweight.
 grade: stable # must be 'stable' to release into candidate/stable channels
-confinement: strict # use 'strict' once you have the right plugs
+confinement: classic # use 'strict' once you have the right plugs
+
+base: core18
 
 apps:
   cool-retro-term:
-    command: desktop-launch $SNAP/usr/bin/cool-retro-term
+    command: bin/desktop-launch $SNAP/usr/bin/cool-retro-term
     desktop: usr/share/applications/cool-retro-term.desktop
+    environment:
+      QML2_IMPORT_PATH: $SNAP/usr/lib/x86_64-linux-gnu/qt5/qml
     plugs:
       - unity7
       - x11
@@ -27,13 +31,38 @@ apps:
       - system-observe
       
 parts:
+  desktop-qt5:
+    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+    source-subdir: qt
+    plugin: make
+    make-parameters: ["FLAVOR=qt5"]
+    build-packages:
+      - build-essential
+      - qtbase5-dev
+      - dpkg-dev
+    stage-packages:
+      - libxkbcommon0
+      - ttf-ubuntu-font-family
+      - dmz-cursor-theme
+      - light-themes
+      - adwaita-icon-theme
+      - gnome-themes-standard
+      - shared-mime-info
+      - libqt5gui5
+      - libgdk-pixbuf2.0-0
+      - libqt5svg5 # for loading icon themes which are svg
+      - try: [appmenu-qt5] # not available on core18
+      - locales-all
+      - xdg-user-dirs
+      - fcitx-frontend-qt5
+
   my-part:
     source: https://github.com/Swordfish90/cool-retro-term
     source-type: git
     plugin: qmake # See 'snapcraft plugins'
     qt-version: qt5
     after: [desktop-qt5]
-    
+
     build-packages:
       - build-essential 
       - qmlscene 
@@ -44,11 +73,12 @@ parts:
     stage-packages: 
       - qmlscene
       - qml-module-qtquick-controls 
-      - qtdeclarative5-qtquick2-plugin 
+      - qml-module-qtquick2
-      - libqt5qml-graphicaleffects 
+      - qml-module-qtgraphicaleffects
       - qml-module-qtquick-dialogs 
-      - qtdeclarative5-localstorage-plugin 
+      - qml-module-qtquick-localstorage
-      - qtdeclarative5-window-plugin
+      - qml-module-qtquick-window2
       - libgl1-mesa-dev
       - qtdeclarative5-dev-tools
       - qml-module-qtquick-extras
+