tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
Black Hat 2018-08-15 19:11:24 +08:00
parent b091ae1a95 57678cca84
commit be4b4fb3ad
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
icons/matrique.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB

34
matrique.appdata.xml
View File

@ -15,23 +15,23 @@
</description> </description>
<launchable type="desktop-id">org.eu.encom.matrique</launchable> <launchable type="desktop-id">org.eu.encom.matrique</launchable>
<screenshots> <screenshots>
​ <screenshot type="default"> <screenshot type="default">
​ <caption>Overview</caption> <caption>Overview</caption>
​ <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/1.png</image> <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/1.png</image>
​ </screenshot> </screenshot>
​ <screenshot> <screenshot>
​ <caption>Room Config</caption> <caption>Room Config</caption>
​ <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/2.png</image> <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/2.png</image>
​ </screenshot> </screenshot>
​ <screenshot> <screenshot>
​ <caption>Create Room</caption> <caption>Create Room</caption>
​ <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/3.png</image> <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/3.png</image>
​ </screenshot> </screenshot>
​ <screenshot> <screenshot>
​ <caption>Settings Panel</caption> <caption>Settings Panel</caption>
​ <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/4.png</image> <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/4.png</image>
​ </screenshot> </screenshot>
​ </screenshots> </screenshots>
<url type="homepage">https://gitlab.com/b0/matrique</url> <url type="homepage">https://gitlab.com/b0/matrique</url>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="social-chat">intense</content_attribute> <content_attribute id="social-chat">intense</content_attribute>

13
matrique.pro
View File

@ -1,6 +1,9 @@
QT += quick widgets QT += quick widgets
CONFIG += c++14 CONFIG += c++14
CONFIG += object_parallel_to_source CONFIG += object_parallel_to_source
CONFIG += qtquickcompiler
TARGET = matrique
include(include/libqmatrixclient/libqmatrixclient.pri) include(include/libqmatrixclient/libqmatrixclient.pri)
include(include/SortFilterProxyModel/SortFilterProxyModel.pri) include(include/SortFilterProxyModel/SortFilterProxyModel.pri)
@ -34,8 +37,12 @@ QML_IMPORT_PATH =
QML_DESIGNER_IMPORT_PATH = QML_DESIGNER_IMPORT_PATH =
# Default rules for deployment. # Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin unix:!mac:isEmpty(PREFIX) {
else: unix:!android: target.path = /opt/$${TARGET}/bin message("Install PREFIX not set; using /usr/local. You can change this with 'qmake PREFIX=...'")
PREFIX = /usr/local
}
unix:target.path = $$PREFIX/bin
win32:target.path = $$PREFIX
!isEmpty(target.path): INSTALLS += target !isEmpty(target.path): INSTALLS += target
DISTFILES += \ DISTFILES += \
@ -66,7 +73,7 @@ unix:!mac {
metainfo.path = $$PREFIX/share/metainfo metainfo.path = $$PREFIX/share/metainfo
desktop.files = $$PWD/matrique.desktop desktop.files = $$PWD/matrique.desktop
desktop.path = $$PREFIX/share/applications desktop.path = $$PREFIX/share/applications
icons.files = $$PWD/icons/64x64.png icons.files = $$PWD/icons/matrique.png
icons.path = $$PREFIX/share/icons/hicolor/64x64/apps icons.path = $$PREFIX/share/icons/hicolor/64x64/apps
INSTALLS += metainfo desktop mime icons INSTALLS += metainfo desktop mime icons
} }