[Uml-devel] branches/work/soc-umbrello/umbrello

[Andi Fischer]

SVN commit 1233739 by fischer:

Same commits as 1230292 and 1230294 from trunk applied.

 D             hisc-app-umbrello.svgz  
 U             icon_utils.h  
 M  +3 -2      pics/CMakeLists.txt  
 A             pics/global (directory)  
 A             pics/global/CMakeLists.txt  
 A             pics/global/hi128-app-umbrello.png   pics/hi128-app-umbrello.png#1232866
 A             pics/global/hi16-app-umbrello.png   pics/hi16-app-umbrello.png#1232866
 A             pics/global/hi16-mime-application-x-uml.png   pics/hi16-mime-application-x-uml.png#1232866
 A             pics/global/hi22-app-umbrello.png   pics/hi22-app-umbrello.png#1232866
 A             pics/global/hi32-app-umbrello.png   pics/hi32-app-umbrello.png#1232866
 A             pics/global/hi32-mime-application-x-uml.png   pics/hi32-mime-application-x-uml.png#1232866
 A             pics/global/hi48-app-umbrello.png   pics/hi48-app-umbrello.png#1232866
 A             pics/global/hi64-app-umbrello.png   pics/hi64-app-umbrello.png#1232866
 A             pics/global/hisc-app-umbrello.svgz   hisc-app-umbrello.svgz#1230809
 D             pics/hi128-app-umbrello.png  
 A             pics/hi16-action-umbrello_diagram_activity.png   pics/ox16-action-umbrello_diagram_activity.png#1233709
 A             pics/hi16-action-umbrello_diagram_class.png   pics/ox16-action-umbrello_diagram_class.png#1233709
 A             pics/hi16-action-umbrello_diagram_collaboration.png   pics/ox16-action-umbrello_diagram_collaboration.png#1233709
 A             pics/hi16-action-umbrello_diagram_component.png   pics/ox16-action-umbrello_diagram_component.png#1233709
 A             pics/hi16-action-umbrello_diagram_deployment.png   pics/ox16-action-umbrello_diagram_deployment.png#1233709
 A             pics/hi16-action-umbrello_diagram_sequence.png   pics/ox16-action-umbrello_diagram_sequence.png#1233709
 A             pics/hi16-action-umbrello_diagram_state.png   pics/ox16-action-umbrello_diagram_state.png#1233709
 A             pics/hi16-action-umbrello_diagram_usecase.png   pics/ox16-action-umbrello_diagram_usecase.png#1233709
 D             pics/hi16-app-umbrello.png  
 D             pics/hi16-mime-application-x-uml.png  
 A             pics/hi22-action-umbrello_diagram_activity.png   pics/ox22-action-umbrello_diagram_activity.png#1233709
 A             pics/hi22-action-umbrello_diagram_class.png   pics/ox22-action-umbrello_diagram_class.png#1233709
 A             pics/hi22-action-umbrello_diagram_collaboration.png   pics/ox22-action-umbrello_diagram_collaboration.png#1233709
 A             pics/hi22-action-umbrello_diagram_component.png   pics/ox22-action-umbrello_diagram_component.png#1233709
 A             pics/hi22-action-umbrello_diagram_deployment.png   pics/ox22-action-umbrello_diagram_deployment.png#1233709
 A             pics/hi22-action-umbrello_diagram_entityrelationship.png   pics/ox22-action-umbrello_diagram_entityrelationship.png#1233709
 A             pics/hi22-action-umbrello_diagram_sequence.png   pics/ox22-action-umbrello_diagram_sequence.png#1233709
 A             pics/hi22-action-umbrello_diagram_state.png   pics/ox22-action-umbrello_diagram_state.png#1233709
 A             pics/hi22-action-umbrello_diagram_usecase.png   pics/ox22-action-umbrello_diagram_usecase.png#1233709
 D             pics/hi22-app-umbrello.png  
 D             pics/hi32-app-umbrello.png  
 D             pics/hi32-mime-application-x-uml.png  
 D             pics/hi48-app-umbrello.png  
 D             pics/hi64-app-umbrello.png  
 D             pics/ox16-action-umbrello_diagram_activity.png  
 D             pics/ox16-action-umbrello_diagram_class.png  
 D             pics/ox16-action-umbrello_diagram_collaboration.png  
 D             pics/ox16-action-umbrello_diagram_component.png  
 D             pics/ox16-action-umbrello_diagram_deployment.png  
 D             pics/ox16-action-umbrello_diagram_sequence.png  
 D             pics/ox16-action-umbrello_diagram_state.png  
 D             pics/ox16-action-umbrello_diagram_usecase.png  
 D             pics/ox22-action-umbrello_diagram_activity.png  
 D             pics/ox22-action-umbrello_diagram_class.png  
 D             pics/ox22-action-umbrello_diagram_collaboration.png  
 D             pics/ox22-action-umbrello_diagram_component.png  
 D             pics/ox22-action-umbrello_diagram_deployment.png  
 D             pics/ox22-action-umbrello_diagram_entityrelationship.png  
 D             pics/ox22-action-umbrello_diagram_sequence.png  
 D             pics/ox22-action-umbrello_diagram_state.png  
 D             pics/ox22-action-umbrello_diagram_usecase.png  


--- branches/work/soc-umbrello/umbrello/pics/CMakeLists.txt #1233738:1233739
@@ -1,4 +1,6 @@
 
+add_subdirectory(global)
+
 install( FILES actor.png  aggregation.png
 align-horizontal-left.png  align-horizontal-right.png
 align-vertical-top.png  align-vertical-bottom.png
@@ -48,8 +50,7 @@
 end_of_life.png  cursor-end_of_life.png  exception.png 
 cursor-exception.png cursor-object_node.png
 cursor-PrePostCondition.png PrePostCondition.png
-hi64-app-umbrello.png
 DESTINATION ${DATA_INSTALL_DIR}/umbrello/pics )
 
-kde4_install_icons( ${ICON_INSTALL_DIR} )
+kde4_install_icons(${DATA_INSTALL_DIR}/umbrello/icons)