Git commit 84305083cbe37bf8a57141f916a158fc7c7eac36 by Shantanu Tushar. Committed on 21/06/2012 at 17:31. Pushed by shantanu into branch 'master'. Dont mix ui elements with mediacenter components M +1 -1 components/CMakeLists.txt M +2 -1 components/mediabrowser/MediaBrowser.qml M +3 -2 components/mediawelcome/MediaWelcome.qml M +0 -1 components/qmldir D +0 -1 components/roundedbox/CMakeLists.txt A +1 -0 components/uielements/qmldir R +0 -0 components/uielements/roundedbox/RoundedBox.qml [from: compo= nents/roundedbox/RoundedBox.qml - 100% similarity] http://commits.kde.org/plasma-mediacenter/84305083cbe37bf8a57141f916a158fc7= c7eac36 diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index b986a2b..4f41d7e 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -7,4 +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) +install(DIRECTORY uielements DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/pl= asma/mediacentercomponents) diff --git a/components/mediabrowser/MediaBrowser.qml b/components/mediabro= wser/MediaBrowser.qml index 39e3f91..fb9e452 100644 --- a/components/mediabrowser/MediaBrowser.qml +++ b/components/mediabrowser/MediaBrowser.qml @@ -21,6 +21,7 @@ import QtQuick 1.1 import org.kde.plasma.components 0.1 as PlasmaComponents import org.kde.plasma.mediacentercomponents 0.1 as MediaCenterComponents +import org.kde.plasma.mediacentercomponents.uielements 0.1 as UiElements = FocusScope { id: mediaBrowser @@ -30,7 +31,7 @@ FocusScope { = signal playRequested(int index, string url, string currentMediaType) = - MediaCenterComponents.RoundedBox { + UiElements.RoundedBox { anchors.fill: parent } = diff --git a/components/mediawelcome/MediaWelcome.qml b/components/mediawel= come/MediaWelcome.qml index d0c9b8d..b66f7b7 100644 --- a/components/mediawelcome/MediaWelcome.qml +++ b/components/mediawelcome/MediaWelcome.qml @@ -20,6 +20,7 @@ = import QtQuick 1.1 import org.kde.plasma.mediacentercomponents 0.1 as MediaCenterComponents +import org.kde.plasma.mediacentercomponents.uielements 0.1 as UiElements = Item { id: homeScreenRootItem @@ -52,7 +53,7 @@ Item { height: parent.height clip: true = - MediaCenterComponents.RoundedBox { + UiElements.RoundedBox { anchors.fill: parent = ListView { @@ -74,7 +75,7 @@ Item { height: parent.height clip: true = - MediaCenterComponents.RoundedBox { + UiElements.RoundedBox { anchors.fill: parent = ListView { diff --git a/components/qmldir b/components/qmldir index 2a30da4..76b744f 100644 --- a/components/qmldir +++ b/components/qmldir @@ -7,4 +7,3 @@ 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 deleted file mode 100644 index 8b13789..0000000 --- a/components/roundedbox/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/components/uielements/qmldir b/components/uielements/qmldir new file mode 100644 index 0000000..1cfd91f --- /dev/null +++ b/components/uielements/qmldir @@ -0,0 +1 @@ +RoundedBox 0.1 roundedbox/RoundedBox.qml diff --git a/components/roundedbox/RoundedBox.qml b/components/uielements/r= oundedbox/RoundedBox.qml similarity index 100% rename from components/roundedbox/RoundedBox.qml rename to components/uielements/roundedbox/RoundedBox.qml