Diffusion digiKam d0075d87b560

Merge branch 'master' into gsoc18-iconview-sort
d0075d87b560
Actions

Authored by mqualmann on Jun 3 2018, 7:11 PM.

Description

Merge branch 'master' into gsoc18-iconview-sort

Details

Committed

mqualmann

Jun 3 2018, 7:11 PM

Parents

R482:6d5c89784813: ignore mouse button release event for hide tool-tip CCBUGS: 377849
R482:9468cf587726: fixed the conflict code; add a row in database table Images to store the manual…

Branches

Unknown

Tags

Unknown

mqualmann committed R482:d0075d87b560: Merge branch 'master' into gsoc18-iconview-sort (authored by mqualmann).Jun 3 2018, 7:11 PM

Merged Changes

Commit	Author	Details	Committed
6d5c89784813	mqualmann	ignore mouse button release event for hide tool-tip CCBUGS: 377849	Jun 3 2018
bcf335a36d3e	mqualmann	remove setFocus()	Jun 2 2018
81177da3c2a3	mqualmann	fix crash if call the full screen view (slideshow)	Jun 2 2018
a97b4f780de9	mqualmann	update collection locations if album root path not exists BUGS: 377849 FIXED-IN…	Jun 2 2018
da1697471150	mqualmann	fix wrong tool-tip colors under Windows BUGS: 390541 BUGS: 391521 FIXED-IN: 6.0.	Jun 2 2018
09b2b0cc0cfc	mqualmann	polish	Jun 2 2018
7e76a3cd8728	mqualmann	check if album root path exist before scanning CCBUG: 377849	Jun 1 2018
460aa72dd64f	mqualmann	polish	Jun 1 2018
16ea14963bfb	mqualmann	remove includes	Jun 1 2018
326a2d27bf75	mqualmann	convert date from video to local time	Jun 1 2018
65f57a64dc31	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 1 2018
8b7466359b77	mqualmann	leave the ThumbnailLoadingTask if the thread has stopped BUGS: 394865 FIXED-IN…	May 30 2018
3724ec9ec609	mqualmann	polish	May 30 2018
328d4d5d8db3	mqualmann	polish	May 29 2018
28babc825f6d	mqualmann	factoring DIO rename	May 29 2018
7f9a61c9655d	mqualmann	use existing code and disabled notification if needed	May 29 2018
35e125ac8445	mqualmann	fix rename by overwrite BUGS: 393205 BUGS: 382474 FIXED-IN: 6.0.0	May 29 2018
2756903ce1ab	mqualmann	add code for rename by overwrite but not yet complete	May 28 2018
24ec6a3bdcf7	mqualmann	speed up renaming the image and rename the thumbnail path CCBUGS: 393205 CCBUGS…	May 28 2018
3f2d8445617d	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 28 2018
3d900e39aa61	cgilles	polish	May 27 2018
6bac67fada9e	mqualmann	polish	May 26 2018
59983050e501	mqualmann	polish	May 26 2018
2ad180419a6e	mqualmann	polish and const	May 26 2018
d2d06af43187	mqualmann	polish	May 26 2018
f34bab65cc2b	mqualmann	polish and const	May 26 2018
ed9a449e9163	mqualmann	polish	May 26 2018
ab45f8361751	cgilles	update	May 26 2018

Changes (36)

				Path	Packages
	M			NEWS
	M			core/app/items/digikamimageview.cpp
	M			core/app/views/tableview/tableview.cpp
	M			core/data/htmlgallery/themes/bluecurved/bluecurved.desktop
	M			core/data/htmlgallery/themes/blueframes/blueframes.desktop
	M			core/data/htmlgallery/themes/simpleslides/simpleslides.desktop
	M			core/data/htmlgallery/themes/vanilla/vanilla.desktop
	M			core/libs/album/albummanager.cpp
	M			core/libs/database/collection/collectionmanager.cpp
	M			core/libs/database/coredb/coredb.cpp
	M			core/libs/database/coredb/coredb.h
	M			core/libs/database/dbjobs/dbjob.h
	M			core/libs/database/item/imageinfo.cpp
	M			core/libs/database/item/imageinfo.h
	M			core/libs/database/item/imageinfocache.cpp
	M			core/libs/database/item/imageinfocache.h
	M			core/libs/database/models/imagelistmodel.cpp
	M			core/libs/database/models/imagemodel.cpp
	M			core/libs/database/thumbsdb/thumbsdb.cpp
	M			core/libs/database/thumbsdb/thumbsdb.h
	M			core/libs/database/utils/dio.cpp
	M			core/libs/dmetadata/dmetadata_ffmpeg.cpp
	M			core/libs/models/imagealbummodel.cpp
	M			core/libs/models/imagealbummodel.h
	M			core/libs/threadimageio/loadingcache.cpp
	M			core/libs/threadimageio/loadingcache.h
	M			core/libs/threadimageio/loadingcacheinterface.cpp
	M			core/libs/threadimageio/loadingcacheinterface.h
	M			core/libs/threadimageio/thumbnailtask.cpp
	M			core/libs/widgets/itemview/ditemtooltip.cpp
	M			core/libs/widgets/itemview/itemviewtooltip.cpp
	M			core/libs/widgets/itemview/itemviewtooltip.h
	M			core/libs/widgets/mainview/dcursortracker.cpp
	M			core/libs/widgets/metadata/metadatalistviewitem.cpp
	M			core/utilities/queuemanager/views/queuelist.cpp
	M			project/reports/krazy.sh