Merge pull request #80 from tkashkin/dev

Merge dev branch

Former-commit-id: 6dd4d6b

README.md

@@ -1,4 +1,4 @@
-# GameHub [![Build Status](https://travis-ci.com/tkashkin/GameHub.svg?branch=master)](https://travis-ci.com/tkashkin/GameHub)
+# [GameHub](https://tkashkin.tk/projects/gamehub) [![Build Status](https://travis-ci.com/tkashkin/GameHub.svg?branch=master)](https://travis-ci.com/tkashkin/GameHub)
 Games manager/downloader/library written in Vala for elementary OS
 
 ## Game sources
@@ -39,6 +39,7 @@ Package is maintained by [@btd1337](https://github.com/btd1337).
 * libgee-0.8-dev
 * libsoup2.4-dev
 * libsqlite3-dev
+* libxml2-dev
 
 #### Building
 ```bash

appimage/AppRun

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
+export PATH="${APPDIR}/usr/bin:${PATH}"
+export XDG_DATA_DIRS="${APPDIR}/usr/share:${XDG_DATA_DIRS}"
+
+export GSETTINGS_SCHEMA_DIR="${APPDIR}/usr/share/glib-2.0/schemas/:${GSETTINGS_SCHEMA_DIR}"
+export GTK_PATH="${APPDIR}/usr/lib/gtk-3.0"
+export GTK_DATA_PREFIX="${APPDIR}/usr/"
+#export GTK_THEME="Adwaita"
+
+"${APPDIR}/usr/bin/com.github.tkashkin.gamehub" "$@"

appimage/build.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+_ROOT="`pwd`"
+_SCRIPTROOT="$(dirname "$(readlink -f "$0")")"
+_LINUXDEPLOYQT="linuxdeployqt-continuous-x86_64.AppImage"
+
+BUILDROOT="$_ROOT/build/appimage"
+BUILDDIR="$BUILDROOT/build"
+APPDIR="$BUILDROOT/appdir"
+
+ACTION=${1:-build_local}
+
+deps()
+{
+	sudo add-apt-repository ppa:elementary-os/stable -y
+	sudo add-apt-repository ppa:elementary-os/os-patches -y
+	sudo add-apt-repository ppa:elementary-os/daily -y
+	sudo apt update -qq
+	sudo apt install -y meson valac checkinstall build-essential elementary-sdk libgranite-dev libgtk-3-dev libglib2.0-dev libwebkit2gtk-4.0-dev libjson-glib-dev libgee-0.8-dev libsoup2.4-dev libsqlite3-dev libxml2-dev
+	sudo apt full-upgrade -y
+}
+
+build()
+{
+	cd "$_ROOT"
+	mkdir -p "$BUILDROOT"
+	meson "$BUILDDIR" --prefix=/usr --buildtype=debugoptimized -Ddistro=generic -Dappimage=true
+	cd "$BUILDDIR"
+	ninja
+	DESTDIR="$APPDIR" ninja install
+	cd "$_ROOT"
+}
+
+appimage()
+{
+	cd "$BUILDROOT"
+	wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/$_LINUXDEPLOYQT"
+	chmod a+x linuxdeployqt-continuous-x86_64.AppImage
+	unset QTDIR; unset QT_PLUGIN_PATH; unset LD_LIBRARY_PATH
+	export VERSION=$(git rev-parse --short HEAD)
+	export LD_LIBRARY_PATH=$APPDIR/usr/lib:$LD_LIBRARY_PATH
+	"./$_LINUXDEPLOYQT" "$APPDIR/usr/share/applications/com.github.tkashkin.gamehub.desktop" -appimage -bundle-non-qt-libs -verbose=2
+	rm -f "$APPDIR/AppRun"
+	cp -f "$_SCRIPTROOT/AppRun" "$APPDIR/AppRun"
+	glib-compile-schemas "$APPDIR/usr/share/glib-2.0/schemas"
+	"./$_LINUXDEPLOYQT" --appimage-extract
+	PATH=./squashfs-root/usr/bin:$PATH ./squashfs-root/usr/bin/appimagetool "$APPDIR"
+}
+
+upload()
+{
+	cd "$BUILDROOT"
+	wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+	bash upload.sh GameHub*.AppImage*
+}
+
+if [[ "$ACTION" = "deps" ]]; then deps; fi
+if [[ "$ACTION" = "build" || "$ACTION" = "build_local" ]]; then build; fi
+if [[ "$ACTION" = "appimage" || "$ACTION" = "build_local" ]]; then appimage; fi
+if [[ "$ACTION" = "upload" ]]; then upload; fi

appveyor.yml

@@ -0,0 +1,25 @@
+branches:
+  except:
+    - flatpak
+
+image:
+  - Ubuntu1804
+
+clone_folder: ~/GameHub
+
+build_script:
+  - sh: dpkg-buildpackage -b -us -uc
+  - sh: bash appimage/build.sh build && bash appimage/build.sh appimage
+
+install:
+  - sh: bash appimage/build.sh deps
+
+test: off
+
+artifacts:
+  - path: ~/com.github.tkashkin.gamehub*.deb
+    name: deb
+  - path: ~/com.github.tkashkin.gamehub*.ddeb
+    name: deb-dbgsym
+  - path: build/appimage/GameHub*.AppImage*
+    name: AppImage

data/GameHub.css

@@ -12,7 +12,7 @@
 	border-radius: 4px;
 }
 
-.gamecard.installed
+.gamecard.installed, .gamecard.static
 {
 	opacity: 1;
 }
@@ -72,7 +72,7 @@
 	transition: 100ms;
 }
 
-.gamecard.installed .actions
+.gamecard.installed .actions, .gamecard.static .actions
 {
 	background-color: rgba(0, 0, 0, 0);
 }
@@ -332,4 +332,4 @@ list.tags-list row:hover
 .tags-list-header label
 {
 	padding: 2px 0;
-}
+}

data/com.github.tkashkin.gamehub.appdata.xml.in

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-	<id>com.github.tkashkin.gamehub.desktop</id>
+	<id>com.github.tkashkin.gamehub</id>
 
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>WTFPL</project_license>
@@ -14,7 +14,7 @@
 
 	<developer_name>Anatoliy Kashkin</developer_name>
 	​<update_contact>[email protected]</update_contact>
-	<url type="homepage">https://github.com/tkashkin/GameHub</url>
+	<url type="homepage">https://tkashkin.tk/projects/gamehub</url>
 	<url type="bugtracker">https://github.com/tkashkin/GameHub/issues</url>
 
 	<provides>
@@ -41,6 +41,28 @@
 	</screenshots>
 
 	<releases>
+		<release type="development" version="0.11.0" date="2018-09-18">
+			<description>
+				<ul>
+					<li>Humble Trove support</li>
+					<li>Additional compat tools (CustomScript, DOSBox)</li>
+					<li>AppImage version</li>
+				</ul>
+			</description>
+		</release>
+		<release type="development" version="0.10.0" date="2018-09-14">
+			<description>
+				<p>Compatibility tools support for non-native games:</p>
+				<ul>
+					<li>Innoextract</li>
+					<li>Proton</li>
+					<li>Wine</li>
+				</ul>
+				<p>Database rewrite</p>
+				<p>Performance improvements</p>
+				<p>Bugfixes</p>
+			</description>
+		</release>
 		<release type="development" version="0.9.0" date="2018-09-04">
 			<description>
 				<ul>

data/com.github.tkashkin.gamehub.gschema.xml

@@ -32,7 +32,7 @@
 			<default>"Grid"</default>
 		</key>
 	</schema>
-	
+
 	<schema path="/com/github/tkashkin/gamehub/ui/" id="com.github.tkashkin.gamehub.ui" gettext-domain="com.github.tkashkin.gamehub">
 		<key name="dark-theme" type="b">
 			<default>false</default>
@@ -46,8 +46,11 @@
 		<key name="show-unsupported-games" type="b">
 			<default>false</default>
 		</key>
+		<key name="use-compat" type="b">
+			<default>true</default>
+		</key>
 	</schema>
-	
+
 	<schema path="/com/github/tkashkin/gamehub/auth/steam/" id="com.github.tkashkin.gamehub.auth.steam" gettext-domain="com.github.tkashkin.gamehub">
 		<key name="enabled" type="b">
 			<default>true</default>
@@ -59,7 +62,7 @@
 			<default>'8B10B604CAC6AC90F57AACE025DD904C'</default>
 		</key>
 	</schema>
-	
+
 	<schema path="/com/github/tkashkin/gamehub/auth/gog/" id="com.github.tkashkin.gamehub.auth.gog" gettext-domain="com.github.tkashkin.gamehub">
 		<key name="enabled" type="b">
 			<default>true</default>
@@ -74,7 +77,7 @@
 			<default>''</default>
 		</key>
 	</schema>
-	
+
 	<schema path="/com/github/tkashkin/gamehub/auth/humble/" id="com.github.tkashkin.gamehub.auth.humble" gettext-domain="com.github.tkashkin.gamehub">
 		<key name="enabled" type="b">
 			<default>true</default>
@@ -85,8 +88,11 @@
 		<key name="access-token" type="s">
 			<default>''</default>
 		</key>
+		<key name="load-trove-games" type="b">
+			<default>true</default>
+		</key>
 	</schema>
-	
+
 	<schema path="/com/github/tkashkin/gamehub/paths/" id="com.github.tkashkin.gamehub.paths" gettext-domain="com.github.tkashkin.gamehub">
 		<key name="steam-home" type="s">
 			<default>'~/.steam'</default>

data/icons/icons.gresource.xml

@@ -1,13 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
 	<gresource prefix="/com/github/tkashkin/gamehub/icons">
-		<file alias="scalable/actions/sources-all-symbolic.svg">sources-all.svg</file>
-		<file alias="scalable/actions/steam-symbolic.svg">steam.svg</file>
-		<file alias="scalable/actions/gog-symbolic.svg">gog.svg</file>
-		<file alias="scalable/actions/humble-symbolic.svg">humble.svg</file>
-
-		<file alias="scalable/actions/platform-linux-symbolic.svg">platform-linux.svg</file>
-		<file alias="scalable/actions/platform-windows-symbolic.svg">platform-windows.svg</file>
-		<file alias="scalable/actions/platform-macos-symbolic.svg">platform-macos.svg</file>
+		<file alias="scalable/actions/sources-all-symbolic.svg">symbolic/sources/sources-all.svg</file>
+		<file alias="scalable/actions/source-steam-symbolic.svg">symbolic/sources/steam.svg</file>
+		<file alias="scalable/actions/source-gog-symbolic.svg">symbolic/sources/gog.svg</file>
+		<file alias="scalable/actions/source-humble-symbolic.svg">symbolic/sources/humble.svg</file>
+		<file alias="scalable/actions/source-humble-trove-symbolic.svg">symbolic/sources/humble-trove.svg</file>
+
+		<file alias="scalable/actions/platform-linux-symbolic.svg">symbolic/platforms/linux.svg</file>
+		<file alias="scalable/actions/platform-windows-symbolic.svg">symbolic/platforms/windows.svg</file>
+		<file alias="scalable/actions/platform-macos-symbolic.svg">symbolic/platforms/macos.svg</file>
+
+		<file alias="scalable/actions/tool-wine-symbolic.svg">symbolic/tools/wine.svg</file>
+		<file alias="scalable/actions/tool-dosbox-symbolic.svg">symbolic/tools/dosbox.svg</file>
+
+		<file alias="scalable/actions/tag.svg">normal/tags/tag.svg</file>
+
+		<file alias="scalable/actions/gh-tag-symbolic.svg">symbolic/tags/tag.svg</file>
+		<file alias="scalable/actions/gh-tag-add-symbolic.svg">symbolic/tags/tag-add.svg</file>
+		<file alias="scalable/actions/gh-tag-remove-symbolic.svg">symbolic/tags/tag-remove.svg</file>
+		<file alias="scalable/actions/gh-tag-multiple-symbolic.svg">symbolic/tags/tag-multiple.svg</file>
+		<file alias="scalable/actions/gh-tag-favorites-symbolic.svg">symbolic/tags/tag-favorites.svg</file>
+		<file alias="scalable/actions/gh-tag-hidden-symbolic.svg">symbolic/tags/tag-hidden.svg</file>
 	</gresource>
 </gresources>