Merging Christophe Olinger's git repo: http://reviewboard.kde.org/3552/
authorcolinger <colinger@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Tue, 18 May 2010 12:21:45 +0000 (12:21 +0000)
committercolinger <colinger@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Tue, 18 May 2010 12:21:45 +0000 (12:21 +0000)
commit1b34bc80bb056ea00d4f6d027e62951fa5e9f5d8
treeef31058dbff52ee0e9fe2356c1bc66a306c5e0cb
parent48af1626bcbc264162e3b07079a8039255b33227
Merging Christophe Olinger's git repo: reviewboard.kde.org/3552/

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/base/plasma/MediaCenterComponents@1128152 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
76 files changed:
applets/CMakeLists.txt
applets/mediabrowser/CMakeLists.txt
applets/mediabrowser/abstractmediaitemview.cpp
applets/mediabrowser/abstractmediaitemview.h
applets/mediabrowser/mediabrowser.cpp
applets/mediabrowser/mediabrowser.h
applets/mediabrowser/mediabrowserlibs/modelpackage.cpp
applets/mediabrowser/mediabrowserlibs/modelpackage.h
applets/mediabrowser/modelpackages/CMakeLists.txt
applets/mediabrowser/modelpackages/localfiles/CMakeLists.txt [deleted file]
applets/mediabrowser/modelpackages/localfiles/localconfig.ui [deleted file]
applets/mediabrowser/modelpackages/localfiles/localfiles.desktop [deleted file]
applets/mediabrowser/modelpackages/localfiles/localfilespackage.cpp [deleted file]
applets/mediabrowser/modelpackages/localfiles/localfilespackage.h [deleted file]
applets/mediabrowser/modelpackages/localmusic/CMakeLists.txt [new file with mode: 0644]
applets/mediabrowser/modelpackages/localmusic/localmusic.desktop [new file with mode: 0644]
applets/mediabrowser/modelpackages/localmusic/localmusicconfig.ui [new file with mode: 0644]
applets/mediabrowser/modelpackages/localmusic/localmusicpackage.cpp [new file with mode: 0644]
applets/mediabrowser/modelpackages/localmusic/localmusicpackage.h [new file with mode: 0644]
applets/mediabrowser/modelpackages/localpictures/CMakeLists.txt [new file with mode: 0644]
applets/mediabrowser/modelpackages/localpictures/localpictures.desktop [new file with mode: 0644]
applets/mediabrowser/modelpackages/localpictures/localpicturesconfig.ui [new file with mode: 0644]
applets/mediabrowser/modelpackages/localpictures/localpicturespackage.cpp [new file with mode: 0644]
applets/mediabrowser/modelpackages/localpictures/localpicturespackage.h [new file with mode: 0644]
applets/mediabrowser/modelpackages/localvideos/CMakeLists.txt [new file with mode: 0644]
applets/mediabrowser/modelpackages/localvideos/localvideos.desktop [new file with mode: 0644]
applets/mediabrowser/modelpackages/localvideos/localvideosconfig.ui [new file with mode: 0644]
applets/mediabrowser/modelpackages/localvideos/localvideospackage.cpp [new file with mode: 0644]
applets/mediabrowser/modelpackages/localvideos/localvideospackage.h [new file with mode: 0644]
applets/mediabrowser/viewitem.cpp
applets/mediabrowser/viewitem.h
applets/mediacontroller/controller.cpp
applets/mediacontroller/controller.h
applets/mediainfobar/CMakeLists.txt [new file with mode: 0644]
applets/mediainfobar/mediainfobar.cpp [new file with mode: 0644]
applets/mediainfobar/mediainfobar.h [new file with mode: 0644]
applets/mediainfobar/plasma-applet-mediainfobar.desktop [new file with mode: 0644]
applets/mediaplayer/config.ui
applets/mediaplayer/mediaplayer.cpp
applets/mediaplayer/mediaplayer.h
applets/mediaplayer/pictureviewer.cpp
applets/mediaplayer/pictureviewer.h
applets/playlist/playlistapplet.cpp
applets/playlist/playlistapplet.h
applets/playlist/playlistwidget.cpp
applets/playlist/playlistwidget.h
containments/mediacontainment/mediacontainment.cpp
containments/mediacontainment/mediacontainment.h
libs/mediacenter/CMakeLists.txt
libs/mediacenter/browser.cpp
libs/mediacenter/browser.h
libs/mediacenter/homestate.cpp [new file with mode: 0644]
libs/mediacenter/homestate.h [new file with mode: 0644]
libs/mediacenter/infodisplay.cpp [new file with mode: 0644]
libs/mediacenter/infodisplay.h [new file with mode: 0644]
libs/mediacenter/mediacenter.h
libs/mediacenter/mediacenterstate.cpp
libs/mediacenter/mediacenterstate.h
libs/mediacenter/medialayout.cpp
libs/mediacenter/medialayout.h
libs/mediacenter/musicstate.cpp
libs/mediacenter/musicstate.h
libs/mediacenter/picturestate.cpp
libs/mediacenter/picturestate.h
libs/mediacenter/playbackcontrol.cpp
libs/mediacenter/playbackcontrol.h
libs/mediacenter/player.cpp
libs/mediacenter/player.h
libs/mediacenter/playlist.h
libs/mediacenter/videostate.cpp
libs/mediacenter/videostate.h
shells/plasmediacenter/CMakeLists.txt
shells/plasmediacenter/backgrounddialog.ui [new file with mode: 0644]
shells/plasmediacenter/main.cpp
shells/plasmediacenter/mainwindow.cpp
shells/plasmediacenter/mainwindow.h