Skip to content
Browse files

Merge branch 'master' into resulthintcheck

Conflicts:
	src/libtomahawk/utils/TomahawkUtils.cpp
  • Loading branch information...
2 parents c63fff9 + 13bee7f commit 7645862c7b2258834bc96a41c956abc8c404306d @hugolm84 hugolm84 committed Jan 21, 2013
Showing with 21,732 additions and 13,224 deletions.
  1. +1 −0 .gitignore
  2. +9 −5 AUTHORS
  3. +167 −29 CMakeLists.txt
  4. +0 −5 CMakeModules/FindLibLastFm.cmake
  5. +7 −28 CMakeModules/FindQJSON.cmake
  6. +0 −3 CMakeModules/FindQTweetLib.cmake
  7. +3 −4 CMakeModules/FindQuaZip.cmake
  8. +0 −2 CMakeModules/NSIS.template.in
  9. +26 −5 ChangeLog
  10. +13 −7 README.md
  11. +13 −6 CMakeModules/AddTomahawkPlugin.cmake → TomahawkAddPlugin.cmake
  12. +3 −0 TomahawkBuildTreeSettings.cmake.in
  13. +21 −0 TomahawkConfig.cmake.in
  14. +12 −0 TomahawkConfigVersion.cmake.in
  15. +34 −0 TomahawkUse.cmake
  16. +2 −0 admin/mac/Info.plist
  17. +1 −1 admin/mac/macdeploy.py
  18. +19 −8 admin/win/Toolchain-mingw32-openSUSE.cmake
  19. +9 −5 data/images/arrow-down-double.svg
  20. +8 −4 data/images/arrow-right-double.svg
  21. +1 −3 data/images/artist-icon.svg
  22. +2 −2 data/images/green-dot.svg
  23. +6 −2 data/images/search-icon.svg
  24. +72 −12 data/images/subscribe-off.svg
  25. +102 −18 data/images/subscribe-on.svg
  26. +393 −448 lang/tomahawk_ar.ts
  27. +423 −473 lang/tomahawk_bg.ts
  28. +389 −444 lang/tomahawk_bn_IN.ts
  29. +393 −448 lang/tomahawk_ca.ts
  30. +4,160 −0 lang/tomahawk_cs.ts
  31. +4,150 −0 lang/tomahawk_da.ts
  32. +397 −452 lang/tomahawk_de.ts
  33. +391 −446 lang/tomahawk_el.ts
  34. +393 −448 lang/tomahawk_en.ts
  35. +487 −542 lang/tomahawk_es.ts
  36. +394 −449 lang/tomahawk_fi.ts
  37. +403 −458 lang/tomahawk_fr.ts
  38. +554 −600 lang/tomahawk_gl.ts
  39. +389 −444 lang/tomahawk_hi_IN.ts
  40. +389 −444 lang/tomahawk_hu.ts
  41. +586 −641 lang/tomahawk_it.ts
  42. +404 −460 lang/tomahawk_ja.ts
  43. +393 −448 lang/tomahawk_lt.ts
  44. +416 −471 lang/tomahawk_pl.ts
  45. +394 −449 lang/tomahawk_pt_BR.ts
  46. +615 −661 lang/tomahawk_ru.ts
  47. +759 −798 lang/tomahawk_sv.ts
  48. +389 −444 lang/tomahawk_tr.ts
  49. +418 −473 lang/tomahawk_zh_CN.ts
  50. +391 −446 lang/tomahawk_zh_TW.ts
  51. +19 −19 lang/translations.cmake
  52. +43 −11 src/AudioControls.cpp
  53. +4 −1 src/AudioControls.h
  54. +16 −10 src/AudioControls.ui
  55. +5 −2 src/CMakeLists.osx.cmake
  56. +21 −30 src/CMakeLists.txt
  57. +0 −2 src/CMakeLists.unix.cmake
  58. +0 −2 src/CMakeLists.win32.cmake
  59. +2 −1 src/Config.h.in
  60. +43 −14 src/DiagnosticsDialog.cpp
  61. +1 −1 src/SettingsDialog.cpp
  62. +6 −1 src/Settings_Accounts.ui
  63. +10 −21 src/SocialWidget.cpp
  64. +16 −55 src/TomahawkApp.cpp
  65. +12 −12 src/TomahawkApp.h
  66. +1 −0 src/TomahawkVersion.h.in
  67. +75 −61 src/TomahawkWindow.cpp
  68. +2 −2 src/TomahawkWindow.h
  69. +0 −136 src/TomahawkWindow.ui
  70. +17 −10 src/accounts/CMakeLists.txt
  71. +1 −1 src/accounts/twitter/CMakeLists.txt
  72. +6 −5 src/accounts/twitter/TwitterAccount.cpp
  73. +5 −5 src/accounts/twitter/TwitterAccount.h
  74. +1 −1 src/accounts/twitter/TwitterInfoPlugin.cpp
  75. +1 −1 src/accounts/twitter/TwitterInfoPlugin.h
  76. +8 −8 src/accounts/twitter/sip/TwitterSip.cpp
  77. +8 −8 src/accounts/twitter/sip/TwitterSip.h
  78. +1 −1 src/accounts/xmpp/CMakeLists.txt
  79. +2 −2 src/accounts/xmpp/XmppAccount.cpp
  80. +3 −3 src/accounts/xmpp/XmppAccount.h
  81. +1 −1 src/accounts/xmpp/XmppInfoPlugin.h
  82. +1 −1 src/accounts/xmpp/googlewrapper/CMakeLists.txt
  83. +1 −1 src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp
  84. +1 −1 src/accounts/xmpp/googlewrapper/GoogleWrapper.h
  85. +45 −24 src/accounts/xmpp/sip/XmppSip.cpp
  86. +3 −2 src/accounts/xmpp/sip/XmppSip.h
  87. +1 −1 src/accounts/zeroconf/CMakeLists.txt
  88. +4 −4 src/accounts/zeroconf/TomahawkZeroconf.h
  89. +24 −6 src/accounts/zeroconf/Zeroconf.cpp
  90. +4 −3 src/accounts/zeroconf/Zeroconf.h
  91. +1 −3 src/accounts/zeroconf/ZeroconfAccount.cpp
  92. +2 −2 src/accounts/zeroconf/ZeroconfAccount.h
  93. +1 −1 src/breakpad/BreakPad.cpp
  94. +22 −13 src/breakpad/CrashReporter/CMakeLists.txt
  95. +4 −8 src/breakpad/CrashReporter/main.cpp
  96. +1 −1 src/infoplugins/generic/CMakeLists.txt
  97. +14 −11 src/infoplugins/generic/charts/ChartsPlugin.cpp
  98. +2 −1 src/infoplugins/generic/charts/ChartsPlugin.h
  99. +10 −7 src/infoplugins/generic/discogs/DiscogsPlugin.cpp
  100. +1 −0 src/infoplugins/generic/discogs/DiscogsPlugin.h
  101. +0 −1 src/infoplugins/generic/echonest/EchonestPlugin.cpp
  102. +1 −0 src/infoplugins/generic/echonest/EchonestPlugin.h
  103. +0 −1 src/infoplugins/generic/hypem/HypemPlugin.cpp
  104. +1 −0 src/infoplugins/generic/hypem/HypemPlugin.h
  105. +12 −9 src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.cpp
  106. +1 −0 src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.h
  107. +12 −9 src/infoplugins/generic/musixmatch/MusixMatchPlugin.cpp
  108. +1 −0 src/infoplugins/generic/musixmatch/MusixMatchPlugin.h
  109. +12 −9 src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp
  110. +3 −1 src/infoplugins/generic/newreleases/NewReleasesPlugin.h
  111. +10 −9 src/infoplugins/generic/rovi/RoviPlugin.cpp
  112. +1 −0 src/infoplugins/generic/rovi/RoviPlugin.h
  113. +0 −1 src/infoplugins/generic/spotify/SpotifyPlugin.cpp
  114. +1 −0 src/infoplugins/generic/spotify/SpotifyPlugin.h
  115. +19 −14 src/infoplugins/linux/CMakeLists.txt
  116. +0 −1 src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp
  117. +1 −0 src/infoplugins/linux/fdonotify/FdoNotifyPlugin.h
  118. +1 −1 src/infoplugins/linux/mpris/MprisPlugin.cpp
  119. +1 −0 src/infoplugins/linux/mpris/MprisPlugin.h
  120. +1 −1 src/infoplugins/mac/CMakeLists.txt
  121. +3 −2 src/infoplugins/mac/adium/AdiumPlugin.h
  122. +36 −25 src/libtomahawk/ActionCollection.cpp
  123. +2 −2 src/libtomahawk/ActionCollection.h
  124. +6 −1 src/libtomahawk/Album.cpp
  125. +1 −3 src/libtomahawk/Album.h
  126. +7 −4 src/libtomahawk/AlbumPlaylistInterface.cpp
  127. +2 −2 src/libtomahawk/AlbumPlaylistInterface.h
  128. +0 −2 src/libtomahawk/Artist.h
  129. +4 −4 src/libtomahawk/ArtistPlaylistInterface.cpp
  130. +2 −2 src/libtomahawk/ArtistPlaylistInterface.h
  131. +8 −7 src/libtomahawk/AtticaManager.cpp
  132. +0 −2 src/libtomahawk/AtticaManager.h
  133. +98 −46 src/libtomahawk/CMakeLists.txt
  134. +12 −6 src/libtomahawk/ContextMenu.cpp
  135. +2 −2 src/libtomahawk/ContextMenu.h
  136. +7 −0 src/libtomahawk/DropJob.cpp
  137. +3 −0 src/libtomahawk/EchonestCatalogSynchronizer.cpp
  138. +5 −6 src/libtomahawk/ExternalResolverGui.cpp
  139. +1 −1 src/libtomahawk/FuncTimeout.cpp
  140. +2 −2 src/libtomahawk/FuncTimeout.h
  141. +60 −59 src/libtomahawk/GlobalActionManager.cpp
  142. +0 −2 src/libtomahawk/GlobalActionManager.h
  143. 0 src/{ → libtomahawk}/HeadlessCheck.h
  144. +3 −2 src/libtomahawk/LatchManager.cpp
  145. +6 −6 src/libtomahawk/Pipeline.cpp
  146. +2 −2 src/libtomahawk/Pipeline.h
  147. +4 −16 src/libtomahawk/PlaylistInterface.cpp
  148. +2 −2 src/libtomahawk/PlaylistInterface.h
  149. +1 −1 src/libtomahawk/PlaylistPlaylistInterface.cpp
  150. +2 −2 src/libtomahawk/PlaylistPlaylistInterface.h
  151. +1 −1 src/libtomahawk/Query.cpp
  152. +2 −2 src/libtomahawk/Query.h
  153. +2 −2 src/libtomahawk/Result.cpp
  154. +5 −5 src/libtomahawk/Result.h
  155. +22 −72 src/libtomahawk/Source.cpp
  156. +2 −7 src/libtomahawk/Source.h
  157. +19 −0 src/libtomahawk/SourceList.cpp
  158. +5 −0 src/libtomahawk/SourceList.h
  159. +4 −3 src/libtomahawk/SourcePlaylistInterface.cpp
  160. +3 −3 src/libtomahawk/SourcePlaylistInterface.h
  161. +13 −0 src/libtomahawk/TomahawkConfig.cmake
  162. +13 −0 src/libtomahawk/TomahawkPlugin.h
  163. +17 −1 src/libtomahawk/TomahawkSettings.cpp
  164. +3 −0 src/libtomahawk/TomahawkSettings.h
  165. +12 −0 src/libtomahawk/TomahawkSettingsGui.cpp
  166. +16 −3 src/libtomahawk/Typedefs.h
  167. +9 −65 src/libtomahawk/ViewManager.cpp
  168. +7 −18 src/libtomahawk/ViewManager.h
  169. +8 −9 src/libtomahawk/accounts/Account.h
  170. +2 −8 src/libtomahawk/accounts/AccountDelegate.cpp
  171. +8 −0 src/libtomahawk/accounts/AccountDelegate.h
  172. 0 src/{ → libtomahawk}/accounts/AccountDllMacro.h
  173. +2 −2 src/libtomahawk/accounts/AccountFactoryWrapper.ui
  174. +27 −15 src/libtomahawk/accounts/AccountManager.cpp
  175. +5 −0 src/libtomahawk/accounts/AccountManager.h
  176. +2 −1 src/libtomahawk/accounts/AccountModel.cpp
  177. +1 −1 src/libtomahawk/accounts/AccountModel.h
  178. +10 −1 src/libtomahawk/accounts/ResolverAccount.cpp
  179. +5 −2 src/libtomahawk/accounts/ResolverAccount.h
  180. +4 −3 src/libtomahawk/accounts/lastfm/LastFmAccount.cpp
  181. +3 −3 src/libtomahawk/accounts/lastfm/LastFmAccount.h
  182. +0 −2 src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
  183. +25 −25 src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
  184. +3 −1 src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
  185. +115 −21 src/libtomahawk/accounts/spotify/SpotifyAccount.cpp
  186. +14 −14 src/libtomahawk/accounts/spotify/SpotifyAccount.h
  187. +31 −1 src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp
  188. +2 −0 src/libtomahawk/accounts/spotify/SpotifyAccountConfig.h
  189. +13 −0 src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui
  190. +61 −9 src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp
  191. +6 −3 src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.h
  192. +2 −2 src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h
  193. +69 −38 src/libtomahawk/audio/AudioEngine.cpp
  194. +6 −5 src/libtomahawk/audio/AudioEngine.h
  195. +5 −5 src/libtomahawk/database/Database.cpp
  196. +2 −2 src/libtomahawk/database/Database.h
  197. +6 −7 src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.cpp
  198. +3 −10 src/libtomahawk/database/DatabaseCommand_CreatePlaylist.cpp
  199. +0 −1 src/libtomahawk/database/DatabaseCommand_DeleteFiles.h
  200. +3 −1 src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h
  201. +3 −2 src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h
  202. +1 −0 src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.cpp
  203. +2 −1 src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h
  204. +1 −0 src/libtomahawk/database/DatabaseImpl.cpp
  205. +4 −2 src/libtomahawk/database/DatabaseImpl.h
  206. +3 −3 src/libtomahawk/database/DatabaseWorker.cpp
  207. +4 −4 src/libtomahawk/database/DatabaseWorker.h
  208. +1 −1 src/libtomahawk/database/IdThreadWorker.h
  209. +3 −1 src/libtomahawk/database/TomahawkSqlQuery.h
  210. +8 −6 src/libtomahawk/filemetadata/MetadataEditor.cpp
  211. +3 −3 src/libtomahawk/filemetadata/MetadataEditor.h
  212. +43 −26 src/libtomahawk/filemetadata/MusicScanner.cpp
  213. +31 −16 src/libtomahawk/filemetadata/MusicScanner.h
  214. +52 −30 src/libtomahawk/filemetadata/ScanManager.cpp
  215. +33 −16 src/libtomahawk/filemetadata/ScanManager.h
  216. +1 −1 src/libtomahawk/infobar/InfoBar.cpp
  217. +44 −7 src/libtomahawk/infosystem/InfoSystem.cpp
  218. +39 −17 src/libtomahawk/infosystem/InfoSystem.h
  219. +2 −0 src/libtomahawk/infosystem/InfoSystemCache.h
  220. +13 −2 src/libtomahawk/infosystem/InfoSystemWorker.cpp
  221. +5 −1 src/libtomahawk/infosystem/InfoSystemWorker.h
  222. +12 −15 src/libtomahawk/jobview/AclJobItem.cpp
  223. +5 −4 src/libtomahawk/jobview/JobStatusDelegate.cpp
  224. +1 −1 src/libtomahawk/jobview/JobStatusItem.h
  225. +0 −1 src/libtomahawk/jobview/JobStatusModel.cpp
  226. +7 −2 src/libtomahawk/jobview/JobStatusView.cpp
  227. +8 −2 src/libtomahawk/jobview/LatchedStatusItem.cpp
  228. +1 −1 src/libtomahawk/jobview/LatchedStatusItem.h
  229. +9 −2 src/libtomahawk/jobview/PipelineStatusItem.cpp
  230. +2 −1 src/libtomahawk/jobview/PipelineStatusItem.h
  231. +15 −3 src/libtomahawk/jobview/TransferStatusItem.cpp
  232. +3 −1 src/libtomahawk/jobview/TransferStatusItem.h
  233. +37 −47 src/libtomahawk/network/ControlConnection.cpp
  234. +7 −2 src/libtomahawk/network/ControlConnection.h
  235. +8 −0 src/libtomahawk/network/MsgProcessor.cpp
  236. +2 −9 src/libtomahawk/network/MsgProcessor.h
  237. +2 −2 src/libtomahawk/network/PortFwdThread.cpp
  238. +3 −3 src/libtomahawk/network/PortFwdThread.h
  239. +276 −36 src/libtomahawk/network/Servent.cpp
  240. +15 −5 src/libtomahawk/network/Servent.h
  241. +6 −4 src/libtomahawk/network/StreamConnection.cpp
  242. +4 −7 src/libtomahawk/playlist/AlbumItemDelegate.cpp
  243. +1 −1 src/libtomahawk/playlist/FlexibleHeader.cpp
  244. +12 −8 src/libtomahawk/playlist/GridItemDelegate.cpp
  245. +12 −15 src/libtomahawk/playlist/GridView.cpp
  246. +73 −18 src/libtomahawk/playlist/PlayableModel.cpp
  247. +7 −2 src/libtomahawk/playlist/PlayableModel.h
  248. +14 −4 src/libtomahawk/playlist/PlayableProxyModel.cpp
  249. +4 −2 src/libtomahawk/playlist/PlayableProxyModel.h
  250. +23 −10 src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp
  251. +6 −6 src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h
  252. +5 −7 src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp
  253. +1 −1 src/libtomahawk/playlist/PlaylistChartItemDelegate.h
  254. +9 −11 src/libtomahawk/playlist/PlaylistItemDelegate.cpp
  255. +1 −1 src/libtomahawk/playlist/PlaylistItemDelegate.h
  256. +5 −11 src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp
  257. +5 −1 src/libtomahawk/playlist/PlaylistModel.cpp
  258. +4 −0 src/libtomahawk/playlist/PlaylistModel.h
  259. +17 −0 src/libtomahawk/playlist/QueueProxyModel.cpp
  260. +1 −0 src/libtomahawk/playlist/QueueProxyModel.h
  261. +1 −0 src/libtomahawk/playlist/QueueView.cpp
  262. +1 −1 src/libtomahawk/playlist/QueueView.h
  263. +95 −0 src/libtomahawk/playlist/SingleTrackPlaylistInterface.cpp
  264. +7 −11 src/libtomahawk/playlist/SingleTrackPlaylistInterface.h
  265. +23 −9 src/libtomahawk/playlist/TrackView.cpp
  266. +11 −11 src/libtomahawk/playlist/TrackView.h
  267. +36 −1 src/libtomahawk/playlist/TreeItemDelegate.cpp
  268. +3 −1 src/libtomahawk/playlist/TreeItemDelegate.h
  269. +1 −2 src/libtomahawk/playlist/TreeProxyModel.cpp
  270. +1 −1 src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp
  271. +1 −1 src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h
  272. +13 −7 src/libtomahawk/playlist/TreeView.cpp
  273. +3 −3 src/libtomahawk/playlist/TreeView.h
  274. +6 −1 src/libtomahawk/playlist/ViewHeader.cpp
  275. +6 −4 src/libtomahawk/playlist/dynamic/DynamicControl.h
  276. +2 −2 src/libtomahawk/playlist/dynamic/database/DatabaseControl.h
  277. +83 −24 src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
  278. +3 −2 src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
  279. +1 −1 src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
  280. +1 −1 src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h
  281. +5 −5 src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp
  282. +4 −3 src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.h
  283. +40 −37 src/libtomahawk/resolvers/QtScriptResolver.cpp
  284. +6 −7 src/libtomahawk/resolvers/QtScriptResolver.h
  285. +25 −4 src/libtomahawk/resolvers/ScriptResolver.cpp
  286. +5 −5 src/libtomahawk/resolvers/ScriptResolver.h
