diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/ChangeLog /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/ChangeLog --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/ChangeLog 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/ChangeLog 2009-12-10 17:31:26.000000000 +0000 @@ -63,6 +63,8 @@ * Improved automatic resizing of lyrics and suggestions in the context applet. BUGFIXES: + * Fixed two bookmark actions having the same text description. (BR 214716) + * Remove broken right click menu from the Info applet. (BR 206642) * Fix several bugs handling changing compilations. Patch by Morten Sjøgren -- thanks! * Fixed bug with panel header icon size. (BR 208616) diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/debian/changelog /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/debian/changelog --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/debian/changelog 2009-12-09 17:31:21.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/debian/changelog 2009-12-10 17:31:30.000000000 +0000 @@ -1,8 +1,8 @@ -amarok-nightly (20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144-0neon1) jaunty; urgency=low +amarok-nightly (20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9-0neon1) jaunty; urgency=low * Nightly Build - -- Project Neon Wed, 09 Dec 2009 12:31:21 -0500 + -- Project Neon Thu, 10 Dec 2009 12:31:31 -0500 amarok-nightly (20080303-0amarok1) gutsy; urgency=low diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/CMakeLists.txt /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/CMakeLists.txt --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/CMakeLists.txt 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/CMakeLists.txt 2009-12-10 17:31:22.000000000 +0000 @@ -361,6 +361,7 @@ context/toolbar/AppletToolbarAppletItem.cpp context/toolbar/AppletToolbarBase.cpp context/toolbar/AppletToolbarConfigItem.cpp + context/widgets/AmarokWebView.cpp context/widgets/RatingWidget.cpp context/widgets/TextScrollingWidget.cpp context/widgets/DropPixmapItem.cpp diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/audiocd/amarok_collection-audiocdcollection.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/audiocd/amarok_collection-audiocdcollection.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/audiocd/amarok_collection-audiocdcollection.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/audiocd/amarok_collection-audiocdcollection.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -71,7 +71,7 @@ X-KDE-Amarok-authors=Nikolaj Hald Nielsen X-KDE-Amarok-email=nhnFreespirit@gmail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=audiocd-collection X-KDE-Amarok-plugintype=collection X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/daap/amarok_collection-daapcollection.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/daap/amarok_collection-daapcollection.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/daap/amarok_collection-daapcollection.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/daap/amarok_collection-daapcollection.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -109,7 +109,7 @@ X-KDE-Amarok-authors=Maximilian Kossick X-KDE-Amarok-email=maximilian.kossick@googlemail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=daap-collection X-KDE-Amarok-plugintype=collection X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/device/massstorage/amarok_massstorage-device.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/device/massstorage/amarok_massstorage-device.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/device/massstorage/amarok_massstorage-device.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/device/massstorage/amarok_massstorage-device.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -109,7 +109,7 @@ X-KDE-Amarok-authors=Maximilian Kossick X-KDE-Amarok-email=maximilian.kossick@googlemail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=massstorage-device X-KDE-Amarok-plugintype=device X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/device/nfs/amarok_nfs-device.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/device/nfs/amarok_nfs-device.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/device/nfs/amarok_nfs-device.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/device/nfs/amarok_nfs-device.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -106,7 +106,7 @@ X-KDE-Amarok-authors=Maximilian Kossick X-KDE-Amarok-email=maximilian.kossick@googlemail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=nfs-device X-KDE-Amarok-plugintype=device X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/device/smb/amarok_smb-device.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/device/smb/amarok_smb-device.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/device/smb/amarok_smb-device.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/device/smb/amarok_smb-device.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -106,7 +106,7 @@ X-KDE-Amarok-authors=Maximilian Kossick X-KDE-Amarok-email=maximilian.kossick@googlemail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=smb-device X-KDE-Amarok-plugintype=device X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/iphoneos/amarok_collection-iphoneoscollection.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -66,7 +66,7 @@ X-KDE-Amarok-authors=Martin Aumueller X-KDE-Amarok-email=aumuell@reserv.at -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=iphoneos-collection X-KDE-Amarok-plugintype=collection X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -105,7 +105,7 @@ X-KDE-Amarok-authors=Alejandro Wainzinger X-KDE-Amarok-email=aikawarazuni@gmail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=ipod-collection X-KDE-Amarok-plugintype=collection X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/mediadevicecollection/amarok_collection-mediadevicecollection.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/mediadevicecollection/amarok_collection-mediadevicecollection.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/mediadevicecollection/amarok_collection-mediadevicecollection.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/mediadevicecollection/amarok_collection-mediadevicecollection.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -105,7 +105,7 @@ X-KDE-Amarok-authors=Alejandro Wainzinger X-KDE-Amarok-email=aikawarazuni@gmail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=mediadevice-collection X-KDE-Amarok-plugintype=collection X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/mtpcollection/amarok_collection-mtpcollection.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/mtpcollection/amarok_collection-mtpcollection.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/mtpcollection/amarok_collection-mtpcollection.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/mtpcollection/amarok_collection-mtpcollection.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -105,7 +105,7 @@ X-KDE-Amarok-authors=Alejandro Wainzinger X-KDE-Amarok-email=aikawarazuni@gmail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=mtp-collection X-KDE-Amarok-plugintype=collection X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/mysqlecollection/amarok_collection-mysqlecollection.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -89,7 +89,7 @@ X-KDE-Amarok-authors=Maximilian Kossick X-KDE-Amarok-email=maximilian.kossick@googlemail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=mysqle-collection X-KDE-Amarok-plugintype=collection X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/mysqlservercollection/amarok_collection-mysqlservercollection.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -89,7 +89,7 @@ X-KDE-Amarok-authors=Jeff Mitchell X-KDE-Amarok-email=mitchell@kde.org -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=mysqlserver-collection X-KDE-Amarok-plugintype=collection X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/nepomukcollection/amarok_collection-nepomukcollection.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/nepomukcollection/amarok_collection-nepomukcollection.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/nepomukcollection/amarok_collection-nepomukcollection.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/nepomukcollection/amarok_collection-nepomukcollection.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -57,7 +57,7 @@ X-KDE-Amarok-authors=Daniel Winter X-KDE-Amarok-email=dw@danielwinter.de -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=nepomuk-collection X-KDE-Amarok-plugintype=collection X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/umscollection/amarok_collection-umscollection.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/umscollection/amarok_collection-umscollection.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/umscollection/amarok_collection-umscollection.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/umscollection/amarok_collection-umscollection.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -35,7 +35,7 @@ X-KDE-Amarok-authors=Alejandro Wainzinger X-KDE-Amarok-email=aikawarazuni@gmail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=ums-collection X-KDE-Amarok-plugintype=collection X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/upnp/amarok_collection-upnpcollection.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/upnp/amarok_collection-upnpcollection.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/collection/upnp/amarok_collection-upnpcollection.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/collection/upnp/amarok_collection-upnpcollection.desktop 2009-12-10 17:31:21.000000000 +0000 @@ -105,7 +105,7 @@ X-KDE-Amarok-authors=Maximilian Kossick X-KDE-Amarok-email=maximilian.kossick@googlemail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=daap-collection X-KDE-Amarok-plugintype=collection X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/context/applets/info/InfoApplet.cpp /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/context/applets/info/InfoApplet.cpp --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/context/applets/info/InfoApplet.cpp 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/context/applets/info/InfoApplet.cpp 2009-12-10 17:31:22.000000000 +0000 @@ -48,7 +48,7 @@ dataEngine( "amarok-info" )->connectSource( "info", this ); - m_webView = new Plasma::WebView( this ); + m_webView = new AmarokWebView( this ); resize( 500, -1 ); diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/context/applets/info/InfoApplet.h /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/context/applets/info/InfoApplet.h --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/context/applets/info/InfoApplet.h 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/context/applets/info/InfoApplet.h 2009-12-10 17:31:22.000000000 +0000 @@ -17,6 +17,8 @@ #ifndef SERVICE_INFO_APPLET_H #define SERVICE_INFO_APPLET_H +#include "context/widgets/AmarokWebView.h" + #include #include #include @@ -25,7 +27,6 @@ #include "meta/Playlist.h" #include -#include #include @@ -57,7 +58,7 @@ void linkClicked( const QUrl & url ); private: - Plasma::WebView * m_webView; + AmarokWebView * m_webView; bool m_initialized; Meta::XSPFPlaylist * m_currentPlaylist; diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/context/applets/wikipedia/WikipediaApplet.cpp /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/context/applets/wikipedia/WikipediaApplet.cpp --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/context/applets/wikipedia/WikipediaApplet.cpp 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/context/applets/wikipedia/WikipediaApplet.cpp 2009-12-10 17:31:22.000000000 +0000 @@ -190,8 +190,8 @@ m_albumIcon->setPos( size().width() - 4 * iconWidth - 4 * standardPadding(), standardPadding() ); m_trackIcon->setPos( size().width() - 3 * iconWidth - 4 * standardPadding(), standardPadding() ); - m_settingsIcon->setPos( size().width() - 2 * iconWidth - 2 * standardPadding(), standardPadding() ); - m_reloadIcon->setPos( size().width() - iconWidth - standardPadding(), standardPadding() ); + m_reloadIcon->setPos( size().width() - 2 * iconWidth - 2 * standardPadding(), standardPadding() ); + m_settingsIcon->setPos( size().width() - iconWidth - standardPadding(), standardPadding() ); } bool diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/context/engines/wikipedia/WikipediaEngine.cpp /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/context/engines/wikipedia/WikipediaEngine.cpp --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/context/engines/wikipedia/WikipediaEngine.cpp 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/context/engines/wikipedia/WikipediaEngine.cpp 2009-12-10 17:31:22.000000000 +0000 @@ -349,6 +349,13 @@ QString protecend = "" ; while ( m_wiki.indexOf( protec ) != -1 ) m_wiki.remove( m_wiki.indexOf( protec ), m_wiki.mid( m_wiki.indexOf( protec ) ).indexOf( protecend ) + protecend.size() ); + + // lets also remove the "lock" image + QString topicon = "
* + * * + * 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 Pulic License for more details. * + * * + * You should have received a copy of the GNU General Public License along with * + * this program. If not, see . * + ****************************************************************************************/ + + +#include "AmarokWebView.h" +#include "Debug.h" + +AmarokWebView::AmarokWebView( QGraphicsItem *parent ) + : Plasma::WebView( parent ) +{ +} + +void AmarokWebView::mousePressEvent( QGraphicsSceneMouseEvent *event ) +{ + if( event->button() == Qt::RightButton ) + { + event->accept(); + } + else + Plasma::WebView::mousePressEvent( event ); +} + +void AmarokWebView::contextMenuEvent( QGraphicsSceneContextMenuEvent *event ) +{ + event->accept(); +} \ No newline at end of file diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/context/widgets/AmarokWebView.h /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/context/widgets/AmarokWebView.h --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/context/widgets/AmarokWebView.h 1970-01-01 01:00:00.000000000 +0100 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/context/widgets/AmarokWebView.h 2009-12-10 17:31:22.000000000 +0000 @@ -0,0 +1,43 @@ +/**************************************************************************************** + * Copyright (c) 2009 Nikolaj Hald Nielsen * + * * + * 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 Pulic License for more details. * + * * + * You should have received a copy of the GNU General Public License along with * + * this program. If not, see . * + ****************************************************************************************/ + +#ifndef AMAROKWEBVIEW_H +#define AMAROKWEBVIEW_H + +#include "amarok_export.h" + +#include + +#include +#include + +/** + * A simple Plasma::WebView sublcass that ignores right click events as we do not support any of the normal web context actions. + */ + +class AMAROK_EXPORT AmarokWebView : public Plasma::WebView +{ +public: + AmarokWebView( QGraphicsItem *parent = 0 ); + +protected: + void mousePressEvent( QGraphicsSceneMouseEvent *event ); + void contextMenuEvent( QGraphicsSceneContextMenuEvent *event ); + + +}; + +#endif // AMAROKWEBVIEW_H diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/MainWindow.cpp /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/MainWindow.cpp --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/MainWindow.cpp 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/MainWindow.cpp 2009-12-10 17:31:22.000000000 +0000 @@ -744,7 +744,7 @@ connect( action, SIGNAL( triggered(bool) ), this, SLOT( exportPlaylist() ) ); ac->addAction( "playlist_export", action ); - action = new KAction( KIcon( "bookmark-new" ), i18n( "Bookmark This Location" ), this ); + action = new KAction( KIcon( "bookmark-new" ), i18n( "Bookmark Media Sources View" ), this ); ac->addAction( "bookmark_browser", action ); connect( action, SIGNAL( triggered() ), The::amarokUrlHandler(), SLOT( bookmarkCurrentBrowserView() ) ); @@ -752,7 +752,7 @@ ac->addAction( "bookmark_manager", action ); connect( action, SIGNAL( triggered(bool) ), SLOT( slotShowBookmarkManager() ) ); - action = new KAction( KIcon( "bookmark-new" ), i18n( "Bookmark This Location" ), this ); + action = new KAction( KIcon( "bookmark-new" ), i18n( "Bookmark Playlist Setup" ), this ); ac->addAction( "bookmark_playlistview", action ); connect( action, SIGNAL( triggered() ), The::amarokUrlHandler(), SLOT( bookmarkCurrentPlaylistView() ) ); diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/PluginManager.h /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/PluginManager.h --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/PluginManager.h 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/PluginManager.h 2009-12-10 17:31:22.000000000 +0000 @@ -29,7 +29,7 @@ { public: /** Bump this number whenever the plugin framework gets incompatible with older versions */ - static const int FrameworkVersion = 50; + static const int FrameworkVersion = 51; /** * It will return a list of services that match your diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/ampache/amarok_service_ampache.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/ampache/amarok_service_ampache.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/ampache/amarok_service_ampache.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/ampache/amarok_service_ampache.desktop 2009-12-10 17:31:22.000000000 +0000 @@ -94,7 +94,7 @@ X-KDE-Amarok-authors=Nikolaj Hald Nielsen X-KDE-Amarok-email=nhnFreespirit@gmail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=AmpacheService X-KDE-Amarok-plugintype=service X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/jamendo/amarok_service_jamendo.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/jamendo/amarok_service_jamendo.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/jamendo/amarok_service_jamendo.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/jamendo/amarok_service_jamendo.desktop 2009-12-10 17:31:22.000000000 +0000 @@ -94,7 +94,7 @@ X-KDE-Amarok-authors=Nikolaj Hald Nielsen X-KDE-Amarok-email=nhnFreespirit@gmail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=JamendoService X-KDE-Amarok-plugintype=service X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/lastfm/amarok_service_lastfm.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/lastfm/amarok_service_lastfm.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/lastfm/amarok_service_lastfm.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/lastfm/amarok_service_lastfm.desktop 2009-12-10 17:31:22.000000000 +0000 @@ -96,7 +96,7 @@ X-KDE-Amarok-authors=Shane King X-KDE-Amarok-email=kde@dontletsstart.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=LastFmService X-KDE-Amarok-plugintype=service X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/magnatune/amarok_service_magnatunestore.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/magnatune/amarok_service_magnatunestore.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/magnatune/amarok_service_magnatunestore.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/magnatune/amarok_service_magnatunestore.desktop 2009-12-10 17:31:22.000000000 +0000 @@ -101,7 +101,7 @@ X-KDE-Amarok-authors=Nikolaj Hald Nielsen X-KDE-Amarok-email=nhnFreespirit@gmail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=MagnatuneStore X-KDE-Amarok-plugintype=service X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/mp3tunes/amarok_service_mp3tunes.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/mp3tunes/amarok_service_mp3tunes.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/mp3tunes/amarok_service_mp3tunes.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/mp3tunes/amarok_service_mp3tunes.desktop 2009-12-10 17:31:22.000000000 +0000 @@ -91,7 +91,7 @@ X-KDE-Amarok-authors=Nikolaj Hald Nielsen X-KDE-Amarok-email=nhnFreespirit@gmail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=Mp3tunesService X-KDE-Amarok-plugintype=service X-KDE-Amarok-rank=100 diff -Nru /tmp/l6QRfQyFLM/amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/opmldirectory/amarok_service_opmldirectory.desktop /tmp/Ix54aRnWo8/amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/opmldirectory/amarok_service_opmldirectory.desktop --- amarok-nightly-20091209+svn57f69dba34faf096f1f41fcd02e9874eb7537144/src/services/opmldirectory/amarok_service_opmldirectory.desktop 2009-12-09 17:31:18.000000000 +0000 +++ amarok-nightly-20091210+svn1783fade73f92a1efeeafdfe1033edbbbf36acc9/src/services/opmldirectory/amarok_service_opmldirectory.desktop 2009-12-10 17:31:22.000000000 +0000 @@ -92,7 +92,7 @@ X-KDE-Amarok-authors=Nikolaj Hald Nielsen X-KDE-Amarok-email=nhnFreespirit@gmail.com -X-KDE-Amarok-framework-version=50 +X-KDE-Amarok-framework-version=51 X-KDE-Amarok-name=JamendoService X-KDE-Amarok-plugintype=service X-KDE-Amarok-rank=100