tree changes

qad/CMakeLists.txt

@@ -26,6 +26,7 @@ if (NOT LIBPROJECT)
 	endif ()
 endif()
 
+include(QADMacros)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 set(EXPORT_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/qad_export.h")
@@ -59,6 +60,9 @@ set_version(QAD
 	BUILD    "${BUILD_NUMBER}"
 	SUFFIX   "${_QAD_SUFFIX}"
 	OUTPUT   "${QAD_VERSION_FILE}")
+set_deploy_property(QAD ${QAD_LIB_TYPE}
+	FULLNAME "${_QAD_DOMAIN}.*"
+	COMPANY  "${_QAD_COMPANY}")
 message(STATUS "Building QAD version ${QAD_VERSION} (${QAD_LIB_TYPE})")
 
 
@@ -94,103 +98,6 @@ else()
 	install(FILES ${EXPORT_HEADER} DESTINATION include/qad)
 endif()
 
-macro(qad_install _TARGET _HDR_VAR _QM_FILES)
-	if ("${_TARGET}" STREQUAL "qad_utils")
-		list(APPEND ${_HDR_VAR} "${QAD_VERSION_FILE}")
-	endif()
-	if (LIBPROJECT)
-		sdk_install("qad" "${_TARGET}" "${${_HDR_VAR}}" "${_QM_FILES}")
-	else()
-		if (LIB)
-			if (WIN32)
-				if(NOT "x${${_HDR_VAR}}" STREQUAL "x")
-					install(FILES ${${_HDR_VAR}} DESTINATION ${MINGW_INCLUDE}/qad)
-				endif()
-				qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION ${MINGW_LIB})
-				qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION ${MINGW_BIN})
-				qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION QtBin)
-			else()
-				if(NOT "x${${_HDR_VAR}}" STREQUAL "x")
-					install(FILES ${${_HDR_VAR}} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad)
-				endif()
-				qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-			endif()
-			if(NOT "x${_QM_FILES}" STREQUAL "x")
-				qt_install(LANG ${_QM_FILES} DESTINATION QtLang)
-			endif()
-		else()
-			if(WIN32)
-				qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin)
-				qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib)
-			else()
-				qt_install(TARGETS ${_TARGET} DESTINATION lib)
-			endif()
-			if(NOT "x${${_HDR_VAR}}" STREQUAL "x")
-				install(FILES ${${_HDR_VAR}} DESTINATION include/qad)
-			endif()
-			if(NOT "x${_QM_FILES}" STREQUAL "x")
-				qt_install(LANG ${_QM_FILES} DESTINATION lang)
-			endif()
-		endif()
-	endif()
-endmacro()
-
-macro(qad_plugin NAME _MODULES _LIBS)
-	if (NOT STATIC_LIB)
-		if(DESIGNER_PLUGINS)
-			set(PROJ_NAME qad_${NAME}_plugin)
-			include_directories("..")
-			add_definitions(-DQT_PLUGIN)
-			add_definitions(-DQT_NO_DEBUG)
-			add_definitions(-DQT_SHARED)
-			add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
-			find_qt(${QtVersions} Core Designer ${_MODULES})
-			qt_sources(SRC)
-			qt_wrap(${SRC} CPPS out_CPP QMS out_QM)
-			qt_add_library(${PROJ_NAME} SHARED out_CPP)
-			qt_target_link_libraries(${PROJ_NAME} ${_LIBS} qad_${NAME} ${_${NAME}_PLUGIN_LIBS})
-			if (WIN32)
-				qt_install(TARGETS ${PROJ_NAME} RUNTIME DESTINATION QtPlugins/designer)
-			else()
-				qt_install(TARGETS ${PROJ_NAME} DESTINATION QtPlugins/designer)
-			endif()
-		endif()
-	endif()
-endmacro()
-
-macro(qad_project NAME _MODULES _LIBS)
-	set(PROJ_NAME qad_${NAME})
-	find_qt(${QtVersions} Core ${_MODULES})
-	qt_sources(SRC)
-	import_version(${PROJ_NAME} QAD)
-	if(NOT STATIC_LIB)
-		set_deploy_property(${PROJ_NAME} SHARED
-			LABEL 		${PROJ_NAME}
-			FULLNAME 	"${_QAD_DOMAIN}.${PROJ_NAME}"
-			COMPANY 	${_QAD_COMPANY}
-			INFO 		"QAD ${NAME} library")
-	else()
-		set_deploy_property(${PROJ_NAME} STATIC
-			LABEL 		${PROJ_NAME}
-			FULLNAME 	"${_QAD_DOMAIN}.${PROJ_NAME}"
-			COMPANY 	${_QAD_COMPANY}
-			INFO 		"QAD ${NAME} library")
-	endif()
-	make_rc(${PROJ_NAME} out_RC)
-	qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM ${out_RC})
-	qt_add_library(${PROJ_NAME} ${QAD_LIB_TYPE} out_CPP ${EXPORT_HEADER})
-	if(NOT STATIC_LIB)
-		qt_target_compile_definitions(${PROJ_NAME} PRIVATE QAD_SHARED_DEFINE)
-	endif()
-	qt_target_link_libraries(${PROJ_NAME} ${_LIBS})
-	qad_install(${PROJ_NAME} "out_HDR" "out_QM")
-	message(STATUS "Building ${PROJ_NAME}")
-	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
-		set(_${NAME}_PLUGIN_LIBS "${_LIBS}")
-		add_subdirectory(plugin)
-	endif()
-endmacro()
-
 add_subdirectory(libs)
 if (UTILS)
 	add_subdirectory(utils)

