Relayouted the project

harbour-trulyyours.pro

@@ -1,44 +1,33 @@
-# NOTICE:
-#
-# Application name defined in TARGET has a corresponding QML filename.
-# If name defined in TARGET is changed, the following needs to be done
-# to match new name:
-# - corresponding QML filename must be changed
-# - desktop icon filename must be changed
-# - desktop filename must be changed
-# - icon definition filename in desktop file must be changed
-# - translation filenames have to be changed
-
-# The name of your application
+TEMPLATE = app
 TARGET = harbour-trulyyours
-
 CONFIG += sailfishapp
 
+HEADERS += \
+ src/ambiencemanager.h \
+ src/tagmanager.h
+
 SOURCES += src/harbour-trulyyours.cpp \
- ambiencemanager.cpp \
- tagmanager.cpp
+ src/ambiencemanager.cpp \
+ src/tagmanager.cpp
 
-OTHER_FILES += qml/harbour-trulyyours.qml \
- qml/cover/CoverPage.qml \
- rpm/$${TARGET}.spec \
+OTHER_FILES += rpm/$${TARGET}.spec \
  rpm/$${TARGET}.yaml \
- translations/*.ts \
  $${TARGET}.desktop \
+ translations/*.ts \
+ qml/harbour-trulyyours.qml \
+ qml/cover/CoverPage.qml \
  qml/pages/AmbienceDetailPage.qml \
  qml/pages/BrowseAmbienceListPage.qml \
- Data.js \
+ qml/pages/Data.js \
  qml/pages/MainPage.qml \
  qml/pages/Components/QuickTagCloud.qml
 
-js.path = /usr/share/$${TARGET}/
+js.path = /usr/share/$${TARGET}/qml/pages
 js.files = Data.js
+INSTALLS += js
+
 # to disable building translations every time, comment out the
 # following CONFIG line
 #CONFIG += sailfishapp_i18n
 #TRANSLATIONS += translations/$${TARGET}-de.ts
-INSTALLS += js
-
-HEADERS += \
- ambiencemanager.h \
- tagmanager.h
 

qml/pages/BrowseAmbienceListPage.qml

@@ -30,7 +30,7 @@
 
 import QtQuick 2.0
 import Sailfish.Silica 1.0
-import "../../Data.js" as Data;
+import "Data.js" as Data;
 
 Page {
  id: page

qml/pages/MainPage.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
-import "../../Data.js" as Data;
+import "Data.js" as Data;
 import "Components"
 
 Page {

rpm/harbour-trulyyours.yaml

@@ -2,46 +2,27 @@ Name: harbour-trulyyours
 Summary: TrulyYours - Mobile JollaWalls client
 Version: 0.1.1
 Release: 1
-# The contents of the Group field must be one of the groups listed here:
-# http:https://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
 Group: Qt/Qt
-URL: http:https://example.org/
+URL: https:https://github.com/matrixx/TrulyYours
 License: LICENSE
-# This must be generated before uploading a package to a remote build service.
-# Usually this line does not need to be modified.
 Sources:
 - '%{name}-%{version}.tar.bz2'
 Description: |
  Short description of my SailfishOS Application
 Configure: none
-# The qtc5 builder inserts macros to allow QtCreator to have fine
-# control over qmake/make execution
 Builder: qtc5
-
-# This section specifies build dependencies that are resolved using pkconfig.
-# This is the preferred way of specifying build dependencies for your package.
 PkgConfigBR:
  - sailfishapp >= 1.0.2
  - Qt5Core
  - Qt5Qml
  - Qt5Quick
-
-# Build dependencies without a pkgconfig setup can be listed here
-# PkgBR:
-# - package-needed-to-build
-
-# Runtime dependencies which are not automatically detected
+ - Qt5DBus
 Requires:
  - sailfishsilica-qt5 >= 0.10.9 
-
-# All installed files
 Files:
  - '%defattr(0644,root,root,-)'
  - '%attr(0755,root,root) %{_bindir}'
  - '%{_datadir}/%{name}'
  - '%{_datadir}/applications/%{name}.desktop'
  - '%{_datadir}/icons/hicolor/86x86/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
-