From kde-commits Mon Nov 30 22:38:08 2009 From: Johannes Wienke Date: Mon, 30 Nov 2009 22:38:08 +0000 To: kde-commits Subject: branches/extragear/graphics/digikam/modelviewport/digikam Message-Id: <1259620688.000127.465.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=125962069525466 SVN commit 1056817 by jwienke: merged with trunk _M . (directory) M +11 -7 CMakeLists.txt M +3126 -0 ChangeLog M +23 -1 NEWS M +37 -1 digikam/digikam.notifyrc M +1 -0 digikam/digikamimageview.cpp M +4 -0 digikam/folderview.cpp M +1 -0 digikam/imagedelegate.cpp M +1 -1 imageplugins/contentawareresizing/digikamimageplugin_contentawareresizing.desktop M +1 -1 imageplugins/inserttext/digikamimageplugin_inserttext.desktop M +1 -1 imageplugins/whitebalance/digikamimageplugin_whitebalance.desktop M +3 -3 libs/dimg/filters/noisereductionsettings.h M +7 -13 libs/dimg/filters/waveletsnr.cpp M +5 -5 libs/dimg/filters/waveletsnr.h M +3 -7 libs/imageproperties/imagepropertiescolorstab.cpp M +10 -9 libs/widgets/common/curveswidget.cpp M +1 -0 libs/widgets/common/dlogoaction.cpp M +0 -74 libs/widgets/common/histogrambox.cpp M +0 -6 libs/widgets/common/histogrambox.h M +122 -141 libs/widgets/common/histogrampainter.cpp M +0 -8 libs/widgets/common/histogrampainter.h M +0 -2 libs/widgets/common/histogramwidget.cpp M +0 -1 libs/widgets/common/histogramwidget.h M +4 -2 tests/CMakeLists.txt M +121 -108 tests/advancedrenametest.cpp M +2 -0 tests/advancedrenametest.h M +42 -8 tips A utilities/advancedrename/TODO trunk/extragear/graphics/digikam/utilities/advancedrename/TODO#1056812 M +12 -9 utilities/advancedrename/advancedrenamedialog.cpp M +2 -0 utilities/advancedrename/advancedrenamedialog.h M +18 -10 utilities/advancedrename/advancedrenameinput.cpp M +1 -1 utilities/advancedrename/advancedrenameinput.h M +24 -92 utilities/advancedrename/advancedrenamewidget.cpp M +9 -10 utilities/advancedrename/advancedrenamewidget.h M +9 -9 utilities/advancedrename/common/dynamiclayout.cpp M +6 -10 utilities/advancedrename/common/highlighter.cpp M +1 -1 utilities/advancedrename/common/highlighter.h M +8 -3 utilities/advancedrename/common/modifier.cpp M +4 -4 utilities/advancedrename/common/modifier.h M +6 -155 utilities/advancedrename/common/option.cpp M +2 -20 utilities/advancedrename/common/option.h D utilities/advancedrename/common/parseinformation.h M +13 -4 utilities/advancedrename/common/parseobject.cpp M +27 -27 utilities/advancedrename/common/parseobject.h M +174 -72 utilities/advancedrename/common/parser.cpp M +20 -18 utilities/advancedrename/common/parser.h M +8 -15 utilities/advancedrename/common/parseresults.cpp M +6 -4 utilities/advancedrename/common/parseresults.h A utilities/advancedrename/common/parsesettings.h trunk/extragear/graphics/digikam/utilities/advancedrename/common/parsesettings.h#1056812 [License: GPL (v2+)] M +5 -3 utilities/advancedrename/common/token.cpp M +1 -3 utilities/advancedrename/common/token.h A utilities/advancedrename/common/tooltipcreator.cpp trunk/extragear/graphics/digikam/utilities/advancedrename/common/tooltipcreator.cpp#1056812 [License: GPL (v2+)] A utilities/advancedrename/common/tooltipcreator.h trunk/extragear/graphics/digikam/utilities/advancedrename/common/tooltipcreator.h#1056812 [License: GPL (v2+)] M +27 -0 utilities/advancedrename/parser/defaultrenameparser.cpp M +5 -5 utilities/advancedrename/parser/modifiers/defaultvaluemodifier.cpp M +1 -1 utilities/advancedrename/parser/modifiers/defaultvaluemodifier.h M +4 -4 utilities/advancedrename/parser/modifiers/firstletterofeachworduppercasemodifier.cpp M +1 -1 utilities/advancedrename/parser/modifiers/firstletterofeachworduppercasemodifier.h M +4 -5 utilities/advancedrename/parser/modifiers/lowercasemodifier.cpp M +1 -1 utilities/advancedrename/parser/modifiers/lowercasemodifier.h M +10 -13 utilities/advancedrename/parser/modifiers/rangemodifier.cpp M +2 -2 utilities/advancedrename/parser/modifiers/rangemodifier.h M +6 -9 utilities/advancedrename/parser/modifiers/replacemodifier.cpp M +2 -2 utilities/advancedrename/parser/modifiers/replacemodifier.h M +5 -6 utilities/advancedrename/parser/modifiers/trimmedmodifier.cpp M +1 -1 utilities/advancedrename/parser/modifiers/trimmedmodifier.h A utilities/advancedrename/parser/modifiers/uniquemodifier.cpp trunk/extragear/graphics/digikam/utilities/advancedrename/parser/modifiers/uniquemodifier.cpp#1056812 [License: GPL (v2+)] A utilities/advancedrename/parser/modifiers/uniquemodifier.h trunk/extragear/graphics/digikam/utilities/advancedrename/parser/modifiers/uniquemodifier.h#1056812 [License: GPL (v2+)] M +4 -5 utilities/advancedrename/parser/modifiers/uppercasemodifier.cpp M +1 -1 utilities/advancedrename/parser/modifiers/uppercasemodifier.h M +3 -3 utilities/advancedrename/parser/options/cameranameoption.cpp M +1 -1 utilities/advancedrename/parser/options/cameranameoption.h M +58 -22 utilities/advancedrename/parser/options/dateoption.cpp M +17 -3 utilities/advancedrename/parser/options/dateoption.h M +42 -61 utilities/advancedrename/parser/options/dateoptiondialogwidget.ui M +8 -11 utilities/advancedrename/parser/options/directorynameoption.cpp M +1 -1 utilities/advancedrename/parser/options/directorynameoption.h M +4 -4 utilities/advancedrename/parser/options/dummyoption.cpp M +1 -1 utilities/advancedrename/parser/options/dummyoption.h M +8 -7 utilities/advancedrename/parser/options/filepropertiesoption.cpp M +1 -1 utilities/advancedrename/parser/options/filepropertiesoption.h M +7 -5 utilities/advancedrename/parser/options/metadataoption.cpp M +2 -2 utilities/advancedrename/parser/options/metadataoption.h M +7 -14 utilities/advancedrename/parser/options/sequencenumberoption.cpp M +1 -1 utilities/advancedrename/parser/options/sequencenumberoption.h M +2 -1 utilities/batch/batchalbumssyncmetadata.cpp M +1 -1 utilities/batch/batchthumbsgenerator.cpp M +12 -7 utilities/cameragui/cameraiconview.cpp M +1 -1 utilities/cameragui/cameraiconview.h M +51 -5 utilities/cameragui/cameraui.cpp M +1 -0 utilities/cameragui/cameraui.h M +2 -0 utilities/cameragui/cameraui_p.h M +12 -9 utilities/cameragui/renamecustomizer.cpp M +1 -1 utilities/cameragui/renamecustomizer.h M +1 -1 utilities/gpssearch/gpssearchview.cpp M +7 -1 utilities/lighttable/lighttablepreview.cpp M +1 -0 utilities/lighttable/lighttablewindow_p.h M +4 -6 utilities/queuemanager/queuelist.cpp M +9 -0 utilities/setup/setuplighttable.cpp http://websvn.kde.org/?view=rev&revision=1056817