From kde-commits Thu Jun 21 15:04:45 2012 From: Shantanu Tushar Date: Thu, 21 Jun 2012 15:04:45 +0000 To: kde-commits Subject: [plasma-mediacenter] /: Cosmetics and shiny boxes Message-Id: <20120621150445.D71ECA60A9 () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=134029130010573 Git commit 5a9f0f70f90bc0578f0619872f86ef2503dafc3c by Shantanu Tushar. Committed on 21/06/2012 at 17:04. Pushed by shantanu into branch 'master'. Cosmetics and shiny boxes M +1 -0 components/CMakeLists.txt M +2 -5 components/mediabrowser/MediaBrowser.qml M +24 -9 components/mediawelcome/MediaWelcome.qml M +1 -0 components/qmldir A +1 -0 components/roundedbox/CMakeLists.txt A +28 -0 components/roundedbox/RoundedBox.qml [License: GPL (v2+)] M +7 -3 shells/newshell/package/contents/ui/mediacenter.qml http://commits.kde.org/plasma-mediacenter/5a9f0f70f90bc0578f0619872f86ef250= 3dafc3c diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 65b6e51..b986a2b 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -7,3 +7,4 @@ install(DIRECTORY runtimedata DESTINATION ${IMPORTS_INSTALL= _DIR}/org/kde/plasma/ install(DIRECTORY aboutpmc DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plas= ma/mediacentercomponents) install(DIRECTORY playlist DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plas= ma/mediacentercomponents) install(DIRECTORY imageviewer DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/p= lasma/mediacentercomponents) +install(DIRECTORY roundedbox DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/pl= asma/mediacentercomponents) diff --git a/components/mediabrowser/MediaBrowser.qml b/components/mediabro= wser/MediaBrowser.qml index 39edf3c..39e3f91 100644 --- a/components/mediabrowser/MediaBrowser.qml +++ b/components/mediabrowser/MediaBrowser.qml @@ -20,6 +20,7 @@ = import QtQuick 1.1 import org.kde.plasma.components 0.1 as PlasmaComponents +import org.kde.plasma.mediacentercomponents 0.1 as MediaCenterComponents = FocusScope { id: mediaBrowser @@ -29,12 +30,8 @@ FocusScope { = signal playRequested(int index, string url, string currentMediaType) = - Rectangle { + MediaCenterComponents.RoundedBox { anchors.fill: parent - color: "black" - opacity: 0.8 - radius: 20 - border { color: "white"; width: 2 } } = Item { diff --git a/components/mediawelcome/MediaWelcome.qml b/components/mediawel= come/MediaWelcome.qml index 19b4f77..d0c9b8d 100644 --- a/components/mediawelcome/MediaWelcome.qml +++ b/components/mediawelcome/MediaWelcome.qml @@ -19,6 +19,7 @@ *************************************************************************= **/ = import QtQuick 1.1 +import org.kde.plasma.mediacentercomponents 0.1 as MediaCenterComponents = Item { id: homeScreenRootItem @@ -43,6 +44,7 @@ Item { id: homeScreenBody width: parent.width height: 0.7 * parent.height + spacing: 20 = Item { id: homeScreenBodyLeft @@ -50,13 +52,20 @@ Item { height: parent.height clip: true = - ListView { - id: homeScreenBackendsList + MediaCenterComponents.RoundedBox { anchors.fill: parent - spacing: 20 = - delegate: BackendsListDelegate { width: parent.width; = height: 64 } + ListView { + id: homeScreenBackendsList + anchors { fill: parent; margins: 20 } + spacing: 20 + + header: HomeScreenText { width: parent.width; heig= ht: 64; horizontalAlignment: Text.AlignHCenter; text: "Select A Mode"; font= .pointSize: 24 } + delegate: BackendsListDelegate { width: parent.wid= th; height: 64 } + } + } + } = Item { @@ -65,14 +74,20 @@ Item { height: parent.height clip: true = - ListView { - id: recentlyPlayedList + MediaCenterComponents.RoundedBox { anchors.fill: parent - spacing: 20 - model: RecentlyPlayed { } = - delegate: RecentlyPlayedListDelegate { width: parent.w= idth; height: 64 } + ListView { + id: recentlyPlayedList + anchors { fill: parent; margins: 20 } + spacing: 20 + model: RecentlyPlayed { } + + header: HomeScreenText { width: parent.width; heig= ht: 64; horizontalAlignment: Text.AlignHCenter; text: "Recently Played"; fo= nt.pointSize: 24 } + delegate: RecentlyPlayedListDelegate { width: pare= nt.width; height: 64 } + } } + } } = diff --git a/components/qmldir b/components/qmldir index 76b744f..2a30da4 100644 --- a/components/qmldir +++ b/components/qmldir @@ -7,3 +7,4 @@ RuntimeData 0.1 runtimedata/RuntimeData.qml AboutPMC 0.1 aboutpmc/AboutPMC.qml Playlist 0.1 playlist/Playlist.qml ImageViewer 0.1 imageviewer/ImageViewer.qml +RoundedBox 0.1 roundedbox/RoundedBox.qml diff --git a/components/roundedbox/CMakeLists.txt b/components/roundedbox/C= MakeLists.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/components/roundedbox/CMakeLists.txt @@ -0,0 +1 @@ + diff --git a/components/roundedbox/RoundedBox.qml b/components/roundedbox/R= oundedBox.qml new file mode 100644 index 0000000..33feab2 --- /dev/null +++ b/components/roundedbox/RoundedBox.qml @@ -0,0 +1,28 @@ +/*************************************************************************= ** + * Copyright 2012 Sinny Kumari = * + * Copyright 2012 Shantanu Tushar = * + * = * + * This program is free software; you can redistribute it and/or modify = * + * it under the terms of the GNU General Public License as published by = * + * the Free Software Foundation; either version 2 of the License, or = * + * (at your option) any later version. = * + * = * + * This program is distributed in the hope that it will be useful, = * + * but WITHOUT ANY WARRANTY; without even the implied warranty of = * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = * + * GNU General Public License for more details. = * + * = * + * You should have received a copy of the GNU General Public License = * + * along with this program; if not, write to the = * + * Free Software Foundation, Inc., = * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . = * + *************************************************************************= **/ + +import QtQuick 1.1 + +Rectangle { + color: "black" + opacity: 0.8 + radius: 20 + border { color: "white"; width: 2 } +} diff --git a/shells/newshell/package/contents/ui/mediacenter.qml b/shells/n= ewshell/package/contents/ui/mediacenter.qml index b2eac84..adcfb1e 100644 --- a/shells/newshell/package/contents/ui/mediacenter.qml +++ b/shells/newshell/package/contents/ui/mediacenter.qml @@ -246,9 +246,13 @@ Rectangle { = MediaCenterComponents.Playlist { id: playlist - anchors.top: mediaController.bottom - anchors.left: parent.right - anchors.right: undefined + anchors { + top: mediaController.bottom + left: parent.right + right: undefined + bottom: previewArea.top + margins: 10 + } onPlayRequested: { z =3D 0 mediaPlayer.visible =3D true