lp://qastaging/~franxesk/gallery-app/duplicates-feature

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://qastaging/gallery-app

Günter Schwann (community): Needs Fixing on 2013-11-12

Diff: 682 lines (+291/-31)

15 files modified

rc/qml/Components/DuplicatesDialog.qml (+107/-0)
rc/qml/GalleryApplication.qml (+11/-1)
rc/sql/9.sql (+3/-0)
src/database/database.cpp (+5/-0)
src/database/media-table.cpp (+74/-6)
src/database/media-table.h (+8/-3)
src/gallery-manager.cpp (+27/-3)
src/gallery-manager.h (+6/-1)
src/media-object-factory.cpp (+25/-6)
src/media-object-factory.h (+3/-1)
src/media/media-monitor.cpp (+4/-4)
src/media/media-monitor.h (+2/-2)
tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp (+2/-1)
tests/unittests/stubs/gallery-manager_stub.cpp (+7/-1)
tests/unittests/stubs/media-table_stub.cpp (+7/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

891. By Francisco Merino on 2013-11-12

- Removed old comments.
- Reallocated warning info about the duplicates' absolute filepaths.
- Set max values to the image's dimensions to be shown.

890. By Francisco Merino on 2013-11-11

Updated the 'DuplicatesDialog' dialog in order to set fixed a fixed width
for the labels showing the absolute filepaths.

Removed the 'DuplicatesPathsDialog' because it's not needed anymore.

889. By Francisco Merino on 2013-11-08

Added the removeFile method to the stub.

To-Do:
- Set fixed dimensions to the dialog element in DuplicatesDialog.
- Create a method to search for duplicates on the db in order to
  detect duplicates already stored in the db.

888. By Francisco Merino on 2013-11-08

Updated the DuplicatesDialog in order to show the key info just in one
dialog and ask the user about removing or keeping the duplicate media.

887. By Francisco Merino on 2013-11-07

Merging latest changes from trunk.

886. By Francisco Merino on 2013-11-07

I've finally been able to show the filenames using a ListModel.
I'm still unable to give a proper dimmensions to the dialog.

885. By Francisco Merino on 2013-11-06

At the moment, the duplicates' detection mechanism is able to
detect one at a time, because the system doesn't allow the user
to include the duplicate into the database.

Included a new dialog to notify the user about the paths
of the duplicate and original pictures.

884. By Francisco Merino on 2013-11-05

Trying to show the duplicate image inside the DuplicatesDialog.

883. By Francisco Merino on 2013-11-04

Updated the communication between GalleryApplication and DuplicatesDialog
in order to share information between each other.

882. By Francisco Merino on 2013-11-04

Merging latest changes from trunk.