Added tab buttons; tabs separation; Tabs and Current song info are still

disabled for the next release.

Signed-off-by: Blagovest Petrov <blagovest@petrovs.info>

MediaButton.qml

@@ -3,13 +3,9 @@ import QtQuick.Controls 2.15
 
 Item {
     id: container
-//    x: 141
-//    y: 367
     x: 64
     y: 64
     property bool isClicked : false
-//    color: isClicked ? "#a98415" : "#f9c620"
-
 
     Image {
         id: buttonIcon

MenuToolbar.qml

@@ -63,24 +63,24 @@ Item {
                 color: "#f9c620"
             }
 
-            Text {
-                id: buttonLive
-                y: 2
-                anchors.left: appTitle.left
-                text: qsTr("На ЖИВО")
-                font.family: mainfont.name
-                font.pixelSize: 21
-                anchors.leftMargin: 128
-                color: "#efbb1f"
+//            Image {
+//                id: buttonLive
+//                source: "Resources/live.png"
+//                anchors.left: appTitle.left
+//                anchors.leftMargin: 128
+//                width: 32
+//                height: 32
 
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        pgLive1.visible = false;
-                        pgnews1.visible = true;
-                    }
-                }
-            }
+//                MouseArea {
+//                    anchors.fill: parent
+//                    hoverEnabled: true
+//                    onClicked: {
+//                        pgLive1.visible = false;
+//                        pgnews1.visible = true;
+////                        contentLoader.sourceComponent = PgNews
+//                    }
+//                }
+//            }
         }
     }
 }

PgNews.qml

@@ -4,6 +4,8 @@ import Qt.labs.platform 1.1
 import QtMultimedia 5.15
 
 Item {
+    x: 190
+    y: 51
     Row {
         id: row
         x: 8

fetchshowid.cpp

@@ -1,15 +1,15 @@
 #include "fetchshowid.h"
-#include <QNetworkAccessManager>
-#include <QObject>
-#include <QDebug>
-#include <QString>
 
 FetchShowID::FetchShowID()
 {
+    n_manager = new QNetworkAccessManager;
+
+    connect(n_manager, SIGNAL(finished(QNetworkReply*)),
+             this, SLOT(replyFinished(QNetworkReply*)));
 
 }
 
-//int FetchShowID::Fetch() {
-//    QNetworkAccessManager *manager = new QNetworkAccessManager(this);
 
-//}
+void FetchShowID::Fetch() {
+    n_manager->get(QNetworkRequest(QUrl("http://app.radiotangra.com/TMR_monitor_songs")));
+}

fetchshowid.h

@@ -1,12 +1,20 @@
 #ifndef FETCHSHOWID_H
 #define FETCHSHOWID_H
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QObject>
+#include <QDebug>
+#include <QString>
 
 
-class FetchShowID
+class FetchShowID : public QObject
 {
 public:
     FetchShowID();
-//    int Fetch();
+    void Fetch();
+
+private:
+    QNetworkAccessManager* n_manager;
 };
 
 #endif // FETCHSHOWID_H

main.qml

@@ -72,10 +72,19 @@ Window {
         PgLive {
             id: pgLive1
         }
-        PgNews {
-            id: pgnews1
-            visible: false
-        }
+//        PgNews {
+//            id: pgNews1
+//            visible: false
+//        }
+
+//        Item {
+//            Component {
+//                id: myComp
+//            }
+
+//            Loader { id: contentLoader }
+
+//        }
 
     }
 }

qml.qrc

@@ -21,5 +21,8 @@
         <file>Resources/buuf-pause.png</file>
         <file>Resources/buuf-play.png</file>
         <file>Resources/playbtn-frame.png</file>
+        <file>Resources/live.png</file>
+        <file>Resources/news.png</file>
+        <file>Resources/podcast.png</file>
     </qresource>
 </RCC>