From c20966fc4163ceccaa884e6b6253729dfa4776a7 Mon Sep 17 00:00:00 2001
From: Juho Annunen <juho.annunen@qt.io>
Date: Mon, 18 Jun 2018 14:37:08 +0300
Subject: Move info button to mediaplayer-demo footer

Task-number: QTBUG-68674
Change-Id: I4e2c3dc499461dcbb9c4d6e8a03027d70419c160
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
---
 basicsuite/mediaplayer/ControlBar.qml | 10 ++++++++++
 basicsuite/mediaplayer/main.qml       | 13 -------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/basicsuite/mediaplayer/ControlBar.qml b/basicsuite/mediaplayer/ControlBar.qml
index f05cea8..fed8a77 100644
--- a/basicsuite/mediaplayer/ControlBar.qml
+++ b/basicsuite/mediaplayer/ControlBar.qml
@@ -172,6 +172,7 @@ Rectangle {
             imageSource: "images/FXButton.png"
             checkable: true
             checked: effectSelectionPanel.visible
+
             onClicked: {
                 openFX();
             }
@@ -179,6 +180,7 @@ Rectangle {
         ImageButton {
             id: fileButton
             imageSource: "images/FileButton.png"
+
             onClicked: {
                 openFile();
             }
@@ -186,10 +188,18 @@ Rectangle {
         ImageButton {
             id: urlButton
             imageSource: "images/UrlButton.png"
+
             onClicked: {
                 openURL();
             }
         }
+        ImageButton{
+            id: infoButton
+
+            imageSource: "images/info_icon.svg"
+            onClicked: metadataView.opacity = 1
+            visible: content.videoPlayer.mediaPlayer.status !== MediaPlayer.NoMedia && content.videoPlayer.mediaPlayer.status !== MediaPlayer.InvalidMedia
+        }
     }
 
     VolumeControl {
diff --git a/basicsuite/mediaplayer/main.qml b/basicsuite/mediaplayer/main.qml
index 66d03a1..ec8719d 100644
--- a/basicsuite/mediaplayer/main.qml
+++ b/basicsuite/mediaplayer/main.qml
@@ -164,19 +164,6 @@ FocusScope {
         }
     }
 
-    ImageButton{
-        id: infoButton
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.rightMargin: 32
-        anchors.topMargin: 32
-        width: 40
-        height: 40
-        imageSource: "images/info_icon.svg"
-        onClicked: metadataView.opacity = 1
-        visible: content.videoPlayer.mediaPlayer.status !== MediaPlayer.NoMedia && content.videoPlayer.mediaPlayer.status !== MediaPlayer.InvalidMedia
-    }
-
     MetadataView {
         id: metadataView
         mediaPlayer: content.videoPlayer.mediaPlayer
-- 
cgit v1.2.3