Merge lp://qastaging/~stolowski/unity-scope-mediascanner/first-use into lp://qastaging/unity-scope-mediascanner

Proposed by Paweł Stołowski
Status: Superseded
Proposed branch: lp://qastaging/~stolowski/unity-scope-mediascanner/first-use
Merge into: lp://qastaging/unity-scope-mediascanner
Diff against target: 2193 lines (+676/-869)
37 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
src/musicaggregator/CMakeLists.txt (+2/-6)
src/musicaggregator/musicaggregator-settings.ini.in (+0/-24)
src/musicaggregator/musicaggregator.ini.in (+2/-1)
src/musicaggregator/musicaggregatorquery.cpp (+141/-111)
src/musicaggregator/musicaggregatorquery.h (+2/-12)
src/musicaggregator/musicaggregatorscope.cpp (+18/-46)
src/musicaggregator/musicaggregatorscope.h (+1/-9)
src/musicaggregator/onlinemusicresultforwarder.cpp (+0/-37)
src/musicaggregator/onlinemusicresultforwarder.h (+0/-40)
src/mymusic/CMakeLists.txt (+3/-1)
src/mymusic/getstarted.svg (+156/-0)
src/mymusic/mediascanner-music.ini.in (+1/-0)
src/mymusic/music-scope.cpp (+44/-3)
src/mymusic/music-scope.h (+4/-1)
src/myvideos/mediascanner-video.ini.in (+1/-0)
src/myvideos/video-scope.cpp (+11/-14)
src/utils/CMakeLists.txt (+1/-2)
src/utils/bufferedresultforwarder.cpp (+7/-25)
src/utils/bufferedresultforwarder.h (+5/-11)
src/utils/notify-strategy.cpp (+0/-40)
src/utils/notify-strategy.h (+0/-49)
src/utils/resultforwarder.cpp (+0/-87)
src/utils/resultforwarder.h (+0/-68)
src/utils/utils.cpp (+59/-0)
src/utils/utils.h (+35/-0)
src/videoaggregator/CMakeLists.txt (+1/-4)
src/videoaggregator/videoaggregator-settings.ini.in (+0/-9)
src/videoaggregator/videoaggregator.ini.in (+2/-1)
src/videoaggregator/videoaggregatorquery.cpp (+72/-60)
src/videoaggregator/videoaggregatorquery.h (+3/-5)
src/videoaggregator/videoaggregatorscope.cpp (+13/-23)
src/videoaggregator/videoaggregatorscope.h (+3/-3)
tests/CMakeLists.txt (+1/-8)
tests/test-music-aggregator.cpp (+86/-26)
tests/test-result-forwarder.cpp (+0/-141)
To merge this branch: bzr merge lp://qastaging/~stolowski/unity-scope-mediascanner/first-use
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+256309@code.qastaging.launchpad.net

Commit message

Display special 'Get started...' card when no music is present in mediascanner db.

Description of the change

Display special 'Get started...' card when no music is present in mediascanner db.

To post a comment you must log in.
265. By Paweł Stołowski

Tweaks to category template.

266. By Paweł Stołowski

Moved is_database_empty to utils.

267. By Paweł Stołowski

Display Get started card for videos

268. By Paweł Stołowski

Fix typo

269. By Paweł Stołowski

Updated getstarted assets.

270. By Paweł Stołowski

Don't display get started card if aggregated (for now).

271. By Paweł Stołowski

Updated art attribute.

272. By Paweł Stołowski

[ CI Train Bot ]
* New rebuild forced.
[ Pawel Stolowski ]
* Support for keywords. Use BufferedResultForwarder from scopes API
  instead of a custom implementation.

273. By Paweł Stołowski

Moved is_database_empty into scopes

274. By Paweł Stołowski

Fix

275. By Paweł Stołowski

Set noartsummaryshape.

276. By Paweł Stołowski

Display camera app card in videos.

277. By Paweł Stołowski

Fix.

278. By Paweł Stołowski

Fix

279. By Paweł Stołowski

Cleanup.

280. By Paweł Stołowski

Moved camera icon.

281. By Paweł Stołowski

Fix img path.

282. By Paweł Stołowski

Removed comment.

283. By Paweł Stołowski

Set conciergeMode flag

284. By Paweł Stołowski

Only display camera icon if surfacing.

285. By Paweł Stołowski

No need to pass scope_directory around. Use mediascanner'a query instead of queryAlbums.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: