Merge pull request 'Rearranged QML files in the repository' (#17) from ISSUE-16 into master

Reviewed-on: http://code.petrovs.info/blago/TangraPlay/pulls/17

main.cpp

@@ -14,7 +14,7 @@ int main(int argc, char *argv[])
     QQmlContext *context = engine.rootContext();
     context->setContextProperty("tangraTray", tangratray);
 
-    const QUrl url(QStringLiteral("qrc:/main.qml"));
+    const QUrl url(QStringLiteral("qrc:/ui/main.qml"));
     QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
                      &app, [url](QObject *obj, const QUrl &objUrl) {
         if (!obj && url == objUrl)

qml.qrc

@@ -1,22 +1,22 @@
 <RCC>
     <qresource prefix="/">
-        <file>main.qml</file>
+        <file>ui/main.qml</file>
+        <file>ui/MenuToolbar.qml</file>
+        <file>ui/MenuButton.qml</file>
+        <file>ui/PgLive.qml</file>
+        <file>ui/PgNews.qml</file>
+        <file>ui/AboutProgram.qml</file>
+        <file>ui/AudioPlayer.qml</file>
+        <file>ui/MediaButton.qml</file>
+        <file>Resources/pause-button.svg</file>
         <file>Resources/logo.png</file>
         <file>Resources/play-button.svg</file>
         <file>Resources/menu-background.png</file>
         <file>Resources/dark_leather.png</file>
-        <file>MenuButton.qml</file>
         <file>Resources/menubtn-background.png</file>
-        <file>AudioPlayer.qml</file>
-        <file>MediaButton.qml</file>
-        <file>Resources/pause-button.svg</file>
-        <file>AboutProgram.qml</file>
         <file>Resources/blago.png</file>
         <file>Resources/tangra.ico</file>
         <file>Resources/KellySlab-Regular.ttf</file>
-        <file>PgLive.qml</file>
-        <file>MenuToolbar.qml</file>
-        <file>PgNews.qml</file>
         <file>Resources/news-icon.png</file>
         <file>Resources/buuf-pause.png</file>
         <file>Resources/buuf-play.png</file>

AboutProgram.qml → ui/AboutProgram.qml

@@ -14,7 +14,7 @@ Dialog {
         width: 100
         height: 100
         fillMode: Image.PreserveAspectFit
-        source: "Resources/blago.png"
+        source: "../Resources/blago.png"
     }
 
     Text {

MediaButton.qml → ui/MediaButton.qml

@@ -12,7 +12,7 @@ Item {
         width: 64
         anchors.centerIn: parent
         fillMode: Image.PreserveAspectFit
-        source: isClicked ? "Resources/buuf-pause.png" : "Resources/buuf-play.png"
+        source: isClicked ? "../Resources/buuf-pause.png" : "../Resources/buuf-play.png"
 
     }
 }

MenuButton.qml → ui/MenuButton.qml

@@ -10,7 +10,7 @@ Rectangle {
 
     Image {
         id: menuButtonBackground
-        source: "Resources/menubtn-background.png"
+        source: "../Resources/menubtn-background.png"
         anchors.fill: parent
     }
 

MenuToolbar.qml → ui/MenuToolbar.qml

@@ -8,7 +8,7 @@ Item {
         height: 32
 
         Image {
-            source: "Resources/menu-background.png"
+            source: "../Resources/menu-background.png"
             fillMode: Image.Tile
             anchors.fill: parent
 

PgLive.qml → ui/PgLive.qml

@@ -14,7 +14,7 @@ Item {
         width: 260
         height: 175
         fillMode: Image.PreserveAspectFit
-        source: "Resources/logo.png"
+        source: "../Resources/logo.png"
         MouseArea {
             anchors.fill: parent
             cursorShape: Qt.PointingHandCursor
@@ -59,7 +59,7 @@ Item {
         y: 259
         width: 629
         height: 127
-        source: "Resources/playbtn-frame.png"
+        source: "../Resources/playbtn-frame.png"
         fillMode: Image.PreserveAspectFit
 
         Text {

main.qml → ui/main.qml

@@ -13,7 +13,7 @@ Window {
     maximumHeight: 480
     flags: Qt.FramelessWindowHint
 
-    FontLoader { id: mainfont; source: "Resources/KellySlab-Regular.ttf" }
+    FontLoader { id: mainfont; source: "../Resources/KellySlab-Regular.ttf" }
 
     Connections {
         target: tangraTray
@@ -52,7 +52,7 @@ Window {
         anchors.fill: parent
         visible: true
         fillMode: Image.Tile
-        source: "Resources/dark_leather.png"
+        source: "../Resources/dark_leather.png"
 
         MenuToolbar {}