[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice
From:       Cyrille Berger <cyb () lepi ! org>
Date:       2008-01-04 0:08:27
Message-ID: 1199405307.781598.22618.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 757041 by berger:

* introduce merging of meta data store
* add some UI to select the merging strategy
* add three merging strategy : drop, priority to bottom layer, only equal meta data

 M  +1 -1      filters/krita/jpeg/kis_jpeg_converter.h  
 M  +4 -1      krita/image/CMakeLists.txt  
 M  +8 -1      krita/image/kis_image.cc  
 M  +5 -1      krita/image/kis_image.h  
 M  +4 -4      krita/image/metadata/kis_meta_data_entry.h  
 M  +5 -5      krita/image/metadata/kis_meta_data_filter.h  
 M  +10 -10    krita/image/metadata/kis_meta_data_filter_p.cc  
 M  +10 -10    krita/image/metadata/kis_meta_data_filter_p.h  
 M  +2 -1      krita/image/metadata/kis_meta_data_filter_registry.cc  
 M  +1 -1      krita/image/metadata/kis_meta_data_filter_registry.h  
 M  +5 -5      krita/image/metadata/kis_meta_data_filter_registry_model.cc  
 M  +3 -3      krita/image/metadata/kis_meta_data_filter_registry_model.h  
 AM            krita/image/metadata/kis_meta_data_merge_strategy.cc   [License: LGPL (v2+)]
 AM            krita/image/metadata/kis_meta_data_merge_strategy.h   [License: LGPL (v2+)]
 AM            krita/image/metadata/kis_meta_data_merge_strategy_p.cc   [License: LGPL (v2+)]
 AM            krita/image/metadata/kis_meta_data_merge_strategy_p.h   [License: LGPL (v2+)]
 AM            krita/image/metadata/kis_meta_data_merge_strategy_registry.cc   [License: LGPL (v2+)]
 AM            krita/image/metadata/kis_meta_data_merge_strategy_registry.h   [License: LGPL (v2+)]
 M  +29 -6     krita/image/metadata/kis_meta_data_store.cc  
 M  +29 -5     krita/image/metadata/kis_meta_data_store.h  
 M  +24 -0     krita/image/metadata/kis_meta_data_value.cc  
 M  +10 -0     krita/image/metadata/kis_meta_data_value.h  
 M  +3 -1      krita/ui/CMakeLists.txt  
 M  +5 -1      krita/ui/kis_layer_manager.cc  
 AM            krita/ui/kis_meta_data_merge_strategy_chooser_widget.cc   [License: GPL (v2+)]
 AM            krita/ui/kis_meta_data_merge_strategy_chooser_widget.h   [License: GPL (v2+)]
 A             krita/ui/wdgmetadatamergestrategychooser.ui  


[prev in list] [next in list] [prev in thread] [next in thread]