qad/cmake/QADMacros.cmake

@@ -0,0 +1,82 @@
+
+macro(_qt_install _TARGET IS_APP _DIR _HDR_VAR _QM_FILES)
+	if ("${_TARGET}" STREQUAL "qad_utils")
+		list(APPEND ${_HDR_VAR} "${QAD_VERSION_FILE}")
+	endif()
+	sdk_install("${_DIR}" ${IS_APP} "${_TARGET}" "${${_HDR_VAR}}" "${_QM_FILES}")
+endmacro()
+
+
+macro(qad_plugin NAME _MODULES _LIBS)
+	if (NOT STATIC_LIB)
+		if(DESIGNER_PLUGINS)
+			set(PROJ_NAME qad_${NAME}_plugin)
+			include_directories("..")
+			add_definitions(-DQT_PLUGIN)
+			add_definitions(-DQT_NO_DEBUG)
+			add_definitions(-DQT_SHARED)
+			add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
+			find_qt(${QtVersions} Core Designer ${_MODULES})
+			qt_sources(SRC)
+			qt_wrap(${SRC} CPPS out_CPP QMS out_QM)
+			qt_add_library(${PROJ_NAME} SHARED out_CPP)
+			qt_target_link_libraries(${PROJ_NAME} ${_LIBS} qad_${NAME} ${_${NAME}_PLUGIN_LIBS})
+			if (WIN32)
+				qt_install(TARGETS ${PROJ_NAME} RUNTIME DESTINATION QtPlugins/designer)
+			else()
+				qt_install(TARGETS ${PROJ_NAME} DESTINATION QtPlugins/designer)
+			endif()
+		endif()
+	endif()
+endmacro()
+
+
+macro(_qt_project NAME IS_APP DOMAIN _MODULES _LIBS)
+	set(PROJ_NAME ${NAME})
+	find_qt(${QtVersions} Core ${_MODULES})
+	qt_sources(SRC)
+	import_version(${PROJ_NAME} ${DOMAIN})
+	import_deploy_properties(${PROJ_NAME} ${DOMAIN})
+	if (${IS_APP})
+		set_deploy_property(${PROJ_NAME}
+			LABEL 		${PROJ_NAME}
+			FULLNAME 	"${_${DOMAIN}_DOMAIN}.${PROJ_NAME}"
+			INFO 		"${APP_INFO}"
+			ICON 		"${APP_ICON}")
+	else()
+		set_deploy_property(${PROJ_NAME} SHARED
+			LABEL 		${PROJ_NAME}
+			FULLNAME 	"${_${DOMAIN}_DOMAIN}.${PROJ_NAME}"
+			INFO 		"${DOMAIN} ${NAME} library")
+	endif()
+	make_rc(${PROJ_NAME} out_RC)
+	qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM ${out_RC})
+	if (${IS_APP})
+		qt_add_executable(${PROJ_NAME} WIN32 out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN})
+	else()
+		qt_add_library(${PROJ_NAME} ${${DOMAIN}_LIB_TYPE} out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN})
+		if(NOT STATIC_LIB)
+			qt_target_compile_definitions(${PROJ_NAME} PRIVATE ${DOMAIN}_SHARED_DEFINE)
+		endif()
+	endif()
+	qt_target_link_libraries(${PROJ_NAME} ${_LIBS})
+	list(APPEND QT_MULTILIB_LIST ${PROJ_NAME})
+	set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
+	message(STATUS "Building ${PROJ_NAME}")
+	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
+		set(_${NAME}_PLUGIN_LIBS "${_LIBS}")
+		add_subdirectory(plugin)
+	endif()
+endmacro()
+
+
+macro(qad_library NAME _MODULES _LIBS)
+	_qt_project(qad_${NAME} FALSE "QAD" "${_MODULES}" "${_LIBS}")
+	_qt_install(qad_${NAME} FALSE "qad" "out_HDR" "out_QM")
+endmacro()
+
+
+macro(qad_application NAME _MODULES _LIBS)
+	_qt_project(${NAME} TRUE "QAD" "${_MODULES}" "${_LIBS}")
+	_qt_install(${NAME} TRUE "qad" "" "out_QM")
+endmacro()

