Merge branch 'master' into 'develop'

Update develop

See merge request b0/spectral!48

.gitignore

@@ -0,0 +1,3 @@
+build
+
+.DS_Store

.travis.yml

@@ -1,5 +1,8 @@
 language: cpp
 
+git:
+  depth: false
+
 matrix:
   include:
   - os: osx
@@ -17,7 +20,7 @@ script:
 
 before_deploy:
 - mv ${DEPLOY_DIR}/bin/spectral.dmg ./
-- sed -i -e "s/TRAVIS_BUILD_NUMBER/${TRAVIS_BUILD_NUMBER}/g" .ci/bintray-release.json
+- sed -i -e "s/TRAVIS_BUILD_NUMBER/0.0.0.$(git rev-list --count HEAD)/g" .ci/bintray-release.json
 
 deploy:
   - provider: bintray

BUILD.md

@@ -3,6 +3,7 @@
 1. Update Qt to v5.10+
 
         brew install qt5
+        brew link qt5 --force
 
 2. Download Spectral source
 
@@ -16,8 +17,8 @@
 
 4. Build Spectral
 
-        /usr/local/Cellar/qt5/5.10.1/bin/qmake 
-        make
+        qmake ../spectral.pro
+        make -j4
 
 5. Open Spectral
 

macOS/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleVersion</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.11</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+</dict>
+</plist>

org.eu.encom.spectral.appdata.xml

@@ -13,18 +13,17 @@
       Spectral is a glossy cross-platform client for Matrix, the decentralized communication protocol for instant messaging.
     </p>
     <p>
-      The source code is generally available at https://gitlab.com/b0/spectral
+      The source code is available at https://gitlab.com/b0/spectral
     </p>
   </description>
 
   <url type="homepage">https://gitlab.com/b0/spectral</url>
   <url type="bugtracker">https://gitlab.com/b0/spectral/issues</url>
-  <url type="help">https://doc.spectral.encom.eu.org</url>
+  <url type="help">https://b0.gitlab.io/spectral-doc</url>
 
   <categories>
     <category>Matrix</category>
     <category>Internet</category>
-    <category>Qt</category>
   </categories>
 
   <developer_name>Black Hat</developer_name>
@@ -37,9 +36,17 @@
       <image>https://gitlab.com/b0/spectral/raw/master/screenshots/1.png</image>
     </screenshot>
     <screenshot>
-      <caption>Room Config</caption>
+      <caption>Room Timeline</caption>
       <image>https://gitlab.com/b0/spectral/raw/master/screenshots/2.png</image>
     </screenshot>
+    <screenshot>
+      <caption>Room Config</caption>
+      <image>https://gitlab.com/b0/spectral/raw/master/screenshots/3.png</image>
+    </screenshot>
+    <screenshot>
+      <caption>Settings</caption>
+      <image>https://gitlab.com/b0/spectral/raw/master/screenshots/4.png</image>
+    </screenshot>
   </screenshots>
 
   <content_rating type="oars-1.0">
@@ -48,6 +55,7 @@
   </content_rating>
 
   <releases>
+    <release version="603" date="2019-05-01"></release>
     <release version="464" date="2018-10-24"></release>
     <release version="462" date="2018-10-24"></release>
     <release version="436" date="2018-10-20"></release>

spectral.pro

@@ -103,7 +103,15 @@ win32 {
 }
 
 mac {
+	QMAKE_TARGET_BUNDLE_PREFIX = org.eu.encom
+
+	VERSION = 0.0.0.$$system(git rev-list --count HEAD)
+	INFO_PLIST_PATH = $$shell_quote($${OUT_PWD}/$${TARGET}.app/Contents/Info.plist)
+	QMAKE_POST_LINK += /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $${VERSION}\" $${INFO_PLIST_PATH}
+    QMAKE_POST_LINK += && /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $${VERSION}\" $${INFO_PLIST_PATH}
+
     ICON = assets/img/icon.icns
+    QMAKE_INFO_PLIST = macOS/Info.plist
 }
 
 HEADERS += \