More Info

Revision 757041

(Back to digest)
 

Features in Office

Cyrille Berger Skott committed changes in /trunk/koffice:

* 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

File Changes

Added 9 files
/trunk/koffice/krita
 
/ui/kis_meta_data_merge_strategy_chooser_widget.cc
 
/ui/kis_meta_data_merge_strategy_chooser_widget.h
 
/ui/wdgmetadatamergestrategychooser.ui
 
/image/metadata/kis_meta_data_merge_strategy.cc
 
/image/metadata/kis_meta_data_merge_strategy.h
 
/image/metadata/kis_meta_data_merge_strategy_p.cc
 
/image/metadata/kis_meta_data_merge_strategy_p.h
 
/image/metadata/kis_meta_data_merge_strategy_registry.cc
 
/image/metadata/kis_meta_data_merge_strategy_registry.h
Modified 18 files
/trunk/koffice
 
/krita/image/CMakeLists.txt
 
/krita/image/kis_image.cc
 
/krita/image/kis_image.h
 
/krita/ui/CMakeLists.txt
 
/krita/ui/kis_layer_manager.cc
 
/filters/krita/jpeg/kis_jpeg_converter.h
 
/krita/image/metadata/kis_meta_data_entry.h
 
/krita/image/metadata/kis_meta_data_filter.h
 
/krita/image/metadata/kis_meta_data_filter_p.cc
 
/krita/image/metadata/kis_meta_data_filter_p.h
 
/krita/image/metadata/kis_meta_data_filter_registry.cc
 
/krita/image/metadata/kis_meta_data_filter_registry.h
 
/krita/image/metadata/kis_meta_data_filter_registry_model.cc
 
/krita/image/metadata/kis_meta_data_filter_registry_model.h
 
/krita/image/metadata/kis_meta_data_store.cc
 
/krita/image/metadata/kis_meta_data_store.h
 
/krita/image/metadata/kis_meta_data_value.cc
 
/krita/image/metadata/kis_meta_data_value.h
27 files changed in total