qad/libs/CMakeLists.txt

@@ -1,26 +1 @@
-set(DIRS)
-file(GLOB _dl "[^.]*")
-foreach(_D ${_dl})
-	if(IS_DIRECTORY ${_D})
-		list(APPEND DIRS ${_D})
-	endif()
-endforeach()
-
-set(qad_includes)
-foreach(_D ${DIRS})
-	get_filename_component(_dname "${_D}" NAME)
-	list(APPEND QT_MULTILIB_LIST qad_${_dname})
-	list(APPEND qad_includes "${_D}")
-endforeach()
-set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
-set(qad_includes ${qad_includes} PARENT_SCOPE)
-foreach(_D ${DIRS})
-	include_directories(${_D})
-endforeach()
-foreach(_D ${DIRS})
-	add_subdirectory(${_D})
-endforeach()
-
-if (LIB)
-	set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
-endif()
+add_directories_with_include("qad_")

qad/libs/application/CMakeLists.txt

@@ -1 +1 @@
-qad_project(application "Gui;Widgets" "qad_widgets")
+qad_library(application "Gui;Widgets" "qad_widgets")

qad/libs/blockview/CMakeLists.txt

@@ -1 +1 @@
-qad_project(blockview "Gui;Widgets" "qad_utils;qad_widgets")
+qad_library(blockview "Gui;Widgets" "qad_utils;qad_widgets")

qad/libs/doc/CMakeLists.txt

@@ -18,7 +18,7 @@ endif()
 find_library(MARKDOWN_LIBRARY markdown)
 if (MARKDOWN_LIBRARY)
 	if(_mkd_header_found)
-		qad_project(doc "Core" "${MARKDOWN_LIBRARY}")
+		qad_library(doc "Core" "${MARKDOWN_LIBRARY}")
 	else()
 		message(STATUS "Found markdown library, but *.h missing!")
 	endif()

qad/libs/graphic/CMakeLists.txt

@@ -1 +1 @@
-qad_project(graphic "Gui;Widgets;OpenGL" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}")
+qad_library(graphic "Gui;Widgets;OpenGL" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}")