Sorry, we could not display the entire diff because too many files (420) changed.
View
1 .gitignore
@@ -1,3 +1,4 @@
+src/accounts/tomahawk
*-build/*
build/*
.directory
View
14 AUTHORS
@@ -4,13 +4,17 @@ Tomahawk is primarily authored by:
Contributors include:
-* Leo Franchi <lfranchi@kde.org>
-* Dominik Schmidt <dev@dominik-schmidt.de>
-* Jeff Mitchell <mitchell@kde.org>
-* J Herskowitz <jherskow@gmail.com>
+* Leo Franchi <lfranchi@tomahawk-player.org>
+* Dominik Schmidt <domme@tomahawk-player.org>
+* Jeff Mitchell <jeff@tomahawk-player.org>
+* J Herskowitz <j@tomahawk-player.org>
* Alejandro Wainzinger <aikawarazuni@gmail.com>
+* Hugo Lindström <hugo@tomahawk-player.org>
+* Teo Mrnjavac <teo@kde.org>
+* Michael Zanetti <dreadhead@follefuder.org>
+* Christopher Reichert <christopher@tomahawk-player.org>
Thanks to:
* Harald Sitter <sitter@kde.org>
-* Steve Robertson
+* Syd Lawrence <syd@tomahawk-player.org>
View
196 CMakeLists.txt
@@ -11,12 +11,23 @@ SET( TOMAHAWK_ORGANIZATION_DOMAIN "tomahawk-player.org" )
SET( TOMAHAWK_APPLICATION_NAME "Tomahawk" )
SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
+IF( WIN32 )
+ SET( TOMAHAWK_SYSTEM "Windows" )
+ELSEIF( APPLE )
+ SET( TOMAHAWK_SYSTEM "OS X" )
+ELSEIF( UNIX )
+ SET( TOMAHAWK_SYSTEM "Linux")
+ELSE()
+ SET( TOMAHAWK_SYSTEM "Uknown Platform, please let the Tomahawk team know, this actually happened" )
+ENDIF()
+
SET( TOMAHAWK_VERSION_MAJOR 0 )
-SET( TOMAHAWK_VERSION_MINOR 5 )
+SET( TOMAHAWK_VERSION_MINOR 6 )
SET( TOMAHAWK_VERSION_PATCH 99 )
-
#SET( TOMAHAWK_VERSION_RC 0 )
+SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs de en el es fi fr hi_IN hu gl it ja lt pl pt_BR ru sv tr zh_CN zh_TW )
+
# enforce proper symbol exporting on all platforms
add_definitions( "-fvisibility=hidden" )
# enforce using constBegin, constEnd for const-iterators
@@ -25,6 +36,8 @@ add_definitions( "-DQT_STRICT_ITERATORS" )
# build options
option(BUILD_GUI "Build Tomahawk with GUI" ON)
option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
+option(BUILD_TESTS "Build Tomahawk with unit tests" ON)
+
option(WITH_BREAKPAD "Build with breakpad integration" ON)
option(WITH_CRASHREPORTER "Build with CrashReporter" ON)
option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON)
@@ -49,10 +62,12 @@ ENDIF()
# base string used in release and unstable builds
SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} )
+SET(TOMAHAWK_VERSION_SHORT "${TOMAHAWK_VERSION}")
IF( TOMAHAWK_VERSION_RC )
SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}rc${TOMAHAWK_VERSION_RC} )
ENDIF()
+
# additional info for non-release builds
IF( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" )
INCLUDE( CMakeDateStamp )
@@ -80,35 +95,101 @@ INCLUDE( GNUInstallDirs )
# installer creation
INCLUDE( TomahawkCPack.cmake )
-#deps
+# deps
INCLUDE( MacroOptionalFindPackage )
INCLUDE( MacroLogFeature )
-# Check if we need qtgui:
-SET(NEEDED_QT4_COMPONENTS QtCore QtXml QtNetwork )
-IF( NOT BUILD_GUI )
- ADD_DEFINITIONS( -DENABLE_HEADLESS )
- MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
-ELSE()
- MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
- LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" )
-ENDIF()
+# headless mode
+if( NOT BUILD_GUI )
+ add_definitions( -DENABLE_HEADLESS )
+ message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
+else()
+ message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
+endif()
-IF( BUILD_GUI AND UNIX AND NOT APPLE )
- FIND_PACKAGE( X11 )
-ENDIF()
-macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
-macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n qtwebkit-devel package and whatever contains QtUiTools is installed too")
+find_package(Qt5Core QUIET)
+if(Qt5Core_DIR)
+ find_package(Qt5Widgets QUIET)
+ message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development..")
+
+ macro(qt_wrap_ui)
+ qt5_wrap_ui(${ARGN})
+ endmacro()
+
+ macro(qt_add_resources)
+ qt5_add_resources(${ARGN})
+ endmacro()
+
+ find_package(Qt5LinguistTools REQUIRED)
+ macro(qt_add_translation)
+ qt5_add_translation(${ARGN})
+ endmacro()
+
+ macro(setup_qt)
+ endmacro()
+
+ set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
+ #FIXME: CrashReporter depends on deprecated QHttp
+ set(WITH_CRASHREPORTER OFF)
+ set(WITH_BREAKPAD OFF)
+else()
+ message(STATUS "Could not find Qt5, now searching for Qt4... you're better off this way!")
+
+ set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
+ if( BUILD_GUI )
+ list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg")
+ endif()
+ if( BUILD_TESTS )
+ list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
+ endif()
+
+ macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
+ macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n qtwebkit-devel package and whatever contains QtUiTools is installed too")
+
+ macro(qt5_use_modules)
+ endmacro()
+
+ macro(qt_wrap_ui)
+ qt4_wrap_ui(${ARGN})
+ endmacro()
+
+ macro(qt_add_resources)
+ qt4_add_resources(${ARGN})
+ endmacro()
+
+ macro(qt_add_translation)
+ qt4_add_translation(${ARGN})
+ endmacro()
+
+ macro(setup_qt)
+ if(NOT BUILD_GUI)
+ set(QT_DONT_USE_QTGUI TRUE)
+ endif()
+ if(UNIX AND NOT APPLE)
+ set(QT_USE_QTDBUS TRUE)
+ endif()
+ set(QT_USE_QTSQL TRUE)
+ set(QT_USE_QTNETWORK TRUE)
+ set(QT_USE_QTXML TRUE)
+ set(QT_USE_QTWEBKIT TRUE)
+
+ include( ${QT_USE_FILE} )
+ endmacro()
+endif()
+
+if(BUILD_GUI AND UNIX AND NOT APPLE)
+ find_package( X11 )
+endif()
macro_optional_find_package(Phonon 4.5.0)
macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")
if(PHONON_FOUND)
message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
endif()
-macro_optional_find_package(Echonest 2.0.0)
-macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.0.0 is needed for dynamic playlists and the infosystem")
+macro_optional_find_package(Echonest 2.0.2)
+macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.0.2 is needed for dynamic playlists and the infosystem")
macro_optional_find_package(CLucene 0.9.23)
macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection")
@@ -121,8 +202,8 @@ macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://develo
include( CheckTagLibFileName )
check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
-macro_optional_find_package(Boost)
-macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explaination
+find_package(Boost REQUIRED)
+macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explanation
macro_optional_find_package(QCA2)
macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions required for Grooveshark resolver" "http://delta.affinix.com/qca/" TRUE "" "")
@@ -135,18 +216,36 @@ macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloa
macro_optional_find_package(Jreen 1.0.5)
macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP Library" "http://qutim.org/jreen / https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n")
+if(PC_JREEN_VERSION STREQUAL "1.1.0")
+ message(FATAL_ERROR "Jreen 1.1.0 has a very annoying bug that breaks accepting auth requests in Tomahawk. Please upgrade to 1.1.1 or downgrade to 1.0.5.")
+endif()
macro_optional_find_package(QTweetLib)
macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin.\n")
macro_optional_find_package(LibLastFm 1.0.0)
macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/eartle/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
+# we need pthreads too
+macro_optional_find_package(Threads)
+macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
+
IF( WIN32 )
macro_optional_find_package(QtSparkle)
macro_log_feature(QTSPARKLE_FOUND "qtsparkle" "Library for creating auto updaters written in Qt" "https://github.com/davidsansome/qtsparkle" FALSE "" "")
ENDIF( WIN32 )
+#TODO: support external qxt
+set(QXTWEB_FOUND TRUE)
+set(QXTWEB_LIBRARIES qxtweb-standalone)
+set(QXTWEB_INCLUDE_DIRS ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/qxtweb ${CMAKE_CURRENT_BINARY_DIR})
+
+### libportfwd
+set(LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include)
+set(LIBPORTFWD_LIBRARY tomahawk_portfwd)
+set(LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY})
+add_subdirectory(${THIRDPARTY_DIR}/libportfwd)
+
#### submodules start
# automatically init submodules here, don't delete this code we may add submodules again
@@ -161,15 +260,7 @@ ENDIF( WIN32 )
#### submodules end
-### libportfwd
-SET( LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include )
-SET( LIBPORTFWD_LIBRARY tomahawk_portfwd )
-SET( LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY} )
-ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )
-# we need pthreads too
-macro_optional_find_package(Threads)
-macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
macro_optional_find_package(KDE4)
macro_optional_find_package(KDE4Installed)
@@ -216,3 +307,50 @@ ADD_SUBDIRECTORY( thirdparty )
ADD_SUBDIRECTORY( src )
ADD_SUBDIRECTORY( src/libtomahawk )
ADD_SUBDIRECTORY( admin )
+
+if( BUILD_TESTS )
+ enable_testing()
+ add_subdirectory( tests )
+endif()
+
+
+# Add all targets to the build-tree export set
+set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Tomahawk" CACHE PATH "Installation directory for CMake files")
+set(CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}")
+export(TARGETS tomahawklib tomahawk_portfwd
+ FILE "${PROJECT_BINARY_DIR}/TomahawkLibraryDepends.cmake")
+
+# Export the package for use from the build-tree
+# (this registers the build-tree with a global CMake-registry)
+export(PACKAGE Tomahawk)
+
+# Create a TomahawkBuildTreeSettings.cmake file for the use from the build tree
+configure_file(TomahawkBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/TomahawkBuildTreeSettings.cmake" @ONLY)
+
+# Create the TomahawkConfig.cmake and TomahawkConfigVersion files
+file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+
+configure_file(TomahawkConfig.cmake.in "${PROJECT_BINARY_DIR}/TomahawkConfig.cmake" @ONLY)
+configure_file(TomahawkConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/TomahawkConfigVersion.cmake" @ONLY)
+file(COPY TomahawkUse.cmake DESTINATION "${PROJECT_BINARY_DIR}")
+file(COPY TomahawkAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}")
+
+
+# Install the cmake files
+install(
+ FILES
+ "${PROJECT_BINARY_DIR}/TomahawkConfig.cmake"
+ "${PROJECT_BINARY_DIR}/TomahawkConfigVersion.cmake"
+ "${PROJECT_BINARY_DIR}/TomahawkUse.cmake"
+ "${PROJECT_BINARY_DIR}/TomahawkAddPlugin.cmake"
+ DESTINATION
+ "${CMAKE_INSTALL_CMAKEDIR}"
+)
+
+# Install the export set for use with the install-tree
+install(
+ EXPORT
+ TomahawkLibraryDepends
+ DESTINATION
+ "${CMAKE_INSTALL_CMAKEDIR}"
+)
View
5 CMakeModules/FindLibLastFm.cmake
@@ -7,11 +7,6 @@
# (c) Dominik Schmidt <dev@dominik-schmidt.de>
#
-# Dependencies
-if(NOT QT4_FOUND)
- find_package(Qt4 REQUIRED)
-endif()
-
# Include dir
find_path(LIBLASTFM_INCLUDE_DIR
# Track.h doesn't exist in liblastfm-0.3.1, was called Track back then
View
35 CMakeModules/FindQJSON.cmake
@@ -6,45 +6,24 @@
# QJSON_INCLUDE_DIR - the include path of the qjson library
#
-if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
-
- # Already in cache
- set (QJSON_FOUND TRUE)
-
-else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
-
- if (NOT WIN32)
- # use pkg-config to get the values of QJSON_INCLUDE_DIRS
- # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
- include (FindPkgConfig)
- pkg_check_modules (QJSON REQUIRED QJson>=0.5)
- endif (NOT WIN32)
-
- find_library (QJSON_LIBRARIES
+find_library (QJSON_LIBRARIES
NAMES
qjson
PATHS
${QJSON_LIBRARY_DIRS}
${LIB_INSTALL_DIR}
${KDE4_LIB_DIR}
- )
+)
- find_path (QJSON_INCLUDE_DIR
+find_path (QJSON_INCLUDE_DIR
NAMES
- parser.h
- PATH_SUFFIXES
- qjson
+ qjson/parser.h
PATHS
${QJSON_INCLUDE_DIRS}
${INCLUDE_INSTALL_DIR}
${KDE4_INCLUDE_DIR}
- )
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
+)
- if ( UNIX AND NOT APPLE )
- set ( QJSON_LIBRARIES "${QJSON_LIBRARIES} ${QJSON_LDFLAGS}" CACHE INTERNAL "")
- endif ()
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
-endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
View
3 CMakeModules/FindQTweetLib.cmake
@@ -7,9 +7,6 @@
# (c) Dominik Schmidt <dev@dominik-schmidt.de>
#
-# Dependencies
-find_package(Qt4 REQUIRED)
-
# Include dir
find_path(QTWEETLIB_INCLUDE_DIR
NAMES QTweetLib/qtweetlib_global.h
View
7 CMakeModules/FindQuaZip.cmake
@@ -1,11 +1,10 @@
-find_package(Qt4)
-find_path(QuaZip_INCLUDE_DIR quazip.h ${CMAKE_INSTALL_PREFIX}/include/quazip ${CMAKE_INSTALL_PREFIX}/include /usr/include/quazip /usr/local/include/quazip ${QT_INCLUDE_DIR}/quazip ${QT_INCLUDE_DIR} ${QUAZIP_DIR}/include/quazip ${QUAZIP_DIR}/quazip ${QUAZIP_DIR}/include)
+find_path(QuaZip_INCLUDE_DIR quazip/quazip.h ${CMAKE_INSTALL_PREFIX}/include/quazip ${CMAKE_INSTALL_PREFIX}/include /usr/include/quazip /usr/local/include/quazip ${QT_INCLUDE_DIR}/quazip ${QT_INCLUDE_DIR} ${QUAZIP_DIR}/include/quazip ${QUAZIP_DIR}/quazip ${QUAZIP_DIR}/include)
find_library(QuaZip_LIBRARY NAMES quazip PATHS ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/Library/Frameworks ${QUAZIP_DIR}/lib64 ${QUAZIP_DIR}/lib ${QUAZIP_DIR}/quazip ${QUAZIP_DIR})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(quazip DEFAULT_MSG QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
set(QuaZip_LIBRARIES ${QuaZip_LIBRARY})
mark_as_advanced(QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
-if(QuaZip_LIBRARY AND QuaZip_INCLUDE_DIR)
- set(QuaZip_FOUND TRUE)
+if(QuaZip_LIBRARY AND QuaZip_INCLUDE_DIR)
+ set(QuaZip_FOUND TRUE)
endif()
View
2 CMakeModules/NSIS.template.in
@@ -276,7 +276,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
File "${INSTALL_PATH}\bin\tomahawk_crash_reporter.exe"
File "${INSTALL_PATH}\bin\libtomahawk_breakpad.dll"
- File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
File "${INSTALL_PATH}\bin\libtomahawklib.dll"
; plugins
@@ -290,7 +289,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
File "${BUILD_PATH}\libtomahawk_breakpad.dll"
File "${BUILD_PATH}\libtomahawklib.dll"
- File "${BUILD_PATH}\libqxtweb-standalone.dll"
File "${BUILD_PATH}\libtomahawk_portfwd.dll"
; plugins
File "${BUILD_PATH}\libtomahawk_*_*.dll"
View
31 ChangeLog
@@ -1,14 +1,35 @@
Version 0.6.0:
- * Access Control queries now stay on the bottom of the job view,
- removing the tendency to jump away from the mouse.
+ * Improved icon theme with vector graphics.
+ * Higher resolution artist and album images.
+ * You can now click artists, albums and tracks mentioned in artists'
+ biographies.
+ * New AudioControl logic - only enable Prev/Skip buttons if available.
+ * Added more options to right-click/context menus.
+ * Resolver source icon in Audiocontrols now supports being a link-back URL
+ to original source.
+ * Make friends' currently playing song (in sidebar) clickable.
+ * Improve MusicBrainz plugin to use normalized artist names and avoid
+ duplicate tracks.
+ * Access Control queries now stay on the bottom of the job view, removing
+ the tendency to jump away from the mouse.
* Improved random mode, preventing songs from being played in too rapid
succession.
- * You can now choose between Various view modes for your playlists.
- * Nicer layout for the Album page.
- * Follow HTTP redirects when fetching Playlists from the Internet.
+ * You can now choose between various view modes for your playlists.
+ * Nicer layout for the Artist, Album & Track pages.
+ * Follow HTTP redirects when fetching Playlists.
* Main menu can now be hidden and instead be shown as a toolbar button.
* Connectivity controls in the toolbar.
* Cleaned up settings dialog.
+ * Ability to sync Spotify Starred Tracks with Tomahawk's Loved Tracks.
+ * Remove YouTube resolver from plug-in directory on request of YouTube.
+ * Fixed iTunes m3u playlist support.
+ * Support dropping of new Soundcloud user, track, set & likes URLs.
+ * Added HotNewHipHop as available chart.
+ * Added iTunes as available source for New Releases.
+ * Updates and additions to translations including: Japanese, Bulgarian,
+ Finnish, Russian, Arabic, Chinese, Swedish, Czech and more.
+ * (Windows) Added thumb buttons to Windows 7's taskbar.
+ * (Linux) Allow disabling of playback notifications.
Version 0.5.5:
* Changed the Spotify config dialog to indicate when the user
View
20 README.md
@@ -13,18 +13,19 @@ Compile:
Start the application on Linux:
$ ./tomahawk
+
Start the application on OS X:
$ open tomahawk.app
Detailed building instructions for Ubuntu
-----------------------------------------
-See: http://wiki.tomahawk-player.org/index.php/Building_Ubuntu_Binary_on_Precise_(12.04)
+See: http://wiki.tomahawk-player.org/index.php/Building_Binary_on_Ubuntu_Precise_(12.04)
Detailed building instructions for OS X
---------------------------------------
-See: http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle_on_Snow_Leopard_(10.6)_and_Lion_(10.7)
+See: http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle
Doxygen Documentation
---------------------
@@ -36,26 +37,31 @@ Dependencies
Required dependencies:
* CMake 2.8.6 - http://www.cmake.org/
-* Qt 4.7.0 - http://qt.nokia.com/
+* Qt 4.7.0 - http://qt-project.org/
* Phonon 4.6.0 - http://phonon.kde.org/
* QJson 0.7.1 - http://qjson.sourceforge.net/
* SQLite 3.6.22 - http://www.sqlite.org/
* TagLib 1.6.2 - http://developer.kde.org/~wheeler/taglib.html
* Boost 1.3 - http://www.boost.org/
* CLucene 0.9.23 (0.9.21 will fail) - http://clucene.sourceforge.net/download.shtml
-* libechonest 2.0.0 - http://projects.kde.org/projects/playground/libs/libechonest/
+* libechonest 2.0.2 - http://projects.kde.org/projects/playground/libs/libechonest/
* Attica 0.4.0 - ftp://ftp.kde.org/pub/kde/stable/attica/
* QuaZip 0.4.3 - http://quazip.sourceforge.net/
-* liblastfm 1.0.1 - http://github.com/lastfm/liblastfm/
+* liblastfm 1.0.1 - https://github.com/lastfm/liblastfm/
The following dependencies are optional, but recommended:
-* Jreen 1.0.5 - http://qutim.org/jreen / https://github.com/euroelessar/jreen
-* QTweetLib 0.5.0 - https://github.com/minimoog/QTweetLib
+* Jreen 1.0.5 (1.1.0 will fail, 1.1.1 is fine) - http://qutim.org/jreen/
+* QTweetLib 0.5.0 - https://github.com/minimoog/QTweetLib/
Third party libraries that we ship with our source:
* MiniUPnP 1.6 - http://miniupnp.free.fr/
* Breakpad - http://code.google.com/p/google-breakpad/
+* Qocoa - https://github.com/mikemcquaid/Qocoa/
+* libqnetwm - http://code.google.com/p/libqnetwm/
+* libqxt (QxtWeb module) - http://libqxt.org/
+* SPMediaKeyTap - https://github.com/nevyn/SPMediaKeyTap/
+* kdSingleApplicationGuard - http://www.kdab.com/
Enjoy!
View
19 CMakeModules/AddTomahawkPlugin.cmake → TomahawkAddPlugin.cmake
@@ -38,10 +38,10 @@ MACRO(CDR var junk)
ENDMACRO(CDR)
-macro(add_tomahawk_plugin)
+macro(tomahawk_add_plugin)
parse_arguments(PLUGIN
"SOURCES;UI;LINK_LIBRARIES;TYPE;EXPORT_MACRO;COMPILE_DEFINITIONS"
- "NO_INSTALL"
+ "NO_INSTALL;SHARED_LIB"
${ARGN}
)
car(PLUGIN_NAME ${PLUGIN_DEFAULT_ARGS})
@@ -59,18 +59,25 @@ macro(add_tomahawk_plugin)
# qt stuff
include_directories(${CMAKE_CURRENT_BINARY_DIR})
if(PLUGIN_UI)
- qt4_wrap_ui(PLUGIN_UI_SOURCES ${PLUGIN_UI})
+ qt_wrap_ui(PLUGIN_UI_SOURCES ${PLUGIN_UI})
list(APPEND PLUGIN_SOURCES ${PLUGIN_UI_SOURCES})
endif()
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources.qrc")
- qt4_add_resources(PLUGIN_RC_SOURCES "resources.qrc")
+ qt_add_resources(PLUGIN_RC_SOURCES "resources.qrc")
list(APPEND PLUGIN_SOURCES ${PLUGIN_RC_SOURCES})
unset(PLUGIN_RC_SOURCES)
endif()
# add target
- add_library(${target} MODULE ${PLUGIN_SOURCES})
+ if(NOT ${PLUGIN_SHARED_LIB})
+ add_library(${target} MODULE ${PLUGIN_SOURCES})
+ else()
+ add_library(${target} SHARED ${PLUGIN_SOURCES})
+ endif()
+
+ # add qt modules
+ qt5_use_modules(${target} Core Network Widgets Sql Xml DBus)
# definitions - can this be moved into set_target_properties below?
add_definitions(${QT_DEFINITIONS})
@@ -86,7 +93,7 @@ macro(add_tomahawk_plugin)
endif()
# add link targets
- target_link_libraries(${target} tomahawklib)
+ target_link_libraries(${target} ${TOMAHAWK_LIBRARIES})
if(PLUGIN_LINK_LIBRARIES)
target_link_libraries(${target} ${PLUGIN_LINK_LIBRARIES})
endif()
View
3 TomahawkBuildTreeSettings.cmake.in
@@ -0,0 +1,3 @@
+set(TOMAHAWK_INCLUDE_DIRS
+ "@PROJECT_SOURCE_DIR@/src/libtomahawk"
+ "@PROJECT_BINARY_DIR@")
View
21 TomahawkConfig.cmake.in
@@ -0,0 +1,21 @@
+# - Config file for the Tomahawk package
+# It defines the following variables
+# TOMAHAWK_INCLUDE_DIRS - include directories for Tomahawk
+# TOMAHAWK_LIBRARIES - libraries to link against
+# TOMAHAWK_EXECUTABLE - the bar executable
+
+# Compute paths
+get_filename_component(TOMAHAWK_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+if(EXISTS "${TOMAHAWK_CMAKE_DIR}/CMakeCache.txt")
+ # In build tree
+ include("${TOMAHAWK_CMAKE_DIR}/TomahawkBuildTreeSettings.cmake")
+else()
+ set(TOMAHAWK_INCLUDE_DIRS "${TOMAHAWK_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@/libtomahawk")
+endif()
+
+# Our library dependencies (contains definitions for IMPORTED targets)
+include("${TOMAHAWK_CMAKE_DIR}/TomahawkLibraryDepends.cmake")
+
+# These are IMPORTED targets created by TomahawkLibraryDepends.cmake
+set(TOMAHAWK_LIBRARIES tomahawklib)
+set(TOMAHAWK_USE_FILE "${TOMAHAWK_CMAKE_DIR}/TomahawkUse.cmake")
View
12 TomahawkConfigVersion.cmake.in
@@ -0,0 +1,12 @@
+set(PACKAGE_VERSION "@TOMAHAWK_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+endif()
+
View
34 TomahawkUse.cmake
@@ -0,0 +1,34 @@
+#FIXME: this only handles qt4 and duplicates top level cmakelists: how can we reduce code duplication?
+
+find_package(Qt4 COMPONENTS QtNetwork QtCore QtGui QtSql REQUIRED)
+include( ${QT_USE_FILE} )
+
+set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
+if(BUILD_GUI)
+ list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg")
+endif()
+
+find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS})
+include( ${QT_USE_FILE} )
+
+macro(qt5_use_modules)
+endmacro()
+
+macro(qt_wrap_ui)
+ qt4_wrap_ui(${ARGN})
+endmacro()
+
+macro(qt_add_resources)
+ qt4_add_resources(${ARGN})
+endmacro()
+
+macro(qt_add_translation)
+ qt4_add_translation(${ARGN})
+endmacro()
+
+
+if(NOT TOMAHAWK_CMAKE_DIR)
+ set(TOMAHAWK_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
+endif()
+
+include( "${TOMAHAWK_CMAKE_DIR}/TomahawkAddPlugin.cmake" )
View
2 admin/mac/Info.plist
@@ -26,6 +26,8 @@
<string>10.5.0</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
+ <key>NSHighResolutionCapable</key>
+ <true />
<key>SUFeedURL</key>
<string>http://download.tomahawk-player.org/sparkle/update.php</string>
<key>SUPublicDSAKeyFile</key>
View
2 admin/mac/macdeploy.py
@@ -217,7 +217,7 @@
]
QT_PLUGINS_SEARCH_PATH=[
- '/usr/local/Cellar/qt/4.8.2/plugins',
+ '/usr/local/Cellar/qt/4.8.4/plugins',
]
View
27 admin/win/Toolchain-mingw32-openSUSE.cmake
@@ -5,11 +5,9 @@ SET(CMAKE_SYSTEM_NAME Windows)
# specify the cross compiler
-SET(CMAKE_C_COMPILER ccache ${MINGW_PREFIX}-gcc)
-SET(CMAKE_C_FLAGS "-fno-keep-inline-dllexport")
-SET(CMAKE_CXX_COMPILER ccache ${MINGW_PREFIX}-g++)
-SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
-SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres)
+SET(CMAKE_C_COMPILER ${MINGW_PREFIX}-gcc)
+SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}-g++)
+SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}-windres)
# where is the target environment containing libraries
SET(CMAKE_FIND_ROOT_PATH /usr/${MINGW_PREFIX}/sys-root/mingw)
@@ -18,6 +16,19 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# configure qt variables
-SET(QT_LIBRARY_DIR /usr/${MINGW_PREFIX}/bin)
-SET(QT_PLUGINS_DIR ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/)
+## configure qt variables
+# generic
+SET(QMAKESPEC win32-g++-cross)
+
+# dirs
+SET(QT_LIBRARY_DIR /usr/${MINGW_PREFIX}/bin)
+SET(QT_PLUGINS_DIR ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins)
+SET(QT_MKSPECS_DIR ${CMAKE_FIND_ROOT_PATH}/share/qt4/mkspecs)
+SET(QT_QT_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/include)
+
+# qt tools
+SET(QT_QMAKE_EXECUTABLE ${MINGW_PREFIX}-qmake )
+SET(QT_MOC_EXECUTABLE ${MINGW_PREFIX}-moc)
+SET(QT_RCC_EXECUTABLE ${MINGW_PREFIX}-rcc)
+SET(QT_UIC_EXECUTABLE ${MINGW_PREFIX}-uic)
+SET(QT_LRELEASE_EXECUTABLE ${MINGW_PREFIX}-lrelease)
View
14 data/images/arrow-down-double.svg
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="42px" height="42px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
- <title>arrow-up-double</title>
+<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+ <title>arrow-down-double</title>
<description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
<defs></defs>
- <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
- <g id="Group" fill="rgb(0,0,0)">
- <path d="M2.35400391,38.0279541 L39.5150032,38.0279541 C40.6710032,38.0279541 41.7310033,37.3789541 42.2560031,36.3469541 C42.4830031,35.9079541 42.5930032,35.4279541 42.5930032,34.9499542 C42.5930032,34.3129541 42.3930032,33.6759541 42.0040032,33.1419542 L23.4220024,7.55995345 C22.8430024,6.76095343 21.9170024,6.2909534 20.9320024,6.2909534 C19.9470024,6.2909534 19.0210024,6.7629534 18.4430023,7.55995345 L-0.137997031,33.1419542 C-0.817997038,34.0769542 -0.912997007,35.3199542 -0.388997018,36.3469541 C0.135986328,37.3790283 1.19702148,38.0279541 2.35400391,38.0279541 C2.35400391,38.0279541 1.19702148,38.0279541 2.35400391,38.0279541 L2.35400391,38.0279541" id="Shape" fill="rgb(100,100,100)" transform="translate(-207.065652, -202.840546) rotate(-180) translate(207.065652, 202.840546)"></path>
+ <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
+ <g id="arrow-up-double" fill="rgb(0,0,0)" transform="translate(22.000000, 23.500000) rotate(-180.000000) translate(-22.000000, -23.500000)">
+ <g id="Page 1" fill="rgb(222,223,222)">
+ <g id="Group" fill="rgb(0,0,0)">
+ <path d="M3.48530778,39.7090464 L40.6463071,39.7090464 C41.8023053,39.7090464 42.8623067,39.0600481 43.3873082,38.0280466 C43.6143056,37.5890474 43.7243062,37.1090479 43.7243062,36.6310472 C43.7243062,35.9940462 43.5243054,35.3570452 43.1353055,34.8230448 L24.5533067,9.24104548 C23.9743062,8.44204569 23.0483056,7.9720459 22.0633069,7.9720459 C21.0783063,7.9720459 20.1523057,8.44404554 19.5743066,9.24104548 L0.993306841,34.8230448 C0.313306834,35.7580462 0.218306865,37.0010462 0.742306854,38.0280466 C1.2672902,39.0601206 2.32832536,39.7090464 3.48530778,39.7090464 C3.48530778,39.7090464 2.32832536,39.7090464 3.48530778,39.7090464 L3.48530778,39.7090464" id="Shape" fill="rgb(99,100,99)"></path>
+ </g>
+ </g>
</g>
</g>
</svg>
View
12 data/images/arrow-right-double.svg
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="42px" height="42px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<title>arrow-right-double</title>
<description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
<defs></defs>
- <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
- <g id="Group" fill="rgb(0,0,0)">
- <path d="M7.32121281,41.8181084 L34.5477114,41.8181084 C35.3946701,41.8181084 36.1712932,40.932299 36.5559413,39.5237392 C36.7222559,38.9245553 36.8028488,38.2694112 36.8028488,37.616997 C36.8028488,36.7475662 36.6563162,35.8781353 36.3713102,35.1492876 L22.7569611,0.232836341 C22.3327491,-0.857705628 21.6543029,-1.49920092 20.9326296,-1.49920092 C20.2109563,-1.49920092 19.5325101,-0.854975896 19.1090307,0.232836341 L5.4954153,35.1492876 C4.99720429,36.4254537 4.9276013,38.1220039 5.31151684,39.5237392 C5.69615284,40.9324003 6.47353431,41.8181084 7.32121281,41.8181084 C7.32121281,41.8181084 6.47353431,41.8181084 7.32121281,41.8181084 L7.32121281,41.8181084" id="Shape" fill="rgb(100,100,100)" transform="translate(-213.065652, -198.840546) rotate(-270) translate(213.065652, 198.840546)"></path>
+ <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
+ <g id="arrow-up-double" fill="rgb(0,0,0)" transform="translate(22.000000, 22.500000) rotate(-270.000000) translate(-22.000000, -22.500000)">
+ <g id="Page 1" fill="rgb(222,223,222)">
+ <g id="Group" fill="rgb(0,0,0)">
+ <path d="M3.76020197,38.3028483 L40.9212013,38.3028483 C42.0771995,38.3028483 43.1372009,37.65385 43.6622024,36.6218485 C43.8891998,36.1828494 43.9992004,35.7028498 43.9992004,35.2248492 C43.9992004,34.5878481 43.7991996,33.9508471 43.4101997,33.4168467 L24.8282009,7.83484741 C24.2492004,7.03584762 23.3231998,6.56584783 22.3382011,6.56584783 C21.3532005,6.56584783 20.4271999,7.03784748 19.8492008,7.83484741 L1.26820104,33.4168467 C0.588201029,34.3518481 0.49320106,35.5948481 1.01720105,36.6218485 C1.5421844,37.6539225 2.60321955,38.3028483 3.76020197,38.3028483 C3.76020197,38.3028483 2.60321955,38.3028483 3.76020197,38.3028483 L3.76020197,38.3028483" id="Shape" fill="rgb(99,100,99)"></path>
+ </g>
+ </g>
</g>
</g>
</svg>
View
4 data/images/artist-icon.svg
@@ -4,8 +4,6 @@
<description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
<defs></defs>
<g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
- <g fill="rgb(214,215,214)">
- <path d="M50,100 C22.3857613,100 0,77.6142426 0,50 C0,22.3857613 22.3857613,0 50,0 C77.6142426,0 100,22.3857613 100,50 C100,77.6142426 77.6142426,100 50,100 Z M82.8845366,40.0616913 C82.6247859,39.2104401 81.8853522,38.6282177 81.0378485,38.608139 L69.8079269,38.3672203 L66.5070209,38.2989613 L63.2061065,38.2246765 L60.3886715,38.1684605 L59.0690692,38.1383488 L58.3713459,36.0323051 L51.8586343,16.399342 C51.5799267,15.5641537 50.8310125,15 49.9910932,15 C49.1511697,15 48.4003593,15.5641537 48.1216517,16.399342 L41.6108363,36.0323051 L40.9112168,38.1383488 L39.5897184,38.1684605 L36.7722834,38.2246765 L33.4732693,38.2989613 L30.1742552,38.3672203 L18.9424397,38.608139 C18.09683,38.6282177 17.3555002,39.2104401 17.0957495,40.0616913 C16.8360009,40.9149483 17.1166067,41.8444958 17.7934729,42.3805435 L35.2877277,56.2816223 L28.928593,78.2916595 C28.6840112,79.1469223 28.9740976,80.0684425 29.654756,80.596463 C29.8272897,80.7289612 30.0130961,80.8273445 30.2102814,80.8935936 C30.2728489,80.917688 30.3392045,80.9156822 30.4074604,80.9337509 C30.5401799,80.9618568 30.6747955,80.9959885 30.8113072,80.9979942 C30.8169956,80.9979942 30.8226839,81 30.8264761,81 C30.9516112,81 31.0748501,80.9678741 31.1999852,80.941774 C31.266345,80.9277252 31.3345966,80.9337509 31.3990603,80.9096565 C31.5924512,80.847419 31.7763616,80.7570755 31.9470033,80.6305862 L49.9929851,67.4703407 L68.0389711,80.6305862 C68.3783501,80.8775307 68.7689242,81 69.1613944,81 C69.5728257,81 69.984257,80.8674934 70.3331166,80.596463 C71.0118747,80.0664368 71.3019632,79.140905 71.0573814,78.2916595 L64.6963506,56.2816223 L82.1943935,42.3805435 C82.8656762,41.8424145 83.1443292,40.9128418 82.8845366,40.0616913 Z M82.8845366,40.0616913" id="Oval 1" fill="rgb(69,73,82)"></path>
- </g>
+ <path d="M50,100 C22.3857613,100 0,77.6142426 0,50 C0,22.3857613 22.3857613,0 50,0 C77.6142426,0 100,22.3857613 100,50 C100,77.6142426 77.6142426,100 50,100 Z M74.9125277,41.9861298 C74.7157469,41.3412425 74.1555699,40.9001649 73.5135216,40.8849538 L65.0060053,40.7024396 L62.5053189,40.6507282 L60.0046261,40.5944519 L57.8702057,40.551864 L56.870507,40.5290521 L56.3419287,38.9335645 L51.4080563,24.0601075 C51.1969142,23.4273891 50.6295549,23 49.9932524,23 C49.3569468,23 48.788151,23.4273891 48.5770089,24.0601075 L43.644573,38.9335645 L43.1145582,40.5290521 L42.1134231,40.551864 L39.9790026,40.5944519 L37.4797495,40.6507282 L34.9804964,40.7024396 L26.4715452,40.8849538 C25.8309318,40.9001649 25.2693183,41.3412425 25.0725375,41.9861298 C24.8757582,42.6325366 25.0883384,43.3367392 25.6011158,43.742836 L38.8543392,54.2739563 L34.0368129,70.9482269 C33.8515236,71.5961533 34.0712861,72.2942746 34.5869363,72.6942902 C34.7176437,72.7946676 34.8584062,72.8692004 35.0077889,72.9193891 C35.0551886,72.9376424 35.1054579,72.9361229 35.1571669,72.9498113 C35.257712,72.9711037 35.3596936,72.996961 35.4631115,72.9984805 L35.4746031,73 C35.5694024,73 35.6627653,72.9756622 35.7575645,72.9558894 C35.8078371,72.9452464 35.8595429,72.9498113 35.908379,72.931558 C36.0548873,72.8844083 36.1942133,72.8159663 36.3234874,72.7201411 L49.9946857,62.7502581 L63.6658872,72.7201411 C63.9229925,72.9072202 64.218882,73 64.5162079,73 C64.8278983,73 65.1395887,72.8996162 65.4038762,72.6942902 C65.9180869,72.2927551 66.1378509,71.5915947 65.9525617,70.9482269 L61.1335989,54.2739563 L74.389692,43.742836 C74.8982395,43.3351625 75.1093403,42.6309408 74.9125277,41.9861298 Z M74.9125277,41.9861298" id="Oval 1" fill="rgb(69,73,82)"></path>
</g>
</svg>
View
4 data/images/green-dot.svg
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="85px" height="85px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="50px" height="50px" viewBox="0 0 50 50" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<title>green-dot</title>
<description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
<defs>
@@ -11,7 +11,7 @@
<g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
<g id="green-dot" fill="rgb(0,0,0)">
<g id="Page 1" fill="rgb(222,223,222)">
- <path d="M34,17.5 C34,8.38730145 26.6126995,1 17.5,1 C8.38730145,1 1,8.38730145 1,17.5 C1,26.6126995 8.38730145,34 17.5,34 C26.6126995,34 34,26.6126995 34,17.5 Z M34,17.5" id="Oval 1" fill="url(#radialGradient-1)"></path>
+ <path d="M24,12 C24,6.47715239 19.5228482,2 14,2 C8.47715239,2 4,6.47715239 4,12 C4,17.5228482 8.47715239,22 14,22 C19.5228482,22 24,17.5228482 24,12 Z M24,12" id="Oval 1" fill="url(#radialGradient-1)"></path>
</g>
</g>
</g>
View
8 data/images/search-icon.svg
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="50px" height="50px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="50px" height="50px" viewBox="0 0 50 50" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<title>search-icon</title>
<description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
<defs></defs>
<g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
- <path d="M43.5068816,43.0943684 L32.314124,28.1858003 L31.5054434,28.1858003 L30.6926421,28.9975714 L29.4986793,27.3482751 C32.1523878,24.6585106 33.7944732,20.9684548 33.7944732,16.8972366 C33.7944732,8.68371993 27.1117838,2 18.8972366,2 C10.6826898,2 4,8.68371944 4,16.8972366 C4,25.1128134 10.6826893,31.7955028 18.8972366,31.7955028 C21.3304896,31.7955028 23.6246704,31.1959459 25.6571882,30.1585684 L27.147839,31.8573128 L26.2505641,32.7566481 L26.2505641,33.183137 C26.2505641,33.183137 37.2712841,47.0223923 37.9553151,47.7053927 C38.6383154,48.3904534 40.1753236,48.1329117 40.1753236,48.1329117 C40.1753236,48.1329117 42.3973926,46.8503546 43.5068817,45.7408653 C44.616398,44.6303437 43.5068816,43.0943684 43.5068816,43.0943684 L43.5068816,43.0943684 L43.5068816,43.0943684 M9.26108,16.897229 C9.26108,11.586721 13.5836583,7.26208307 18.8962259,7.26208307 C24.2098241,7.26208307 28.5313718,11.5856914 28.5313718,16.897229 C28.5313718,22.2118573 24.2098236,26.5334055 18.8962259,26.5334055 C13.5836416,26.5344468 9.26108,22.2128913 9.26108,16.897229 C9.26108,16.897229 9.26108,22.2128913 9.26108,16.897229 L9.26108,16.897229" id="Shape" fill="rgb(111,111,111)"></path>
+ <g id="search-icon" fill="rgb(0,0,0)">
+ <g id="Page 1" fill="rgb(214,215,214)">
+ <path d="M44.5068817,43.094368 L33.3141251,28.1858006 L32.5054436,28.1858006 L31.6926422,28.9975719 L30.4986801,27.3482742 C33.1523895,24.6585102 34.7944717,20.9684544 34.7944717,16.8972359 C34.7944717,8.68371964 28.111784,2 19.8972359,2 C11.6826897,2 5,8.68371964 5,16.8972359 C5,25.1128139 11.6826897,31.7955036 19.8972359,31.7955036 C22.3304901,31.7955036 24.62467,31.1959457 26.6571884,30.1585693 L28.1478386,31.8573132 L27.2505646,32.756649 L27.2505646,33.183136 C27.2505646,33.183136 38.2712822,47.0223923 38.9553146,47.7053909 C39.6383171,48.3904533 41.1753235,48.1329117 41.1753235,48.1329117 C41.1753235,48.1329117 43.3973923,46.8503532 44.5068817,45.7408638 C45.6163979,44.6303444 44.5068817,43.094368 44.5068817,43.094368 L44.5068817,43.094368 M10.2610798,16.8972282 C10.2610798,11.5867214 14.5836582,7.26208305 19.896225,7.26208305 C25.2098236,7.26208305 29.5313721,11.5856915 29.5313721,16.8972282 C29.5313721,22.2118568 25.2098236,26.5334053 19.896225,26.5334053 C14.583642,26.5344467 10.2610798,22.2128906 10.2610798,16.8972282 C10.2610798,16.8972282 10.2610798,22.2128906 10.2610798,16.8972282 L10.2610798,16.8972282" id="Shape" fill="rgb(154,155,154)"></path>
+ </g>
+ </g>
</g>
</svg>
View
84 data/images/subscribe-off.svg
@@ -1,15 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="70px" height="70px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
- <title>subscribe-off</title>
- <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
- <defs></defs>
- <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
- <g id="subscribe-off" fill="rgb(0,0,0)">
- <g id="Page 1" fill="rgb(222,223,222)">
- <g id="g868" fill="rgb(0,0,0)">
- <path d="M46.8499985,19.6000036 C46.8499985,34.813804 34.5369987,47.1954035 19.4029999,47.1954035 L19.4029999,53.7418054 C38.1447983,53.7418016 53.3936005,38.4230036 53.3936005,19.6000036 L46.8499985,19.6000036 M35.2915993,19.6056036 C35.2915993,23.885404 33.6367989,27.9048036 30.6310005,30.9204038 C27.6308002,33.936004 23.6408005,35.5992044 19.3917999,35.5992044 L19.3917999,42.1428026 C31.7678013,42.1428026 41.8338013,32.0306028 41.8338013,19.6056036 L35.2916031,19.6056036 L35.2915993,19.6056036 M23.9194012,19.6350034 C21.4176006,19.6350034 19.3889999,21.6678041 19.3889999,24.1696047 C19.3889999,26.6742033 21.4176006,28.702804 23.9194012,28.702804 C26.4225998,28.702804 28.4526005,26.6742033 28.4526005,24.1696047 C28.4526005,21.6678041 26.4225998,19.6350034 23.9194012,19.6350034 M34.6126022,69.6640009 C15.5712004,69.6640009 0.137600422,54.2276033 0.137600422,35.1890062 C0.137600422,16.1462044 15.5712004,0.714004517 34.6126022,0.714004517 C53.6525993,0.714004517 69.0876007,16.1462044 69.0876007,35.1890062 C69.0876007,54.2276033 53.6525993,69.6640009 34.6126022,69.6640009" id="path870" fill="rgb(152,151,151)"></path>
- </g>
- </g>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="70px"
+ height="70px"
+ version="1.1"
+ id="svg2"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="subscribe-off.svg">
+ <metadata
+ id="metadata18">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="640"
+ inkscape:window-height="480"
+ id="namedview16"
+ showgrid="false"
+ inkscape:zoom="3.3714286"
+ inkscape:cx="35"
+ inkscape:cy="32.627119"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2" />
+ <title
+ id="title4">subscribe-off</title>
+ <description
+ id="description6">Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+ <defs
+ id="defs8" />
+ <g
+ id="Page 1"
+ transform="matrix(0,-1,1,0,-0.57640247,69.801604)"
+ style="fill:#d7d7d7;fill-rule:evenodd">
+ <g
+ id="subscribe-off"
+ style="fill:#000000">
+ <g
+ id="g12"
+ style="fill:#dedfde">
+ <g
+ id="g868"
+ style="fill:#000000">
+ <path
+ d="m 46.849998,19.600004 c 0,15.2138 -12.312999,27.595399 -27.446998,27.595399 l 0,6.546402 c 18.741798,-3e-6 33.9906,-15.318801 33.9906,-34.141801 l -6.543602,0 m -11.558399,0.0056 c 0,4.2798 -1.6548,8.2992 -4.660599,11.3148 -3.0002,3.0156 -6.9902,4.6788 -11.2392,4.6788 l 0,6.543599 c 12.376001,0 22.442001,-10.1122 22.442001,-22.537199 l -6.542198,0 -4e-6,0 m -11.372198,0.0294 c -2.5018,0 -4.530401,2.032801 -4.530401,4.534602 0,2.504598 2.028601,4.533199 4.530401,4.533199 2.503199,0 4.533199,-2.028601 4.533199,-4.533199 0,-2.501801 -2.03,-4.534602 -4.533199,-4.534602 M 34.612602,69.664001 C 15.5712,69.664001 0.13760042,54.227603 0.13760042,35.189006 0.13760042,16.146204 15.5712,0.71400452 34.612602,0.71400452 c 19.039997,0 34.474999,15.43219948 34.474999,34.47500148 0,19.038597 -15.435002,34.474995 -34.474999,34.474995"
+ id="path870"
+ inkscape:connector-curvature="0"
+ style="fill:#989797" />
</g>
+ </g>
</g>
-</svg>
+ </g>
+</svg>
View
120 data/images/subscribe-on.svg
@@ -1,20 +1,104 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="70px" height="70px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
- <title>subscribe-on</title>
- <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
- <defs>
- <radialGradient cx="52.0051003%" cy="43.0593083%" fx="52.0051003%" fy="43.0593083%" r="100%" id="radialGradient-1">
- <stop stop-color="rgb(250,211,103)" offset="0%"></stop>
- <stop stop-color="rgb(237,119,51)" offset="100%"></stop>
- </radialGradient>
- <path d="M46.8499985,19.6000036 C46.8499985,34.813804 34.5369987,47.1954035 19.4029999,47.1954035 L19.4029999,53.7418054 C38.1447983,53.7418016 53.3936005,38.4230036 53.3936005,19.6000036 L46.8499985,19.6000036 M35.2915993,19.6056036 C35.2915993,23.885404 33.6367989,27.9048036 30.6310005,30.9204038 C27.6308002,33.936004 23.6408005,35.5992044 19.3917999,35.5992044 L19.3917999,42.1428026 C31.7678013,42.1428026 41.8338013,32.0306028 41.8338013,19.6056036 L35.2916031,19.6056036 L35.2915993,19.6056036 M23.9194012,19.6350034 C21.4176006,19.6350034 19.3889999,21.6678041 19.3889999,24.1696047 C19.3889999,26.6742033 21.4176006,28.702804 23.9194012,28.702804 C26.4225998,28.702804 28.4526005,26.6742033 28.4526005,24.1696047 C28.4526005,21.6678041 26.4225998,19.6350034 23.9194012,19.6350034 M34.6126022,69.6640009 C15.5712004,69.6640009 0.137600422,54.2276033 0.137600422,35.1890062 C0.137600422,16.1462044 15.5712004,0.714004517 34.6126022,0.714004517 C53.6525993,0.714004517 69.0876007,16.1462044 69.0876007,35.1890062 C69.0876007,54.2276033 53.6525993,69.6640009 34.6126022,69.6640009" id="path-2"></path>
- </defs>
- <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
- <g id="subscribe-off" fill="rgb(0,0,0)">
- <g id="Page 1" fill="rgb(222,223,222)">
- <use id="path870" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
- <use id="path870-1" stroke="none" fill="none" xlink:href="#path-2"></use>
- </g>
- </g>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="70px"
+ height="70px"
+ version="1.1"
+ id="svg2"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="subscribe-on.svg">
+ <metadata
+ id="metadata24">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1366"
+ inkscape:window-height="750"
+ id="namedview22"
+ showgrid="false"
+ inkscape:zoom="3.3714286"
+ inkscape:cx="35"
+ inkscape:cy="32.627119"
+ inkscape:window-x="0"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <title
+ id="title4">subscribe-on</title>
+ <description
+ id="description6">Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+ <defs
+ id="defs8">
+ <radialGradient
+ cx="35.995116"
+ cy="30.403396"
+ fx="35.995116"
+ fy="30.403396"
+ r="68.949998"
+ id="radialGradient-1"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ stop-color="rgb(250,211,103)"
+ offset="0%"
+ id="stop11" />
+ <stop
+ stop-color="rgb(237,119,51)"
+ offset="100%"
+ id="stop13" />
+ </radialGradient>
+ <path
+ d="M46.8499985,19.6000036 C46.8499985,34.813804 34.5369987,47.1954035 19.4029999,47.1954035 L19.4029999,53.7418054 C38.1447983,53.7418016 53.3936005,38.4230036 53.3936005,19.6000036 L46.8499985,19.6000036 M35.2915993,19.6056036 C35.2915993,23.885404 33.6367989,27.9048036 30.6310005,30.9204038 C27.6308002,33.936004 23.6408005,35.5992044 19.3917999,35.5992044 L19.3917999,42.1428026 C31.7678013,42.1428026 41.8338013,32.0306028 41.8338013,19.6056036 L35.2916031,19.6056036 L35.2915993,19.6056036 M23.9194012,19.6350034 C21.4176006,19.6350034 19.3889999,21.6678041 19.3889999,24.1696047 C19.3889999,26.6742033 21.4176006,28.702804 23.9194012,28.702804 C26.4225998,28.702804 28.4526005,26.6742033 28.4526005,24.1696047 C28.4526005,21.6678041 26.4225998,19.6350034 23.9194012,19.6350034 M34.6126022,69.6640009 C15.5712004,69.6640009 0.137600422,54.2276033 0.137600422,35.1890062 C0.137600422,16.1462044 15.5712004,0.714004517 34.6126022,0.714004517 C53.6525993,0.714004517 69.0876007,16.1462044 69.0876007,35.1890062 C69.0876007,54.2276033 53.6525993,69.6640009 34.6126022,69.6640009"
+ id="path-2" />
+ </defs>
+ <g
+ id="Page 1"
+ style="fill:#d7d7d7;fill-rule:evenodd"
+ transform="matrix(0,-1,1,0,-0.57640215,69.801603)">
+ <g
+ id="subscribe-off"
+ style="fill:#000000">
+ <g
+ id="g18"
+ style="fill:#dedfde">
+ <use
+ id="path870"
+ xlink:href="#path-2"
+ style="fill:url(#radialGradient-1)"
+ x="0"
+ y="0"
+ width="70"
+ height="70" />
+ <use
+ id="path870-1"
+ xlink:href="#path-2"
+ style="fill:none;stroke:none"
+ x="0"
+ y="0"
+ width="70"
+ height="70" />
+ </g>
</g>
-</svg>
+ </g>
+</svg>
View
841 lang/tomahawk_ar.ts
393 additions, 448 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
896 lang/tomahawk_bg.ts
423 additions, 473 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
833 lang/tomahawk_bn_IN.ts
@@ -2,43 +2,33 @@
<context>
<name>ACLJobDelegate</name>
<message>
- <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+ <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="67"/>
<source>Allow %1 to
connect and stream from you?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+ <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="83"/>
<source>Allow Streaming</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+ <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="86"/>
<source>Deny Access</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>ACLJobItem</name>
<message>
- <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+ <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="184"/>
<source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>AccountFactoryWrapper</name>
<message>
- <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
- <source>Dialog</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
- <source>Description goes here</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
<source>Add Account</source>
<translation type="unfinished"/>
@@ -84,7 +74,7 @@ connect and stream from you?</source>
<context>
<name>AccountWidget</name>
<message>
- <location filename="../src/widgets/AccountWidget.cpp" line="125"/>
+ <location filename="../src/widgets/AccountWidget.cpp" line="126"/>
<source>Invite</source>
<translation type="unfinished"/>
</message>
@@ -116,13 +106,13 @@ connect and stream from you?</source>
</message>
<message>
<location filename="../src/libtomahawk/ActionCollection.cpp" line="71"/>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="309"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="320"/>
<source>&amp;Listen Privately</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libtomahawk/ActionCollection.cpp" line="71"/>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="309"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="320"/>
<source>&amp;Listen Publicly</source>
<translation type="unfinished"/>
</message>
@@ -202,65 +192,75 @@ connect and stream from you?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="116"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="115"/>
+ <source>Enter Full Screen</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="118"/>
<source>Hide Menu Bar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="120"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="122"/>
<source>Diagnostics...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="122"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="124"/>
<source>About &amp;Tomahawk...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="125"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="127"/>
<source>&amp;Legal Information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="128"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="129"/>
+ <source>&amp;View Logfile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="132"/>
<source>Check For Updates...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="139"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="144"/>
<source>&amp;Controls</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="153"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="158"/>
<source>&amp;Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="159"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="164"/>
<source>&amp;Help</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="184"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="191"/>
<source>&amp;Window</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/ActionCollection.cpp" line="197"/>
+ <location filename="../src/libtomahawk/ActionCollection.cpp" line="207"/>
<source>Main Menu</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>AlbumInfoWidget</name>
<message>
- <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="114"/>
+ <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="108"/>
<source>Tracklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="184"/>
+ <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="166"/>
<source>Other Albums</source>
<translation type="unfinished"/>
</message>
@@ -275,7 +275,7 @@ connect and stream from you?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="192"/>
+ <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="193"/>
<source>Other Albums by %1</source>
<translation type="unfinished"/>
</message>
@@ -297,88 +297,88 @@ connect and stream from you?</source>
<context>
<name>ArtistInfoWidget</name>
<message>
- <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="114"/>
+ <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="108"/>
<source>Top Hits</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="251"/>
+ <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="227"/>
<source>Related Artists</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="184"/>
+ <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="166"/>
<source>Albums</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="66"/>
+ <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/>
<source>Sorry, we could not find any albums for this artist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="71"/>
+ <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/>
<source>Sorry, we could not find any related artists!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="77"/>
+ <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/>
<source>Sorry, we could not find any top hits for this artist!</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>AudioControls</name>
<message>
- <location filename="../src/AudioControls.cpp" line="279"/>
+ <location filename="../src/AudioControls.cpp" line="286"/>
<source>Shuffle</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/AudioControls.cpp" line="280"/>
+ <location filename="../src/AudioControls.cpp" line="287"/>
<source>Repeat</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/AudioControls.cpp" line="277"/>
+ <location filename="../src/AudioControls.cpp" line="284"/>
<source>Time Elapsed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/AudioControls.cpp" line="278"/>
+ <location filename="../src/AudioControls.cpp" line="285"/>
<source>Time Remaining</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/AudioControls.cpp" line="283"/>
+ <location filename="../src/AudioControls.cpp" line="290"/>
<source>Playing from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/AudioControls.cpp" line="281"/>
+ <location filename="../src/AudioControls.cpp" line="288"/>
<source>Share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/AudioControls.cpp" line="282"/>
+ <location filename="../src/AudioControls.cpp" line="289"/>
<source>Love</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>AudioEngine</name>
<message>
- <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="639"/>
+ <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="645"/>
<source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="663"/>
+ <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="669"/>
<source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="689"/>
+ <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="695"/>
<source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
<translation type="unfinished"/>
</message>
@@ -720,7 +720,7 @@ connect and stream from you?</source>
<context>
<name>LatchedStatusItem</name>
<message>
- <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="34"/>
+ <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="38"/>
<source>%1 is listening along with you!</source>
<translation type="unfinished"/>
</message>
@@ -915,7 +915,7 @@ connect and stream from you?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="369"/>
+ <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="371"/>
<source>Properties</source>
<translation type="unfinished"/>
</message>
@@ -959,113 +959,148 @@ connect and stream from you?</source>
<context>
<name>PlayableModel</name>
<message>
- <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+ <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
<source>Artist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+ <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
<source>Title</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+ <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
<source>Composer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+ <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
<source>Album</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+ <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
<source>Track</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+ <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
<source>Duration</source>
<translation type="unfinished"/>