[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [elisa/file_browser] src/qml: Merge branch 'master' into file_browser
From:       Matthieu Gallien <null () kde ! org>
Date:       2018-05-31 22:03:30
Message-ID: E1fOVfO-0007yr-LJ () code ! kde ! org
[Download RAW message or body]

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

Merge branch 'master' into file_browser

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

https://commits.kde.org/elisa/37893cd332290ca15043855332941ad442f76e06

diff --cc src/qml/ViewSelector.qml
index a434843,328381b..93fc232
--- 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 file browser view", "Files"), \
"iconName": elisaTheme.folderIcon})  
                          viewModeView.currentIndex = 1
+                         switchView(1)
                      }
                  }
  


[prev in list] [next in list] [prev in thread] [next in thread]