qad/libs/sql_table/CMakeLists.txt

@@ -1 +1 @@
-qad_project(sql_table "Gui;Widgets;Sql" "qad_utils;qad_widgets")
+qad_library(sql_table "Gui;Widgets;Sql" "qad_utils;qad_widgets")

qad/libs/touch_widgets/CMakeLists.txt

@@ -1 +1 @@
-qad_project(touch_widgets "Gui;Widgets" "")
+qad_library(touch_widgets "Gui;Widgets" "")

qad/libs/utils/CMakeLists.txt

@@ -1 +1 @@
-qad_project(utils "Gui;Widgets" "")
+qad_library(utils "Gui;Widgets" "")

qad/libs/widgets/CMakeLists.txt

@@ -1 +1 @@
-qad_project(widgets "Gui;Widgets" "qad_utils")
+qad_library(widgets "Gui;Widgets" "qad_utils")

qad/utils/CMakeLists.txt

@@ -1,11 +1 @@
-include_directories(${qad_includes})
-file(GLOB _dl "[^.]*")
-foreach(_D ${_dl})
-	if(IS_DIRECTORY ${_D})
-		add_subdirectory(${_D})
-	endif()
-endforeach()
-
-if (LIB)
-	set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
-endif()
+add_directories("qad_")

qad/utils/blockeditor/CMakeLists.txt

@@ -1,42 +1,14 @@
 project(blockeditor)
-import_version(${PROJECT_NAME} QAD)
-find_qt(${QtVersions} Core Gui Widgets)
-if (Qt5_FOUND)
-	import_version(${PROJECT_NAME}5 ${PROJECT_NAME})
-	import_deploy_properties(${PROJECT_NAME}5 ${PROJECT_NAME})
-endif()
-set_deploy_property(${PROJECT_NAME}
-		LABEL 		${PROJECT_NAME}
-		FULLNAME 	"${_QAD_DOMAIN}.${PROJECT_NAME}"
-		COMPANY 	${_QAD_COMPANY}
-		INFO 		"Editor for BlockView Blocks")
 if(APPLE)
-	#set_deploy_property(${PROJECT_NAME} ICON "icons/blockview.icns")
+	set(APP_ICON "")
 elseif(WIN32)
-	set_deploy_property(${PROJECT_NAME} ICON "icons/blockview.ico")
+	set(APP_ICON "icons/blockview.ico")
 else()
-	set_deploy_property(${PROJECT_NAME} ICON "icons/blockview.png")
-endif()
-make_rc(${PROJECT_NAME} out_RC)
-qt_sources(SRC)
-qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
-qt_add_executable(${PROJECT_NAME} WIN32 out_CPP ${out_RC})
-qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_blockview)
-message(STATUS "Building ${PROJECT_NAME}")
-if(LIB)
-	if(WIN32)
-		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-	else()
-		if (DEFINED ANDROID_PLATFORM)
-			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin)
-		else()
-			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
-		endif()
-	endif()
-	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
-else()
-	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	set(APP_ICON "icons/blockview.png")
 endif()
+set(APP_INFO "Editor for BlockView Blocks")
+qad_application(${PROJECT_NAME} "Gui;Widgets" "qad_utils;qad_widgets;qad_blockview")
 if (Qt5_FOUND)
-	deploy_target(${PROJECT_NAME}5 VERBOSE DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../release)
+	import_version(${PROJ_NAME}5 ${PROJECT_NAME})
+	deploy_target(${PROJECT_NAME}5 DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${ROOT_DIR}/release)
 endif()

qad/utils/qpicalculator/CMakeLists.txt

@@ -1,23 +1,14 @@
 project(qpicalc)
