Merge branch 'release/0.2'

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "material"]
-	path = material
-	url = [email protected]:papyros/qml-material.git

.mailmap

@@ -0,0 +1,2 @@
+Andrew Penkrat <[email protected]> <[email protected]>
+Andrew Penkrat <[email protected]> <[email protected]>

.travis.yml

@@ -0,0 +1,64 @@
+language: cpp
+
+matrix:
+  include:
+    - os: linux
+      cache:
+        directories:
+          - /var/cache/apt/archives/*.deb
+      compiler: gcc
+      sudo: require
+      dist: trusty
+    - os: osx
+
+before_install:
+  - ./.travis/update.sh
+install:
+  - ./.travis/install.sh
+
+script:
+  - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then source /opt/qt58/bin/qt58-env.sh ; fi
+  - git clone -b develop https://github.com/lirios/fluid
+  - cd fluid
+  - git submodule update --init
+  - ./scripts/fetch_icons.sh
+  - mkdir build
+  - cd build
+  - qmake CONFIG+=use_qt_paths ../fluid.pro
+  - make -j4
+  - sudo make install
+  - cd ../../
+  - mkdir build
+  - cd build
+  - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then mkdir -p data/language-specs ; cp ../data/language-specs/*.lang
+    data/language-specs/ ; fi
+  - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then qmake LIRI_INSTALL_PREFIX=/usr ../liri-text.pro
+    ; else qmake ../liri-text.pro ; fi
+  - make -j4
+  - ../.travis/package.sh
+  - cd ..
+
+before_deploy:
+  - git fetch --unshallow
+  - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then packagetype=appimage ; fi
+  - if [[ $TRAVIS_OS_NAME == 'osx'   ]]; then packagetype=macos ; fi
+  - gittag=$(git describe --tags --abbrev=0)
+  - today=$(date +"%Y-%m-%d")
+  - gitrev=$(git log -1 --format="%h")
+  - gitdate=$(git log -1 --format="%aI")
+  - cat .travis/bintray.json.in |
+    sed -e "s,@BINTRAY_REPO@,$packagetype,g"
+        -e "s,@PKGVER@,$gittag,g"
+        -e "s,@GITTAG@,$gittag,g"
+        -e "s,@TODAY@,$today,g"
+        -e "s,@GITREV@,$gitrev,g"
+        -e "s,@GITDATE@,$gitdate,g"
+        > .travis/bintray.json
+deploy:
+  provider: bintray
+  file: .travis/bintray.json
+  on: master
+  user:
+    secure: FWt1S82VflWSOzU+WyytyIOwsxwQouQ7H9l/JnO33Jx4NMgM5Rr6/Sp1E960FucB9+MYK73R1Le+7iRbVqyB7CuaYV6YZnD66zE6DTwDnb4sOmfGBa1D+5ldxxWx65HMBK5yzkwX+eU6+akH1VoLIpF8xSpWcdU8wFl3TJ2fBtlZnC+1FpEI93TiF0YDLnkR/3m542KMYDY8sV9ocMk8HSTGZrtc89QUb4e+J9OPgiuu3BfKPeh/H9hya1ArG9kuzp9n+Qrck/aYBApRyAi3JN6nQdTQuUkadvtBnA/8cQxBFsZvw81LIuhQI5c/IXhbFS/4xaGQcqiGFv837MYbs8V7s18d8TX8AF5aRDR1Zd6YZ1qxtEu8B4tQhGhSsiOuQaVr+bHjZgtMmaN7eCtCSeSK2QIbVSfKSnuxTspz0w8ZZmUI5YG4H8E4/eBa9fQdgl27PJL6q42DbhrpwFguxgnkRVJOtQbFuSH9j3duHSCA6J4A3aPBD2lcVhFFtZGaMySpXqjU8XG3FwKZzHBPNYg+n+vvXtWf4ZPthjfX9j9SGo2r6FOELk4iPzmNAxh7Rv9HQErVTtrODQ+HBmUhMAetCy15CYImJeJKINp66TCbHDSMnQe8ZeBO9oQwZ/XA7KLN85rrKg4ixpTT2bqud9UOWB0BMRDFSyD+QR7zh0I=
+  key:
+    secure: STqNB1KzND6JIpk4QfvL/JlhPNKYvPxQYeJu4PO1RlS7z72sjuiMWhVbOjnvDaCyaGpAyRCT+0sLmI4LnJ+/v5YVkXC38y8uz2RydyEqaWalnOdLyqahjLeD+Znv6krmmvmCiUJwg5ZwnyF0m4LEyMaSfUAE1K0ozwCfCiKmuIgaAj873A/AEW0RNxYbu9gl1Q7ThMiEueSyxZH0ypkP7uHEFgyvay4L4xSezYL/bbpQ72VutpK5S17EsZh/3SJn39B7vFLy/Kin4NAl4aAoVuW6jitsXqeAqEd9gb1+5s2EoNe8+VDbE69PDn8yE6tjxA921+FnLk50D0EOqvKuxnzAGjPA2wh/ax4HgMFTC3fQEoexXb7pN2rNp4EcyRGsq/UkrZ/C3Co3lb+BLz+w5pISlUCG2jsZgcGFLmamhE6Fae2ecq4wHwpz5cNQLsxJOgjezNqqhVQ3xNhsC2OOlr1B61Z0opSXIUOf/MoZb9fHpbfHJ09EgRZUeLH0PgtOvS7SNhXEUgKZ9uoAYzrLnPtbyR4KISN7PKysa0xgiaYnkMTMSYxy5G7Jo5VW1vEBdUS/zAwPNC65XG+rcEcSmaWl4e+Qf3pQuxXm/VS+fKwfyureDPr9Qozgb2t/KyZROlJWuFFtkAaHoRVEti+0N7H03F8800AQK+9whPgxuPI=

.travis/bintray.json.in

@@ -0,0 +1,22 @@
+{
+  "package": {
+    "name": "Text",
+    "repo": "@BINTRAY_REPO@",
+    "subject": "liri"
+  },
+  "version": {
+    "name": "@PKGVER@",
+    "desc": "Automatic CI build of the release",
+    "released": "@TODAY@",
+    "vcs_tag": "@GITTAG@",
+    "attributes": [
+      {"name": "gitrevision", "values": ["@GITREV@"], "type": "string"},
+      {"name": "gitdate", "values": ["@GITDATE@"], "type": "date"}
+    ],
+    "gpgSign": false
+  },
+  "files": [
+    {"includePattern": "build/(Liri_Text.*\\.(AppImage|dmg))", "uploadPattern": "$1", "matrixParams": {"override": 1}}
+  ],
+  "publish": true
+}

.travis/install.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+    brew install qt5
+    brew link qt5 --force
+else
+    sudo apt-get -y install qt58base qt58declarative qt58quickcontrols qt58quickcontrols2 qt58svg qt58graphicaleffects
+fi

.travis/package.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+    macdeployqt liri-text.app -dmg -qmldir=../src/qml -verbose=2
+    mv liri-text.dmg Liri_Text.dmg
+    curl --upload-file ./Liri_Text*.dmg https://transfer.sh/Liri_Text-git-$(date +%Y%m%d-%H%M%S)-$(git rev-parse --short HEAD).dmg
+else
+    mkdir 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" 
+    chmod a+x linuxdeployqt*.AppImage
+    unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+    ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -qmldir=. -verbose=2
+    rm ./appdir/io.liri.Text.png # Workaround for linuxedeloyqt bug
+    ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage -qmldir=../src/qml -verbose=2
+    find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+    curl --upload-file ./Liri_Text*.AppImage https://transfer.sh/Liri_Text-git-$(date +%Y%m%d-%H%M%S)-$(git rev-parse --short HEAD)-x86_64.AppImage
+fi

.travis/update.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+    brew update
+else
+    sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
+    sudo apt-get update -qq
+fi

AUTHORS.md

@@ -0,0 +1,27 @@
+Liri Text
+=========
+
+# Core Developers
+
+ * Andrew Penkrat <[email protected]>
+
+# Contributors
+
+This is the list of contributors to this code base.
+
+Names are sorted by number of commits at the time of this writing.
+Commit data has been generated with:
+
+```sh
+git shortlog -s -e -n
+```
+
+Commit counts have been removed, since they change pretty frequently.
+
+Remember to update this file before any release is made, also make sure
+a .mailmap file is maintained if committer names and email addresses
+change over time.
+
+ * Andrew Penkrat <[email protected]>
+ * Pier Luigi Fiorini <[email protected]>
+ * Tim Süberkrüb <[email protected]>

README.md

@@ -1,30 +1,31 @@
-# Liri Text
-This is Liri Text, crossplatform text editor made in accordance with Material Design.  
-For now it only provides very basic functionality, but will evolve into a very powerful tool some time.
+Liri Text
+=========
 
-## Installation
-You may find a prebuilt binary for your platform on [releases page](https://github.com/liri-project/liri-text/releases).
-If your platform is not yet supported or you wish to contribute to this project's development, you can compile Liri Text from source following the instructions below:
+[![license](https://img.shields.io/github/license/lirios/text.svg)](https://github.com/lirios/text/blob/master/LICENSE)
+[![GitHub release](https://img.shields.io/github/release/lirios/text.svg)](https://github.com/lirios/text/releases)
+[![Build Status](https://img.shields.io/travis/lirios/text/master.svg)](https://travis-ci.org/lirios/text)
+[![GitHub issues](https://img.shields.io/github/issues/lirios/text.svg)](https://github.com/lirios/text/issues)
+[![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)](https://github.com/lirios/text/commits/master)
 
-## Build
-1. Install dependencies
-  - [Qt 5.5 or higher](http://qt.io)
+Liri Text is a cross-platform text editor made in accordance with Material Design.
 
-2. Build Liri Text
-  ```
-  git clone --recursive https://github.com/liri-project/liri-text.git
-  cd liri-text
+## Dependencies
+* Qt >= 5.8.0 with at least the following modules is required:
+ * [qtbase](http://code.qt.io/cgit/qt/qtbase.git)
+ * [qtdeclarative](http://code.qt.io/cgit/qt/qtdeclarative.git)
+ * [qtquickcontrols2](http://code.qt.io/cgit/qt/qtquickcontrols2.git)
+* [Fluid](https://github.com/lirios/fluid) >= 0.10.0
+* [SQLite](https://www.sqlite.org/) >= 3.7.15
+
+## Build
+  ```sh
+  git clone --recursive https://github.com/lirios/text.git
+  cd text
   mkdir build; cd build
   qmake ..
   make
-  ```
-
-3. Optionally install  
-  ```
-  sudo make install
+  make install   # optional; use sudo if needed
   ```
 
 ## License
 This application 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.
-
-See LICENSE for more information.