[vlc-commits] qml: reorganize buttons in BannerSource

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Sep 25 18:32:37 2020 +0200| [982a76db8ffd8732c7da377a4f6597f181f91b4d] | committer: Pierre Lamot

qml: reorganize buttons in BannerSource

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=982a76db8ffd8732c7da377a4f6597f181f91b4d
---

 modules/gui/qt/maininterface/qml/BannerSources.qml | 52 ++++++++++------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/modules/gui/qt/maininterface/qml/BannerSources.qml b/modules/gui/qt/maininterface/qml/BannerSources.qml
index e448ed5aee..95855a782a 100644
--- a/modules/gui/qt/maininterface/qml/BannerSources.qml
+++ b/modules/gui/qt/maininterface/qml/BannerSources.qml
@@ -111,6 +111,17 @@ Widgets.NavigableFocusScope {
                     anchors.leftMargin: VLCStyle.applicationHorizontalMargin
                     spacing: VLCStyle.margin_xxxsmall
 
+                    Widgets.IconToolButton {
+                         id: history_back
+                         size: VLCStyle.banner_icon_size
+                         iconText: VLCIcons.topbar_previous
+                         text: i18n.qtr("Previous")
+                         height: localToolbar.height
+                         colorDisabled: VLCStyle.colors.textDisabled
+                         onClicked: history.previous()
+                         enabled: !history.previousEmpty
+                     }
+
                     Image {
                         sourceSize.width: VLCStyle.icon_small
                         sourceSize.height: VLCStyle.icon_small
@@ -118,11 +129,6 @@ Widgets.NavigableFocusScope {
                         enabled: false
                     }
 
-                    Widgets.SubtitleLabel {
-                        text: "VLC"
-                        font.pixelSize: VLCStyle.fontSize_xxlarge
-                    }
-
                 }
 
                 /* Button for the sources */
@@ -170,17 +176,6 @@ Widgets.NavigableFocusScope {
 
                         property int countExtra: 0
 
-                        Widgets.IconToolButton {
-                             id: history_back
-                             size: VLCStyle.banner_icon_size
-                             iconText: VLCIcons.topbar_previous
-                             text: i18n.qtr("Previous")
-                             height: localToolbar.height
-                             colorDisabled: VLCStyle.colors.textDisabled
-                             onClicked: history.previous()
-                             enabled: !history.previousEmpty
-                         }
-
                         Widgets.IconToolButton {
                             id: list_grid_btn
                             size: VLCStyle.banner_icon_size
@@ -287,6 +282,18 @@ Widgets.NavigableFocusScope {
                             height: playlistGroup.height
                         }
 
+                        Widgets.IconToolButton {
+                            id: playlist_btn
+
+                            size: VLCStyle.banner_icon_size
+                            iconText: VLCIcons.playlist
+                            text: i18n.qtr("Playlist")
+                            height: playlistGroup.height
+
+                            onClicked:  mainInterface.playlistVisible = !mainInterface.playlistVisible
+                            color: mainInterface.playlistVisible && !playlist_btn.backgroundVisible ? VLCStyle.colors.accent : VLCStyle.colors.buttonText
+                        }
+
                         Widgets.IconToolButton {
                             id: menu_selector
 
@@ -301,19 +308,6 @@ Widgets.NavigableFocusScope {
                                 id: contextMenu
                                 ctx: mainctx
                             }
-
-                        }
-
-                        Widgets.IconToolButton {
-                            id: playlist_btn
-
-                            size: VLCStyle.banner_icon_size
-                            iconText: VLCIcons.playlist
-                            text: i18n.qtr("Playlist")
-                            height: playlistGroup.height
-
-                            onClicked:  mainInterface.playlistVisible = !mainInterface.playlistVisible
-                            color: mainInterface.playlistVisible && !playlist_btn.backgroundVisible ? VLCStyle.colors.accent : VLCStyle.colors.buttonText
                         }
                     }