-find_qt(${QtVersions} Core Gui Widgets)
-qt_sources(SRC)
-qt_wrap(${SRC} CPPS out_CPP QMS out_QM)
-qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
-qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_graphic)
-message(STATUS "Building ${PROJECT_NAME}")
-if(LIB)
-	if(WIN32)
-		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-	else()
-		if (DEFINED ANDROID_PLATFORM)
-			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin)
-		else()
-			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
-		endif()
-	endif()
-	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
+if(APPLE)
+	set(APP_ICON "")
+elseif(WIN32)
+	set(APP_ICON "icons/qpicalculator.ico")
 else()
-	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+	set(APP_ICON "icons/qpicalculator.png")
+endif()
+set(APP_INFO "Small calculator ang grapher")
+qad_application(${PROJECT_NAME} "Gui;Widgets" "qad_utils;qad_widgets;qad_graphic")
+if (Qt5_FOUND)
+	import_version(${PROJ_NAME}5 ${PROJECT_NAME})
+	deploy_target(${PROJECT_NAME}5 DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${ROOT_DIR}/release)
 endif()
-

qad/utils/qpicalculator/icons/mbricks.svg

@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="256"
-   height="256"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="mbricks.svg"
-   inkscape:export-filename="/home/peri4/pprojects/mbricks/icons/mbricks_256.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="TriangleOutM"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="TriangleOutM"
-       style="overflow:visible">
-      <path
-         id="path4080"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.4)" />
-    </marker>
-    <linearGradient
-       id="linearGradient7185">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7187" />
-      <stop
-         style="stop-color:#9f5321;stop-opacity:1;"
-         offset="1"
-         id="stop7189" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Scissors"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Scissors"
-       style="overflow:visible">
-      <path
-         id="schere"
-         style="marker-start:none"
-         d="M 9.0898857,-3.6061018 C 8.1198849,-4.7769976 6.3697607,-4.7358294 5.0623558,-4.2327734 L -3.1500488,-1.1548705 C -5.5383421,-2.4615840 -7.8983361,-2.0874077 -7.8983361,-2.7236578 C -7.8983361,-3.2209742 -7.4416699,-3.1119800 -7.5100293,-4.4068519 C -7.5756648,-5.6501286 -8.8736064,-6.5699315 -10.100428,-6.4884954 C -11.327699,-6.4958500 -12.599867,-5.5553341 -12.610769,-4.2584343 C -12.702194,-2.9520479 -11.603560,-1.7387447 -10.304005,-1.6532027 C -8.7816644,-1.4265411 -6.0857470,-2.3487593 -4.8210600,-0.082342643 C -5.7633447,1.6559151 -7.4350844,1.6607341 -8.9465707,1.5737277 C -10.201445,1.5014928 -11.708664,1.8611256 -12.307219,3.0945882 C -12.885586,4.2766744 -12.318421,5.9591904 -10.990470,6.3210002 C -9.6502788,6.8128279 -7.8098011,6.1912892 -7.4910978,4.6502760 C -7.2454393,3.4624530 -8.0864637,2.9043186 -7.7636052,2.4731223 C -7.5199917,2.1477623 -5.9728246,2.3362771 -3.2164999,1.0982979 L 5.6763468,4.2330688 C 6.8000164,4.5467672 8.1730685,4.5362646 9.1684433,3.4313614 L -0.051640930,-0.053722219 L 9.0898857,-3.6061018 z M -9.2179159,-5.5066058 C -7.9233569,-4.7838060 -8.0290767,-2.8230356 -9.3743431,-2.4433169 C -10.590861,-2.0196559 -12.145370,-3.2022863 -11.757521,-4.5207817 C -11.530373,-5.6026336 -10.104134,-6.0014137 -9.2179159,-5.5066058 z M -9.1616516,2.5107591 C -7.8108215,3.0096239 -8.0402087,5.2951947 -9.4138723,5.6023681 C -10.324932,5.9187072 -11.627422,5.4635705 -11.719569,4.3902287 C -11.897178,3.0851737 -10.363484,1.9060805 -9.1616516,2.5107591 z " />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleOutL"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="TriangleOutL"
-       style="overflow:visible">
-      <path
-         id="path4077"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path3952"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;">
-      <path
-         id="path3955"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lend"
-       style="overflow:visible;">
-      <path
-         id="path3937"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-    <linearGradient
-       id="linearGradient2880">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2882" />
-      <stop
-         style="stop-color:#a1a0ec;stop-opacity:1;"
-         offset="1"
-         id="stop2884" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-27.752184 : 226.04049 : 1"
-       inkscape:vp_y="0 : 532.84338 : 0"
-       inkscape:vp_z="668.44676 : 231.8798 : 1"
-       inkscape:persp3d-origin="729.03793 : 212.46096 : 1"
-       id="perspective10" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2880"
-       id="radialGradient3660"
-       cx="44.799999"
-       cy="841.16217"
-       fx="44.799999"
-       fy="841.16217"
-       r="83.199997"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.9999999,1.9999998,-2.0000003,-2.0000003,1816.7246,2433.8867)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7185"
-       id="radialGradient7191"
-       cx="79.29837"
-       cy="78.79641"
-       fx="79.29837"
-       fy="78.79641"
-       r="49.693359"
-       gradientTransform="matrix(3.7537835e-8,1.9999999,-1.9999999,6.9316032e-8,236.4014,-58.319081)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7185"
-       id="radialGradient7193"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.7537835e-8,1.9999999,-1.9999999,6.9316032e-8,236.4014,-58.319081)"
-       cx="79.29837"
-       cy="78.79641"
-       fx="79.29837"
-       fy="78.79641"
-       r="49.693359" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7185"
-       id="radialGradient7195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.7537835e-8,1.9999999,-1.9999999,6.9316032e-8,236.4014,-58.319081)"
-       cx="79.29837"
-       cy="78.79641"
-       fx="79.29837"
-       fy="78.79641"
-       r="49.693359" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7185"
-       id="radialGradient7197"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.7537835e-8,1.9999999,-1.9999999,6.9316032e-8,236.4014,-58.319081)"
-       cx="79.29837"
-       cy="78.79641"
-       fx="79.29837"
-       fy="78.79641"
-       r="49.693359" />
-    <filter
-       inkscape:collect="always"
-       id="filter7823">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.1939744"
-         id="feGaussianBlur7825" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.9694029"
-     inkscape:cx="174.88154"
-     inkscape:cy="103.79424"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     borderlayer="false"
-     showborder="true"
-     inkscape:showpageshadow="true"
-     inkscape:snap-global="true"
-     inkscape:snap-page="true"
-     inkscape:snap-grids="false"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="957"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2878"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-796.36218)">
-    <rect
-       style="fill:url(#radialGradient3660);fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-linecap:round;stroke-linejoin:round"
-       id="rect2873"
-       width="166.39999"
-       height="166.39999"
-       x="44.799999"
-       y="841.16217"
-       ry="19.968" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 240,0 0,81 -20.47574,0"
-       id="path3745"
-       transform="translate(0,796.36218)"
-       sodipodi:nodetypes="ccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#0000ff;stroke:#0000ff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1;fill-rule:nonzero"
-       id="path3666"
-       sodipodi:cx="212.14285"
-       sodipodi:cy="102.42857"
-       sodipodi:rx="13.571428"
-       sodipodi:ry="13.571428"
-       d="m 225.71428,102.42857 c 0,7.4953 -6.07613,13.57143 -13.57143,13.57143 -7.49529,0 -13.57143,-6.07613 -13.57143,-13.57143 0,-7.495289 6.07614,-13.571425 13.57143,-13.571425 7.4953,0 13.57143,6.076136 13.57143,13.571425 z"
-       transform="matrix(0.5,0,0,0.5,106.12857,826.1479)" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow2Lend)"
-       d="m 0,81 40,0"
-       id="path3747"
-       transform="translate(0,796.36218)"
-       sodipodi:nodetypes="cc" />
-    <path
-       transform="matrix(0.5,0,0,0.5,-62.271427,826.1479)"
-       d="m 225.71428,102.42857 c 0,7.4953 -6.07613,13.57143 -13.57143,13.57143 -7.49529,0 -13.57143,-6.07613 -13.57143,-13.57143 0,-7.495289 6.07614,-13.571425 13.57143,-13.571425 7.4953,0 13.57143,6.076136 13.57143,13.571425 z"
-       sodipodi:ry="13.571428"
-       sodipodi:rx="13.571428"
-       sodipodi:cy="102.42857"
-       sodipodi:cx="212.14285"
-       id="path3743"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path5719"
-       d="m 5,1052.3622 0,-85.00002 35,0"
-       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow2Lend);opacity:1" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path5721"
-       sodipodi:cx="212.14285"
-       sodipodi:cy="102.42857"
-       sodipodi:rx="13.571428"
-       sodipodi:ry="13.571428"
-       d="m 225.71428,102.42857 c 0,7.4953 -6.07613,13.57143 -13.57143,13.57143 -7.49529,0 -13.57143,-6.07613 -13.57143,-13.57143 0,-7.495289 6.07614,-13.571425 13.57143,-13.571425 7.4953,0 13.57143,6.076136 13.57143,13.571425 z"
-       transform="matrix(0.5,0,0,0.5,-62.271427,916.14789)" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow2Lend)"
-       d="m 0,922.36217 40,0"
-       id="path5723"
-       sodipodi:nodetypes="cc" />
-    <path
-       transform="matrix(0.5,0,0,0.5,-62.271427,871.14789)"
-       d="m 225.71428,102.42857 c 0,7.4953 -6.07613,13.57143 -13.57143,13.57143 -7.49529,0 -13.57143,-6.07613 -13.57143,-13.57143 0,-7.495289 6.07614,-13.571425 13.57143,-13.571425 7.4953,0 13.57143,6.076136 13.57143,13.571425 z"
-       sodipodi:ry="13.571428"
-       sodipodi:rx="13.571428"
-       sodipodi:cy="102.42857"
-       sodipodi:cx="212.14285"
-       id="path5725"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="cccc"
-       id="path5727"
-       d="m 256,967.36218 -16,0 0,-45 -20,0"
-       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       transform="matrix(0.5,0,0,0.5,106.12857,871.14789)"
-       d="m 225.71428,102.42857 c 0,7.4953 -6.07613,13.57143 -13.57143,13.57143 -7.49529,0 -13.57143,-6.07613 -13.57143,-13.57143 0,-7.495289 6.07614,-13.571425 13.57143,-13.571425 7.4953,0 13.57143,6.076136 13.57143,13.571425 z"
-       sodipodi:ry="13.571428"
-       sodipodi:rx="13.571428"
-       sodipodi:cy="102.42857"
-       sodipodi:cx="212.14285"
-       id="path5729"
-       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#0000ff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       sodipodi:type="arc" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot5731"
-       style="font-size:72px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:url(#radialGradient7191);fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:Bitstream Vera Sans Bold;stroke-width:0.70352161999999996;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter7823)"
-       transform="matrix(1.2,0,0,1.6836967,-25.658203,708.84411)"><flowRegion
-         id="flowRegion5733"
-         style="fill:url(#radialGradient7195);fill-opacity:1"><rect
-           id="rect5735"
-           width="145"
-           height="120"
-           x="55"
-           y="81"
-           style="font-size:72px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:url(#radialGradient7193);fill-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:Bitstream Vera Sans Bold;stroke-width:0.70352162;stroke-miterlimit:4;stroke-dasharray:none"
-           ry="0" /></flowRegion><flowPara
-         id="flowPara5737"
-         style="font-weight:bold;fill:url(#radialGradient7197);fill-opacity:1;-inkscape-font-specification:Bitstream Vera Sans Bold;stroke-width:0.70352162;stroke-miterlimit:4;stroke-dasharray:none">MB</flowPara></flowRoot>  </g>
-</svg>