Merge pull request #14 from Aldrog/ubuntu-port

Ubuntu port

Author: Aldrog

common.pri

@@ -0,0 +1,17 @@
+QT += qml quick network dbus
+CONFIG += c++11
+
+SOURCES += \
+    src/main.cpp \
+    src/ircchat.cpp \
+    src/tools.cpp \
+    src/qmlsettings.cpp \
+    src/message.cpp \
+    src/messagelistmodel.cpp
+
+HEADERS += \
+    src/ircchat.h \
+    src/tools.h \
+    src/qmlsettings.h \
+    src/message.h \
+    src/messagelistmodel.h

harbour-twitchtube.pro

@@ -12,65 +12,34 @@
 # The name of your application
 TARGET = harbour-twitchtube
 
-CONFIG += sailfishapp c++11
+CONFIG += sailfishapp
 
-QT += network dbus
+DEFINES += OS_SAILFISH
 
-icons.path = /usr/share/icons/hicolor
-icons.files = icons/*
-INSTALLS += icons
+include(common.pri)
 
-SOURCES += \
-    src/harbour-twitchtube.cpp \
-    src/ircchat.cpp \
-    src/tools.cpp \
-    src/qmlsettings.cpp \
-    src/message.cpp \
-    src/messagelistmodel.cpp
+RESOURCES += sailfish-ui/TwitchTube.qrc
 
-OTHER_FILES += \
-    translations/*.ts \
-    qml/pages/GamesPage.qml \
-    qml/pages/ChannelsPage.qml \
-    qml/pages/StreamPage.qml \
-    qml/js/httphelper.js \
-    qml/pages/SettingsPage.qml \
-    qml/pages/SearchPage.qml \
-    qml/pages/LoginPage.qml \
-    qml/pages/FollowedPage.qml \
-    qml/harbour-twitchtube.qml \
-    harbour-twitchtube.desktop \
-    rpm/harbour-twitchtube.spec \
-    rpm/harbour-twitchtube.yaml \
-    qml/pages/elements/Categories.qml \
-    qml/pages/QualityChooserPage.qml \
-    rpm/harbour-twitchtube.changes \
-    qml/images/heart.png \
-    qml/images/icon.png \
-    qml/pages/elements/GamesGrid.qml \
-    qml/pages/elements/ChannelsGrid.qml \
-    qml/pages/GameChannelsPage.qml \
-    qml/pages/FollowedGamesPage.qml \
-    qml/cover/NavigationCover.qml \
-    qml/cover/StreamCover.qml \
-    qml/images/heart_crossed.png
+QML_FILES += $$files(sailfish-ui/*.qml,true) \
+             $$files(sailfish-ui/*.js,true) \
+             $$files(sailfish-ui/*.png,true)
+
+CONF_FILES += rpm/harbour-twitchtube.spec \
+              rpm/harbour-twitchtube.yaml \
+              rpm/harbour-twitchtube.changes
+
+TRANSLATIONS += $$files(translations/*.ts)
+
+OTHER_FILES += $${CONF_FILES} \
+               $${QML_FILES} \
+               harbour-twitchtube.desktop
+
+SAILFISHAPP_ICONS = 86x86 108x108 128x128 256x256
 
 # to disable building translations every time, comment out the
 # following CONFIG line
 CONFIG += sailfishapp_i18n
-#TRANSLATIONS += translations/harbour-twitchtube-ru.ts
-
-HEADERS += \
-    src/ircchat.h \
-    src/tools.h \
-    src/qmlsettings.h \
-    src/message.h \
-    src/messagelistmodel.h
 
 DISTFILES += \
-    icons/108x108/apps/harbour-twitchtube.png \
-    icons/128x128/apps/harbour-twitchtube.png \
-    icons/256x256/apps/harbour-twitchtube.png \
-    icons/86x86/apps/harbour-twitchtube.png \
-    qml/pages/elements/GridWrapper.qml
+    sailfish-ui/Main.qml
 

icons/108x108/apps/harbour-twitchtube.png renamed to icons/108x108/harbour-twitchtube.png

@@ -69,9 +69,6 @@ desktop-file-install --delete-original       \
 %{_bindir}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/86x86/apps/%{name}.png
-%{_datadir}/icons/hicolor/108x108/apps/%{name}.png
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 # >> files
 # << files

icons/128x128/apps/harbour-twitchtube.png renamed to icons/128x128/harbour-twitchtube.png

@@ -42,10 +42,7 @@ Files:
   - '%{_bindir}'
   - '%{_datadir}/%{name}'
   - '%{_datadir}/applications/%{name}.desktop'
-  - '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
-  - '%{_datadir}/icons/hicolor/108x108/apps/%{name}.png'
-  - '%{_datadir}/icons/hicolor/128x128/apps/%{name}.png'
-  - '%{_datadir}/icons/hicolor/256x256/apps/%{name}.png'
+  - '%{_datadir}/icons/hicolor/*/apps/%{name}.png'
 
 # For more information about yaml and what's supported in Sailfish OS
 # build system, please see https://wiki.merproject.org/wiki/Spectacle

icons/256x256/apps/harbour-twitchtube.png renamed to icons/256x256/harbour-twitchtube.png

@@ -0,0 +1,26 @@
+<RCC>
+    <qresource prefix="/">
+        <file>Main.qml</file>
+        <file>pages/ChannelsPage.qml</file>
+        <file>pages/GameChannelsPage.qml</file>
+        <file>pages/GamesPage.qml</file>
+        <file>pages/StreamPage.qml</file>
+        <file>pages/FollowedPage.qml</file>
+        <file>pages/LoginPage.qml</file>
+        <file>pages/QualityChooserPage.qml</file>
+        <file>pages/SearchPage.qml</file>
+        <file>pages/SettingsPage.qml</file>
+        <file>pages/FollowedGamesPage.qml</file>
+        <file>pages/elements/Categories.qml</file>
+        <file>pages/elements/ChannelsGrid.qml</file>
+        <file>pages/elements/GamesGrid.qml</file>
+        <file>pages/elements/GridWrapper.qml</file>
+        <file>cover/NavigationCover.qml</file>
+        <file>cover/StreamCover.qml</file>
+        <file>js/httphelper.js</file>
+        <file>images/heart.png</file>
+        <file>images/heart_crossed.png</file>
+        <file>images/icon.png</file>
+    </qresource>
+</RCC>
+