[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/extragear/graphics/digikam/1.0-databaseext
From: Marcel Wiesweg <marcel.wiesweg () gmx ! de>
Date: 2010-02-02 21:02:25
Message-ID: 1265144545.264823.3798.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1084290 by mwiesweg:
Merge with trunk (r1084255):
Merge the merge of the model/view branch.
Disabled compilation of the albummodeltest because a tail
of compile dependencies was added.
_M . (directory)
M +17 -11 CMakeLists.txt
M +4 -1 NEWS
M +21 -0 TODO
M +92 -11 digikam/album.cpp
M +33 -2 digikam/album.h
M +13 -18 digikam/albumdragdrop.cpp
M +2 -2 digikam/albumdragdrop.h
D digikam/albumfolderview.cpp
D digikam/albumfolderview.h
M +29 -6 digikam/albummanager.cpp
M +10 -0 digikam/albummanager.h
A digikam/albummodificationhelper.cpp \
trunk/extragear/graphics/digikam/digikam/albummodificationhelper.cpp#1084255 \
[License: GPL (v2+)] A digikam/albummodificationhelper.h \
trunk/extragear/graphics/digikam/digikam/albummodificationhelper.h#1084255 [License: \
GPL (v2+)] M +6 -14 digikam/albumselectdialog.cpp
A digikam/albumselectiontreeview.cpp \
trunk/extragear/graphics/digikam/digikam/albumselectiontreeview.cpp#1084255 [License: \
GPL (v2+)] A digikam/albumselectiontreeview.h \
trunk/extragear/graphics/digikam/digikam/albumselectiontreeview.h#1084255 [License: \
GPL (v2+)] M +125 -303 digikam/albumselectwidget.cpp
M +48 -14 digikam/albumselectwidget.h
M +5 -1 digikam/albumthumbnailloader.cpp
M +1 -1 digikam/albumthumbnailloader.h
M +803 -37 digikam/albumtreeview.cpp
M +267 -12 digikam/albumtreeview.h
M +38 -3 digikam/contextmenuhelper.cpp
M +15 -0 digikam/contextmenuhelper.h
M +49 -336 digikam/datefolderview.cpp
M +14 -27 digikam/datefolderview.h
A digikam/digikam.notifyrc \
trunk/extragear/graphics/digikam/digikam/digikam.notifyrc#1084255 M +50 -33 \
digikam/digikamapp.cpp M +4 -3 digikam/digikamapp.h
M +9 -6 digikam/digikamapp_p.h
M +4 -73 digikam/digikamimageview.cpp
M +1 -5 digikam/digikamimageview.h
A digikam/digikammodelcollection.cpp \
trunk/extragear/graphics/digikam/digikam/digikammodelcollection.cpp#1084255 [License: \
GPL (v2+)] A digikam/digikammodelcollection.h \
trunk/extragear/graphics/digikam/digikam/digikammodelcollection.h#1084255 [License: \
GPL (v2+)] M +221 -506 digikam/digikamview.cpp
M +21 -11 digikam/digikamview.h
A digikam/editablesearchtreeview.cpp \
trunk/extragear/graphics/digikam/digikam/editablesearchtreeview.cpp#1084255 [License: \
GPL (v2+)] A digikam/editablesearchtreeview.h \
trunk/extragear/graphics/digikam/digikam/editablesearchtreeview.h#1084255 [License: \
GPL (v2+)] D digikam/folderitem.cpp
D digikam/folderitem.h
D digikam/folderview.cpp
D digikam/folderview.h
M +16 -29 digikam/folderviewtooltip.cpp
M +2 -2 digikam/folderviewtooltip.h
M +22 -681 digikam/imagecategorizedview.cpp
M +7 -66 digikam/imagecategorizedview.h
M +6 -8 digikam/imagecategorydrawer.cpp
M +74 -491 digikam/imagedelegate.cpp
M +10 -48 digikam/imagedelegate.h
D digikam/imagedelegateoverlay.cpp
D digikam/imagedelegateoverlay.h
M +3 -1 digikam/imagedragdrop.cpp
M +2 -1 digikam/imagedragdrop.h
M +12 -9 digikam/imagepreviewview.cpp
M +0 -15 digikam/imageviewutilities.cpp
M +0 -5 digikam/imageviewutilities.h
D digikam/kcategorizedview.cpp
D digikam/kcategorizedview.h
D digikam/kcategorizedview_p.h
A digikam/leftsidebarwidgets.cpp \
trunk/extragear/graphics/digikam/digikam/leftsidebarwidgets.cpp#1084255 [License: GPL \
(v2+)] A digikam/leftsidebarwidgets.h \
trunk/extragear/graphics/digikam/digikam/leftsidebarwidgets.h#1084255 [License: GPL \
(v2+)] M +12 -0 digikam/metadatamanager.cpp
M +1 -0 digikam/metadatamanager.h
A digikam/searchmodificationhelper.cpp \
trunk/extragear/graphics/digikam/digikam/searchmodificationhelper.cpp#1084255 \
[License: GPL (v2+)] A digikam/searchmodificationhelper.h \
trunk/extragear/graphics/digikam/digikam/searchmodificationhelper.h#1084255 [License: \
GPL (v2+)] A digikam/sidebarwidget.cpp \
trunk/extragear/graphics/digikam/digikam/sidebarwidget.cpp#1084255 [License: GPL \
(v2+)] A digikam/sidebarwidget.h \
trunk/extragear/graphics/digikam/digikam/sidebarwidget.h#1084255 [License: GPL (v2+)] \
A digikam/tagcheckview.cpp \
trunk/extragear/graphics/digikam/digikam/tagcheckview.cpp#1084255 [License: GPL \
(v2+)] A digikam/tagcheckview.h \
trunk/extragear/graphics/digikam/digikam/tagcheckview.h#1084255 [License: GPL (v2+)] \
A digikam/tagdragdrop.cpp \
trunk/extragear/graphics/digikam/digikam/tagdragdrop.cpp#1084255 [License: GPL (v2+)] \
A digikam/tagdragdrop.h \
trunk/extragear/graphics/digikam/digikam/tagdragdrop.h#1084255 [License: GPL (v2+)] \
A digikam/tagfiltersidebarwidget.cpp \
trunk/extragear/graphics/digikam/digikam/tagfiltersidebarwidget.cpp#1084255 [License: \
GPL (v2+)] A digikam/tagfiltersidebarwidget.h \
trunk/extragear/graphics/digikam/digikam/tagfiltersidebarwidget.h#1084255 [License: \
GPL (v2+)] D digikam/tagfilterview.cpp
D digikam/tagfilterview.h
M +56 -915 digikam/tagfolderview.cpp
M +54 -60 digikam/tagfolderview.h
A digikam/tagmodificationhelper.cpp \
trunk/extragear/graphics/digikam/digikam/tagmodificationhelper.cpp#1084255 [License: \
GPL (v2+)] A digikam/tagmodificationhelper.h \
trunk/extragear/graphics/digikam/digikam/tagmodificationhelper.h#1084255 [License: \
GPL (v2+)] M +2 -0 \
imageplugins/localcontrast/digikamimageplugin_localcontrast.desktop M +6 -0 \
libs/database/albuminfo.h M +6 -0 libs/database/imageinfo.cpp
M +2 -0 libs/database/imageinfo.h
M +17 -1 libs/dimg/loaders/pngloader.cpp
M +120 -973 libs/imageproperties/imagedescedittab.cpp
M +8 -29 libs/imageproperties/imagedescedittab.h
M +2 -1 libs/imageproperties/imagepropertiessidebardb.cpp
D libs/imageproperties/talbumlistview.cpp
D libs/imageproperties/talbumlistview.h
M +127 -6 libs/models/abstractalbummodel.cpp
M +47 -5 libs/models/abstractalbummodel.h
M +248 -14 libs/models/albumfiltermodel.cpp
M +105 -12 libs/models/albumfiltermodel.h
M +145 -45 libs/models/albummodel.cpp
M +47 -17 libs/models/albummodel.h
M +16 -2 libs/models/albummodeldragdrophandler.cpp
M +9 -2 libs/models/albummodeldragdrophandler.h
M +1 -2 libs/models/imagemodel.cpp
M +3 -5 libs/models/imagemodeldragdrophandler.cpp
M +4 -6 libs/models/imagemodeldragdrophandler.h
M +23 -4 libs/threadimageio/thumbnailbasic.cpp
M +2 -14 libs/widgets/common/curveswidget.cpp
A libs/widgets/common/dcategorizedview.cpp \
trunk/extragear/graphics/digikam/libs/widgets/common/dcategorizedview.cpp#1084255 \
[License: GPL (v2+)] A libs/widgets/common/dcategorizedview.h \
trunk/extragear/graphics/digikam/libs/widgets/common/dcategorizedview.h#1084255 \
[License: GPL (v2+)] A libs/widgets/common/ditemdelegate.cpp \
trunk/extragear/graphics/digikam/libs/widgets/common/ditemdelegate.cpp#1084255 \
[License: GPL (v2+)] A libs/widgets/common/ditemdelegate.h \
trunk/extragear/graphics/digikam/libs/widgets/common/ditemdelegate.h#1084255 \
[License: GPL (v2+)] M +2 -2 libs/widgets/common/ditemtooltip.cpp
M +1 -1 libs/widgets/common/ditemtooltip.h
M +73 -6 libs/widgets/common/dzoombar.cpp
M +14 -1 libs/widgets/common/dzoombar.h
M +3 -21 libs/widgets/common/histogramwidget.cpp
A libs/widgets/common/imagedelegateoverlay.cpp \
trunk/extragear/graphics/digikam/libs/widgets/common/imagedelegateoverlay.cpp#1084255 \
[License: GPL (v2+)] A libs/widgets/common/imagedelegateoverlay.h \
trunk/extragear/graphics/digikam/libs/widgets/common/imagedelegateoverlay.h#1084255 \
[License: GPL (v2+)] A libs/widgets/common/itemviewimagedelegate.cpp \
trunk/extragear/graphics/digikam/libs/widgets/common/itemviewimagedelegate.cpp#1084255 \
[License: GPL (v2+)] A libs/widgets/common/itemviewimagedelegate.h \
trunk/extragear/graphics/digikam/libs/widgets/common/itemviewimagedelegate.h#1084255 \
[License: GPL (v2+)] A libs/widgets/common/itemviewimagedelegatepriv.h \
trunk/extragear/graphics/digikam/libs/widgets/common/itemviewimagedelegatepriv.h#1084255 \
[License: GPL (v2+)] M +3 -3 libs/widgets/common/itemviewtooltip.cpp
A libs/widgets/common/kcategorizedview.cpp \
trunk/extragear/graphics/digikam/libs/widgets/common/kcategorizedview.cpp#1084255 \
[License: LGPL (v2+)] A libs/widgets/common/kcategorizedview.h \
trunk/extragear/graphics/digikam/libs/widgets/common/kcategorizedview.h#1084255 \
[License: LGPL (v2+)] A libs/widgets/common/kcategorizedview_p.h \
trunk/extragear/graphics/digikam/libs/widgets/common/kcategorizedview_p.h#1084255 \
[License: LGPL (v2+)] M +10 -1 libs/widgets/common/previewwidget.cpp
M +2 -0 libs/widgets/common/previewwidget.h
M +310 -29 libs/widgets/common/searchtextbar.cpp
M +107 -3 libs/widgets/common/searchtextbar.h
M +30 -25 libs/widgets/common/sidebar.cpp
M +8 -5 libs/widgets/common/sidebar.h
A libs/widgets/common/statesavingobject.cpp \
trunk/extragear/graphics/digikam/libs/widgets/common/statesavingobject.cpp#1084255 \
[License: GPL (v2+)] A libs/widgets/common/statesavingobject.h \
trunk/extragear/graphics/digikam/libs/widgets/common/statesavingobject.h#1084255 \
[License: GPL (v2+)] M +1 -1 showfoto/showfoto.cpp
M +104 -0 tests/CMakeLists.txt
A tests/albummodeltest.cpp \
trunk/extragear/graphics/digikam/tests/albummodeltest.cpp#1084255 [License: GPL \
(v2+)] A tests/albummodeltest.h \
trunk/extragear/graphics/digikam/tests/albummodeltest.h#1084255 [License: GPL (v2+)] \
A tests/albummodeltestimages (directory) \
trunk/extragear/graphics/digikam/tests/albummodeltestimages#1084255 A \
tests/albummodeltestimages/19970115T201133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19970115T201133.jpg#1084255
A tests/albummodeltestimages/19970214T201133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19970214T201133.jpg#1084255
A tests/albummodeltestimages/19970316T201133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19970316T201133.jpg#1084255
A tests/albummodeltestimages/19970415T211133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19970415T211133.jpg#1084255
A tests/albummodeltestimages/19970515T211133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19970515T211133.jpg#1084255
A tests/albummodeltestimages/19970614T211133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19970614T211133.jpg#1084255
A tests/albummodeltestimages/19970714T211133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19970714T211133.jpg#1084255
A tests/albummodeltestimages/19970813T211133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19970813T211133.jpg#1084255
A tests/albummodeltestimages/19970912T211133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19970912T211133.jpg#1084255
A tests/albummodeltestimages/19971012T211133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19971012T211133.jpg#1084255
A tests/albummodeltestimages/19971111T201133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19971111T201133.jpg#1084255
A tests/albummodeltestimages/19971211T201133.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/19971211T201133.jpg#1084255
A tests/albummodeltestimages/20070319T200533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20070319T200533.jpg#1084255
A tests/albummodeltestimages/20070321T200533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20070321T200533.jpg#1084255
A tests/albummodeltestimages/20070322T200533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20070322T200533.jpg#1084255
A tests/albummodeltestimages/20070419T210533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20070419T210533.jpg#1084255
A tests/albummodeltestimages/20070421T210533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20070421T210533.jpg#1084255
A tests/albummodeltestimages/20070422T210533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20070422T210533.jpg#1084255
A tests/albummodeltestimages/20070422T220533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20070422T220533.jpg#1084255
A tests/albummodeltestimages/20090320T200533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20090320T200533.jpg#1084255
A tests/albummodeltestimages/20090321T200533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20090321T200533.jpg#1084255
A tests/albummodeltestimages/20090418T210533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20090418T210533.jpg#1084255
A tests/albummodeltestimages/20090421T220533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20090421T220533.jpg#1084255
A tests/albummodeltestimages/20090521T220533.jpg \
trunk/extragear/graphics/digikam/tests/albummodeltestimages/20090521T220533.jpg#1084255
A tests/modeltest (directory) \
trunk/extragear/graphics/digikam/tests/modeltest#1084255 A \
tests/modeltest/LICENSE.GPL \
trunk/extragear/graphics/digikam/tests/modeltest/LICENSE.GPL#1084255 A \
tests/modeltest/modeltest.cpp \
trunk/extragear/graphics/digikam/tests/modeltest/modeltest.cpp#1084255 [License: GPL \
(v2)] A tests/modeltest/modeltest.h \
trunk/extragear/graphics/digikam/tests/modeltest/modeltest.h#1084255 [License: GPL \
(v2)] A tests/searchtextbartest.cpp \
trunk/extragear/graphics/digikam/tests/searchtextbartest.cpp#1084255 [License: GPL \
(v2+)] A tests/searchtextbartest.h \
trunk/extragear/graphics/digikam/tests/searchtextbartest.h#1084255 [License: GPL \
(v2+)] A tests/statesavingobjecttest.cpp \
trunk/extragear/graphics/digikam/tests/statesavingobjecttest.cpp#1084255 [License: \
GPL (v2+)] A tests/statesavingobjecttest.h \
trunk/extragear/graphics/digikam/tests/statesavingobjecttest.h#1084255 [License: GPL \
(v2+)] M +20 -27 utilities/cameragui/cameraui.cpp
M +2 -2 utilities/cameragui/cameraui.h
M +4 -4 utilities/cameragui/cameraui_p.h
M +145 -214 utilities/fuzzysearch/fuzzysearchview.cpp
M +23 -18 utilities/fuzzysearch/fuzzysearchview.h
M +55 -73 utilities/gpssearch/gpssearchview.cpp
M +19 -12 utilities/gpssearch/gpssearchview.h
M +9 -4 utilities/imageeditor/editor/editorwindow.cpp
M +2 -1 utilities/imageeditor/editor/imagewindow.cpp
M +142 -398 utilities/kipiiface/kipiimagecollectionselector.cpp
M +0 -13 utilities/kipiiface/kipiimagecollectionselector.h
M +9 -6 utilities/kipiiface/kipiuploadwidget.cpp
M +12 -7 utilities/lighttable/lighttablewindow.cpp
M +1 -0 utilities/lighttable/lighttablewindow_p.h
M +2 -0 utilities/nepomuk/digikamnepomukservice.desktop
M +1 -4 utilities/queuemanager/queuesettingsview.cpp
M +34 -302 utilities/searchwindow/searchfolderview.cpp
M +39 -47 utilities/searchwindow/searchfolderview.h
M +38 -21 utilities/searchwindow/searchtabheader.cpp
M +2 -1 utilities/searchwindow/searchtabheader.h
M +2 -5 utilities/timeline/timelinewidget.h
http://websvn.kde.org/?view=rev&revision=1084290
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic