diff --git a/MediaButton.qml b/MediaButton.qml
index bf34fcd..879ab95 100644
--- a/MediaButton.qml
+++ b/MediaButton.qml
@@ -1,12 +1,14 @@
import QtQuick 2.0
import QtQuick.Controls 2.15
-Rectangle {
+Item {
id: container
- x: 141
- y: 367
+// x: 141
+// y: 367
+ x: 64
+ y: 64
property bool isClicked : false
- color: isClicked ? "#a98415" : "#f9c620"
+// color: isClicked ? "#a98415" : "#f9c620"
Image {
@@ -14,7 +16,7 @@ Rectangle {
width: 64
anchors.centerIn: parent
fillMode: Image.PreserveAspectFit
- source: isClicked ? "Resources/pause-button.svg" : "Resources/play-button.svg"
+ source: isClicked ? "Resources/buuf-pause.png" : "Resources/buuf-play.png"
}
}
diff --git a/MenuToolbar.qml b/MenuToolbar.qml
index 06d5410..dc02a96 100644
--- a/MenuToolbar.qml
+++ b/MenuToolbar.qml
@@ -62,6 +62,25 @@ Item {
font.bold: true
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"
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ pgLive1.visible = false;
+ pgnews1.visible = true;
+ }
+ }
+ }
}
}
}
diff --git a/PgLive.qml b/PgLive.qml
index f4a8ed3..a9171a5 100644
--- a/PgLive.qml
+++ b/PgLive.qml
@@ -24,58 +24,12 @@ Item {
}
}
-
-
-// Text {
-// id: element
-// x: 17
-// y: 68
-// text: qsTr("Качество:")
-// font.bold: true
-// color: "#f9c620"
-// styleColor: "#f9c620"
-// horizontalAlignment: Text.AlignHCenter
-// font.pixelSize: 20
-// }
-
-// Rectangle {
-// id: buttonHighQuality
-// color: "#f9c620"
-// x: 17
-// y: 102
-// width: 100
-// height: 34
-// Text {
-// anchors.centerIn: parent
-// id: element1
-// text: qsTr("ВИСОКО")
-// color: "#000000"
-// font.pixelSize: 20
-// horizontalAlignment: Text.AlignHCenter
-// font.bold: true
-// }
-// }
-
-// Rectangle {
-// id: buttonLowQuality
-// color: "transparent"
-// x: 24
-// y: 146
-// width: 100
-// height: 34
-// Text {
-// text: qsTr("НИСКО")
-// color: "#f9c620"
-// horizontalAlignment: Text.AlignHCenter
-// font.pixelSize: 20
-// font.bold: true
-// }
-// }
-
MediaButton {
id: playPause
- width: 359
- height: 85
+ x: 35
+ y: 291
+ width: 64
+ height: 64
MouseArea {
anchors.fill: parent
onClicked: {
@@ -98,4 +52,40 @@ Item {
onClicked: aboutDialog.open()
}
}
+
+ Image {
+ id: playbtnframe
+ x: 0
+ y: 259
+ width: 629
+ height: 127
+ source: "Resources/playbtn-frame.png"
+ fillMode: Image.PreserveAspectFit
+
+ Text {
+ id: text1
+ x: 156
+ y: 17
+ text: qsTr("Предаване в ефир:")
+ color: "#f9c620"
+ font.family: mainfont.name
+ font.pixelSize: 15
+ }
+
+ Text {
+ id: text2
+ x: 156
+ y: 60
+ text: qsTr("В момента звучи:")
+ color: "#f9c620"
+ font.family: mainfont.name
+ font.pixelSize: 15
+ }
+ }
+}
+
+/*##^##
+Designer {
+ D{i:0;autoSize:true;height:480;width:640}
}
+##^##*/
diff --git a/PgNews.qml b/PgNews.qml
new file mode 100644
index 0000000..060a80f
--- /dev/null
+++ b/PgNews.qml
@@ -0,0 +1,36 @@
+import QtQuick 2.12
+import QtQuick.Window 2.12
+import Qt.labs.platform 1.1
+import QtMultimedia 5.15
+
+Item {
+ Row {
+ id: row
+ x: 8
+ y: 50
+ width: 624
+ height: 400
+ spacing: 2
+
+ Text {
+ id: text1
+ x: 61
+ y: 50
+ text: qsTr("Гледайте първо видео от новия албум на GOJIRA - той излиза на 3 април")
+ font.pixelSize: 12
+ font.family: mainfont.name
+ }
+
+ Text {
+ id: text2
+ x: 61
+ y: 50
+ text: qsTr("Историята на BLONDIE в предаването 'РОКЕНДРОЛ' на МОНИ ПАНЧЕВ от 16:00")
+ font.pixelSize: 12
+ font.family: mainfont.name
+ }
+ }
+
+
+
+}
diff --git a/Resources/buuf-pause.png b/Resources/buuf-pause.png
new file mode 100644
index 0000000..0a1ea86
Binary files /dev/null and b/Resources/buuf-pause.png differ
diff --git a/Resources/buuf-play.png b/Resources/buuf-play.png
new file mode 100755
index 0000000..6fa868e
Binary files /dev/null and b/Resources/buuf-play.png differ
diff --git a/Resources/news-icon.png b/Resources/news-icon.png
new file mode 100755
index 0000000..5b2aed0
Binary files /dev/null and b/Resources/news-icon.png differ
diff --git a/Resources/playbtn-frame.png b/Resources/playbtn-frame.png
new file mode 100644
index 0000000..3d4bf75
Binary files /dev/null and b/Resources/playbtn-frame.png differ
diff --git a/main.qml b/main.qml
index 8cc42a7..5a0915b 100644
--- a/main.qml
+++ b/main.qml
@@ -72,6 +72,10 @@ Window {
PgLive {
id: pgLive1
}
+ PgNews {
+ id: pgnews1
+ visible: false
+ }
}
}
diff --git a/qml.qrc b/qml.qrc
index 40fcbd6..4c022f2 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -16,5 +16,10 @@
Resources/KellySlab-Regular.ttf
PgLive.qml
MenuToolbar.qml
+ PgNews.qml
+ Resources/news-icon.png
+ Resources/buuf-pause.png
+ Resources/buuf-play.png
+ Resources/playbtn-frame.png