From kde-commits  Thu May 31 22:03:48 2018
From: Matthieu Gallien <null () kde ! org>
Date: Thu, 31 May 2018 22:03:48 +0000
To: kde-commits
Subject: [elisa/genericModel] src/qml: Merge branch 'master' into genericModel
Message-Id: <E1fOVfg-0008IO-V1 () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=152780423915287

Git commit f3ec654e83bf515b4c72074c0f1697892e982c28 by Matthieu Gallien.
Committed on 31/05/2018 at 22:03.
Pushed by mgallien into branch 'genericModel'.

Merge branch 'master' into genericModel

M  +1    -0    src/qml/ViewSelector.qml

https://commits.kde.org/elisa/f3ec654e83bf515b4c72074c0f1697892e982c28

diff --cc src/qml/ViewSelector.qml
index 97e15ed,328381b..25afe0e
--- a/src/qml/ViewSelector.qml
+++ b/src/qml/ViewSelector.qml
@@@ -158,9 -158,9 +158,10 @@@ FocusScope =

                          pageModel.insert(1, {"name": i18nc("Title of the =
view of all albums", "Albums"), "iconName": elisaTheme.albumIcon})
                          pageModel.insert(2, {"name": i18nc("Title of the =
view of all artists", "Artists"), "iconName": elisaTheme.artistIcon})
                          pageModel.insert(3, {"name": i18nc("Title of the =
view of all tracks", "Tracks"), "iconName": elisaTheme.tracksIcon})
 +                        pageModel.insert(4, {"name": i18nc("Title of the =
view of all genres", "Genres"), "iconName": elisaTheme.genresIcon})
  =

                          viewModeView.currentIndex =3D 1
+                         switchView(1)
                      }
                  }
 =20