Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.5:Update
OpenBoard
0698-add-cmake-build-system.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0698-add-cmake-build-system.patch of Package OpenBoard
From 6830bd54d42446a4d09acc25da39113ecd808a61 Mon Sep 17 00:00:00 2001 From: letsfindaway <me@letsfindaway.de> Date: Wed, 10 Aug 2022 10:41:15 +0200 Subject: [PATCH 1/3] chore: add cmake build system - add a cmake based build sytem which is - easy to understand - easy to maintain - covering Linux, Windows and MacOS platforms - allow to build for Qt5 and Qt6 without modifying the cmake files - reasonable structure in QtCreator - create a structure with - concise root CMakeLists.txt - separate files for each src subdirectory - separate files for finding dependencies - currently missing - support for Windows only rudimentary (WIP) - support for MacOS only rudimentary (WIP) - flexible install locations - add `UBPlatformUtile::applicationEtcDirectory()` - use it whenever referencing files in this directory - allow to configure these directories at build time and runtime - create complete installation tree - cover /usr and /opt based installations - move non-config files out of etc - move template files from resources/etc to resources/template - adapt code accessing these resources --- .gitignore | 1 + CMakeLists.txt | 234 ++++++++++++++++++ cmake/DependencyFFmpeg.cmake | 12 + cmake/DependencyOpenSSL.cmake | 7 + cmake/DependencyPoppler.cmake | 20 ++ cmake/DependencyQt.cmake | 39 +++ cmake/DependencyQuaZip.cmake | 43 ++++ cmake/DependencyX11.cmake | 18 ++ cmake/DependencyZlib.cmake | 6 + cmake/FetchContentFreetype.cmake | 13 + cmake/FetchContentPoppler.cmake | 18 ++ cmake/FetchContentQuaZip.cmake | 23 ++ cmake/FetchContentXpdf.cmake | 28 +++ cmake/Platform.cmake | 16 ++ cmake/Version.cmake | 23 ++ plugins/cffadaptor/src/CMakeLists.txt | 7 + resources/forms/CMakeLists.txt | 13 + resources/images/ch.openboard.OpenBoard.svg | 4 + .../linux/ch.openboard.OpenBoard.desktop | 11 + .../linux/ch.openboard.application-ubz.svg | 36 +++ .../linux/ch.openboard.openboard-ubz.xml | 10 + resources/{etc => template}/asyncAPI.js | 0 resources/{etc => template}/img/loading.gif | Bin .../intranet-podcast-metadata.template | 0 ...pper.application.x-shockwave-flash.swf.htm | 0 .../npapi-wrapper.config.xml | 0 src/adaptors/CMakeLists.txt | 38 +++ src/adaptors/UBWidgetUpgradeAdaptor.cpp | 2 +- src/api/CMakeLists.txt | 8 + src/board/CMakeLists.txt | 12 + src/core/CMakeLists.txt | 38 +++ src/core/UBApplication.cpp | 2 +- src/core/UBSettings.cpp | 2 +- src/desktop/CMakeLists.txt | 10 + src/document/CMakeLists.txt | 10 + src/domain/CMakeLists.txt | 58 +++++ src/domain/UBGraphicsWidgetItem.cpp | 10 +- src/frameworks/CMakeLists.txt | 32 +++ src/frameworks/UBPlatformUtils.h | 1 + src/frameworks/UBPlatformUtils_linux.cpp | 14 ++ src/frameworks/UBPlatformUtils_mac.mm | 5 + src/frameworks/UBPlatformUtils_win.cpp | 4 + src/globals/CMakeLists.txt | 3 + src/gui/CMakeLists.txt | 98 ++++++++ src/network/CMakeLists.txt | 14 ++ src/pdf-merger/CMakeLists.txt | 50 ++++ src/pdf/CMakeLists.txt | 8 + src/podcast/CMakeLists.txt | 30 +++ .../intranet/UBIntranetPodcastPublisher.cpp | 2 +- src/tools/CMakeLists.txt | 22 ++ src/web/CMakeLists.txt | 35 +++ src/web/UBWebController.cpp | 2 +- 52 files changed, 1082 insertions(+), 10 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 cmake/DependencyFFmpeg.cmake create mode 100644 cmake/DependencyOpenSSL.cmake create mode 100644 cmake/DependencyPoppler.cmake create mode 100644 cmake/DependencyQt.cmake create mode 100644 cmake/DependencyQuaZip.cmake create mode 100644 cmake/DependencyX11.cmake create mode 100644 cmake/DependencyZlib.cmake create mode 100644 cmake/FetchContentFreetype.cmake create mode 100644 cmake/FetchContentPoppler.cmake create mode 100644 cmake/FetchContentQuaZip.cmake create mode 100644 cmake/FetchContentXpdf.cmake create mode 100644 cmake/Platform.cmake create mode 100644 cmake/Version.cmake create mode 100644 plugins/cffadaptor/src/CMakeLists.txt create mode 100644 resources/forms/CMakeLists.txt create mode 100644 resources/images/ch.openboard.OpenBoard.svg create mode 100644 resources/linux/ch.openboard.OpenBoard.desktop create mode 100644 resources/linux/ch.openboard.application-ubz.svg create mode 100644 resources/linux/ch.openboard.openboard-ubz.xml rename resources/{etc => template}/asyncAPI.js (100%) rename resources/{etc => template}/img/loading.gif (100%) rename resources/{etc => template}/intranet-podcast-metadata.template (100%) rename resources/{etc => template}/npapi-wrapper.application.x-shockwave-flash.swf.htm (100%) rename resources/{etc => template}/npapi-wrapper.config.xml (100%) create mode 100644 src/adaptors/CMakeLists.txt create mode 100644 src/api/CMakeLists.txt create mode 100644 src/board/CMakeLists.txt create mode 100644 src/core/CMakeLists.txt create mode 100644 src/desktop/CMakeLists.txt create mode 100644 src/document/CMakeLists.txt create mode 100644 src/domain/CMakeLists.txt create mode 100644 src/frameworks/CMakeLists.txt create mode 100644 src/globals/CMakeLists.txt create mode 100644 src/gui/CMakeLists.txt create mode 100644 src/network/CMakeLists.txt create mode 100644 src/pdf-merger/CMakeLists.txt create mode 100644 src/pdf/CMakeLists.txt create mode 100644 src/podcast/CMakeLists.txt create mode 100644 src/tools/CMakeLists.txt create mode 100644 src/web/CMakeLists.txt diff --git a/.gitignore b/.gitignore index 46f6fb9f5..3b1d44dc8 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ Thumbs.db *.vcproj* *.ncb *.pro.user +*.txt.user *.idb .project .settings diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 000000000..65b487911 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,234 @@ +cmake_minimum_required(VERSION 3.16) + +# ========================================================================== +# OpenBoard cmake build file +# +# Configuration variables: +# CMAKE_INSTALL_PREFIX +# Path to install prefix, defaults to /usr/local (see cmake documentation) +# Typically set to /usr or /opt +# SYSCONF_INSTALL_DIR +# Path to config file prefix +# Typically set to /etc, defaults to /opt/openboard/etc if CMAKE_INSTALL_PREFIX is /opt +# QT_VERSION +# Qt Version to use +# Set to 5 or 6, defaults to 5 +# +# Typical invocation +# cmake -S <srcdir> -B <builddir> -DCMAKE_INSTALL_PREFIX:PATH=/usr -DSYSCONF_INSTALL_DIR:PATH=/etc +# or +# cmake -S <srcdir> -B <builddir> -DCMAKE_INSTALL_PREFIX:PATH=/opt +# +# Build and install +# cmake --build . [-j<n>] +# DESTDIR=<installdir> cmake --install . +# ========================================================================== + +# ========================================================================== +# Basic project information +# +# The project will now be named all lowercase on all platforms +# ========================================================================== + +project(openboard VERSION 1.7.0 LANGUAGES CXX) + +set(VERSION_TYPE a) # a = alpha, b = beta, rc = release candidate, r = release, other => error +set(VERSION_BUILD 1027) + +include(cmake/Version.cmake) +include(cmake/Platform.cmake) + +# ========================================================================== +# Configuration options +# ========================================================================== + +set(QT_VERSION 5 CACHE STRING "Qt major version number to use - 5 or 6") + +# Internal setting +set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication - do not change") + + +# ========================================================================== +# Non-source file locations +# ========================================================================== + +set(OPENBOARD_QRC_FILE resources/OpenBoard.qrc) + +set(OPENBOARD_FORMS_DIR resources/forms src/web/simplebrowser) +set(OPENBOARD_TS_DIR resources/i18n) +set(OPENBOARD_FONT_DIR resources/customizations resources/fonts) +set(OPENBOARD_ETC_DIR resources/etc) +set(OPENBOARD_LIBRARY_DIR resources/library) +set(OPENBOARD_TEMPLATE_DIR resources/template) + +set(OPENBOARD_ICON_FILE resources/images/ch.openboard.OpenBoard.svg) + +if(LINUX) + set(OPENBOARD_DESKTOP_FILE resources/linux/ch.openboard.OpenBoard.desktop) + set(OPENBOARD_MIMETYPE_FILE resources/linux/ch.openboard.openboard-ubz.xml) + set(OPENBOARD_MIMEICON_FILE resources/linux/ch.openboard.application-ubz.svg) +endif() + + +# ========================================================================== +# Basic compiler settings +# ========================================================================== + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) + +list(APPEND CMAKE_AUTOUIC_SEARCH_PATHS + ${OPENBOARD_FORMS_DIR} +) + +# OpenMP support +include(FindOpenMP) + +if(OPENMP_FOUND) + string(APPEND CMAKE_CXX_FLAGS " " ${OpenMP_CXX_FLAGS}) +endif() + + +# ========================================================================== +# Target and dependencies +# +# Note: the executable is using lowercase on all platforms +# ========================================================================== + +add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE) + +# manage dependencies +include(cmake/DependencyQt.cmake) +include(cmake/DependencyOpenSSL.cmake) +include(cmake/DependencyPoppler.cmake) +include(cmake/DependencyZlib.cmake) + +if(LINUX) + include(cmake/DependencyQuaZip.cmake) + include(cmake/DependencyFFmpeg.cmake) + include(cmake/DependencyX11.cmake) +elseif(WIN32) + include(cmake/FetchContentFreetype.cmake) + include(cmake/FetchContentQuaZip.cmake) +elseif(MACOS) +# TODO +endif() + +# add source path to include directories +target_include_directories(${PROJECT_NAME} PRIVATE + src +) + +# add sources from subdirectories +add_subdirectory(src/adaptors) +add_subdirectory(src/api) +add_subdirectory(src/board) +add_subdirectory(src/core) +add_subdirectory(src/desktop) +add_subdirectory(src/document) +add_subdirectory(src/domain) +add_subdirectory(src/frameworks) +add_subdirectory(src/globals) +add_subdirectory(src/gui) +add_subdirectory(src/network) +add_subdirectory(src/pdf) +add_subdirectory(src/pdf-merger) +add_subdirectory(src/podcast) +add_subdirectory(src/singleapplication) +add_subdirectory(src/tools) +add_subdirectory(src/web) +add_subdirectory(plugins/cffadaptor/src) +add_subdirectory(resources/forms) + +# statically link singleapplication +target_link_libraries(${PROJECT_NAME} + SingleApplication::SingleApplication +) + +# platform specific framework definitions and libraries +if(WIN32) + target_link_libraries(${PROJECT_NAME} + User32 + Gdi32 + AdvApi32 + Ole32 + ) +elseif(MACOS) + target_compile_definitions(${PROJECT_NAME} PRIVATE + Q_WS_MACX + ) + + target_link_libraries(${PROJECT_NAME} + "-framework AVFoundation" + "-framework Carbon" + "-framework Cocoa" + "-framework CoreMedia" + "-framework Foundation" + ) +endif() + + +# ========================================================================== +# Resources +# ========================================================================== + +qt_add_resources(OPENBOARD_RESOURCES ${OPENBOARD_QRC_FILE}) +target_sources(${PROJECT_NAME} PRIVATE ${OPENBOARD_RESOURCES}) + + +# ========================================================================== +# Translations +# ========================================================================== + +file(GLOB OPENBOARD_TS_FILES ${OPENBOARD_TS_DIR}/*.ts) +set_source_files_properties(${OPENBOARD_TS_FILES} PROPERTIES OUTPUT_LOCATION ${PROJECT_BINARY_DIR}/i18n) +qt_add_translation(QM_FILES ${OPENBOARD_TS_FILES}) +target_sources(${PROJECT_NAME} PRIVATE ${QM_FILES}) + + +# ========================================================================== +# Installation +# ========================================================================== + +if(LINUX) + include(GNUInstallDirs) + + # set relative install paths + if(CMAKE_INSTALL_PREFIX STREQUAL "/opt") + set(OPENBOARD_INSTALL_SYSCONFDIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc) + set(OPENBOARD_INSTALL_DATADIR ${PROJECT_NAME}) + set(CMAKE_INSTALL_BINDIR "/usr/bin") + set(CMAKE_INSTALL_DATAROOTDIR "/usr/share") + else() + set(SYSCONF_INSTALL_DIR ${CMAKE_INSTALL_SYSCONFDIR} CACHE PATH + "Install directory for system-wide configuration files") + set(OPENBOARD_INSTALL_SYSCONFDIR ${SYSCONF_INSTALL_DIR}/${PROJECT_NAME}) + set(OPENBOARD_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}) + endif() + + # set absolute install paths + set(OPENBOARD_ETC_PREFIX "${OPENBOARD_INSTALL_SYSCONFDIR}") + set(OPENBOARD_APP_PREFIX "${CMAKE_INSTALL_PREFIX}/${OPENBOARD_INSTALL_DATADIR}") + + message(STATUS "OpenBoard ETC_PREFIX is " ${OPENBOARD_ETC_PREFIX}) + message(STATUS "OpenBoard APP_PREFIX is " ${OPENBOARD_APP_PREFIX}) + + target_compile_definitions(${PROJECT_NAME} PRIVATE + ETC_PREFIX="${OPENBOARD_ETC_PREFIX}" + APP_PREFIX="${OPENBOARD_APP_PREFIX}" + ) + + # install files + install(TARGETS ${PROJECT_NAME} RUNTIME) + install(DIRECTORY ${OPENBOARD_FONT_DIR} DESTINATION ${OPENBOARD_INSTALL_DATADIR}) + install(DIRECTORY ${OPENBOARD_ETC_DIR}/ DESTINATION ${OPENBOARD_INSTALL_SYSCONFDIR}) + install(DIRECTORY ${OPENBOARD_LIBRARY_DIR} DESTINATION ${OPENBOARD_INSTALL_DATADIR}) + install(DIRECTORY ${OPENBOARD_TEMPLATE_DIR} DESTINATION ${OPENBOARD_INSTALL_DATADIR}) + install(DIRECTORY ${PROJECT_BINARY_DIR}/i18n DESTINATION ${OPENBOARD_INSTALL_DATADIR}) + install(FILES ${OPENBOARD_ICON_FILE} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps) + install(FILES ${OPENBOARD_DESKTOP_FILE} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) + install(FILES ${OPENBOARD_MIMETYPE_FILE} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mime/packages) + install(FILES ${OPENBOARD_MIMEICON_FILE} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/mimetypes) +endif() diff --git a/cmake/DependencyFFmpeg.cmake b/cmake/DependencyFFmpeg.cmake new file mode 100644 index 000000000..c652432e0 --- /dev/null +++ b/cmake/DependencyFFmpeg.cmake @@ -0,0 +1,12 @@ +# Find FFmpeg +# +# FFmpeg only supports PkgConfig + +find_package(PkgConfig REQUIRED) +pkg_check_modules(FFmpeg REQUIRED IMPORTED_TARGET libavcodec libavformat libavutil libswresample libswscale) + +if (FFmpeg_FOUND) + target_link_libraries(${PROJECT_NAME} + PkgConfig::FFmpeg + ) +endif() diff --git a/cmake/DependencyOpenSSL.cmake b/cmake/DependencyOpenSSL.cmake new file mode 100644 index 000000000..e10ba1672 --- /dev/null +++ b/cmake/DependencyOpenSSL.cmake @@ -0,0 +1,7 @@ +# Find OpenSSL + +find_package(OpenSSL 1.1 REQUIRED) + +target_link_libraries(${PROJECT_NAME} + OpenSSL::Crypto +) diff --git a/cmake/DependencyPoppler.cmake b/cmake/DependencyPoppler.cmake new file mode 100644 index 000000000..b25d4af20 --- /dev/null +++ b/cmake/DependencyPoppler.cmake @@ -0,0 +1,20 @@ +# Find poppler + +find_package(Poppler QUIET COMPONENTS Core Cpp) + +if (Poppler_FOUND) + target_link_libraries(${PROJECT_NAME} + Poppler::Core + Poppler::Cpp + ) +else() + find_package(PkgConfig REQUIRED) + pkg_check_modules(Poppler REQUIRED IMPORTED_TARGET poppler poppler-cpp) + + if (Poppler_FOUND) + target_link_libraries(${PROJECT_NAME} + PkgConfig::Poppler + ) + endif() + +endif() diff --git a/cmake/DependencyQt.cmake b/cmake/DependencyQt.cmake new file mode 100644 index 000000000..d8d0a1339 --- /dev/null +++ b/cmake/DependencyQt.cmake @@ -0,0 +1,39 @@ +# Find supported Qt version + +set(QT_COMPONENTS + Concurrent + DBus + Multimedia + MultimediaWidgets + Network + PrintSupport + Svg + UiTools + WebEngineWidgets + Xml +) + +if(QT_VERSION STREQUAL "5") + find_package(Qt5 5.12 REQUIRED COMPONENTS + ${QT_COMPONENTS} + LinguistTools + ) +elseif(QT_VERSION STREQUAL "6") + find_package(Qt6 6.2 REQUIRED COMPONENTS + ${QT_COMPONENTS} + SvgWidgets + LinguistTools + ) + + target_link_libraries(${PROJECT_NAME} + Qt6::SvgWidgets + ) +else() + message(FATAL_ERROR "Qt Version ${QT_VERSION} not supported") +endif() + +list(TRANSFORM QT_COMPONENTS PREPEND Qt::) + +target_link_libraries(${PROJECT_NAME} + ${QT_COMPONENTS} +) diff --git a/cmake/DependencyQuaZip.cmake b/cmake/DependencyQuaZip.cmake new file mode 100644 index 000000000..bd37bac5e --- /dev/null +++ b/cmake/DependencyQuaZip.cmake @@ -0,0 +1,43 @@ +# Find QuaZip + +find_package(QuaZip-Qt${QT_VERSION} 1.0 QUIET) + +if(QuaZip-Qt${QT_VERSION}_FOUND) + target_link_libraries(openboard + QuaZip::QuaZip + ) +else() + # Try to find the package using pkg-config with several names + find_package(PkgConfig REQUIRED) + + pkg_check_modules(QuaZip QUIET IMPORTED_TARGET quazip-qt${QT_VERSION}) + + if(NOT QuaZip_FOUND) + pkg_check_modules(QuaZip QUIET IMPORTED_TARGET quazip1-qt${QT_VERSION}) + endif() + + if(NOT QuaZip_FOUND) + pkg_check_modules(QuaZip QUIET IMPORTED_TARGET libquazip${QT_VERSION}-1) + endif() + + if(NOT QuaZip_FOUND) + pkg_check_modules(QuaZip QUIET IMPORTED_TARGET quazip${QT_VERSION}) + endif() + + if(QuaZip_FOUND) + message(STATUS "Found QuaZip version " ${QuaZip_VERSION}) + target_link_libraries(${PROJECT_NAME} + PkgConfig::QuaZip + ) + else() + # Just assume default directories of QuaZip < 1.0 + message(STATUS "QuaZip not found, assuming default include directory " /usr/include/quazip${QT_VERSION}) + target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE + /usr/include/quazip${QT_VERSION} + ) + target_link_libraries(${PROJECT_NAME} + quazip${QT_VERSION} + ) + endif() +endif() + diff --git a/cmake/DependencyX11.cmake b/cmake/DependencyX11.cmake new file mode 100644 index 000000000..f630160b7 --- /dev/null +++ b/cmake/DependencyX11.cmake @@ -0,0 +1,18 @@ +# Find FFmpeg + +find_package(X11 QUIET) + +if (X11_FOUND) + target_link_libraries(${PROJECT_NAME} + X11 + ) +else() + find_package(PkgConfig REQUIRED) + pkg_check_modules(X11 REQUIRED x11) + + if (X11_FOUND) + target_link_libraries(${PROJECT_NAME} + PkgConfig::X11 + ) + endif() +endif() diff --git a/cmake/DependencyZlib.cmake b/cmake/DependencyZlib.cmake new file mode 100644 index 000000000..d3e8fb651 --- /dev/null +++ b/cmake/DependencyZlib.cmake @@ -0,0 +1,6 @@ +# Find zlib + +find_package(ZLIB REQUIRED) +target_link_libraries(${PROJECT_NAME} + z +) diff --git a/cmake/FetchContentFreetype.cmake b/cmake/FetchContentFreetype.cmake new file mode 100644 index 000000000..2aa5e318e --- /dev/null +++ b/cmake/FetchContentFreetype.cmake @@ -0,0 +1,13 @@ +# Fetch Freetype + +include(FetchContent) + +FetchContent_Declare( + Freetype + GIT_REPOSITORY https://gitlab.freedesktop.org/freetype/freetype.git + GIT_TAG VER-2-12-1 +) + +FetchContent_MakeAvailable( + Freetype +) diff --git a/cmake/FetchContentPoppler.cmake b/cmake/FetchContentPoppler.cmake new file mode 100644 index 000000000..74097bcf6 --- /dev/null +++ b/cmake/FetchContentPoppler.cmake @@ -0,0 +1,18 @@ +# Fetch libpoppler + +include(FetchContent) + +FetchContent_Declare( + Poppler + GIT_REPOSITORY https://gitlab.freedesktop.org/poppler/poppler.git + GIT_TAG poppler-22.08.0 +) + +FetchContent_MakeAvailable( + Poppler +) + +target_link_libraries(${PROJECT_NAME} + Poppler::Core + Poppler::Cpp +) diff --git a/cmake/FetchContentQuaZip.cmake b/cmake/FetchContentQuaZip.cmake new file mode 100644 index 000000000..fe529b1b7 --- /dev/null +++ b/cmake/FetchContentQuaZip.cmake @@ -0,0 +1,23 @@ +# Fetch QuaZip + +include(FetchContent) + +if(QT_VERSION STREQUAL "5") + set(QUAZIP_QT_MAJOR_VERSION 5 CACHE STRING "QuaZip Qt version") +elseif(QT_VERSION STREQUAL "6") + set(QUAZIP_QT_MAJOR_VERSION 6) +endif() + +FetchContent_Declare( + QuaZip + GIT_REPOSITORY https://github.com/stachenov/quazip.git + GIT_TAG v1.3 +) + +FetchContent_MakeAvailable( + QuaZip +) + +target_link_libraries(${PROJECT_NAME} + QuaZip::QuaZip +) diff --git a/cmake/FetchContentXpdf.cmake b/cmake/FetchContentXpdf.cmake new file mode 100644 index 000000000..6a05b2110 --- /dev/null +++ b/cmake/FetchContentXpdf.cmake @@ -0,0 +1,28 @@ +# Fetch xpdf + +include(FetchContent) + +if(QT_VERSION STREQUAL "5") + set(CMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets TRUE) + set(CMAKE_DISABLE_FIND_PACKAGE_Qt4Widgets TRUE) +elseif(QT_VERSION STREQUAL "6") + set(CMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets TRUE) + set(CMAKE_DISABLE_FIND_PACKAGE_Qt4Widgets TRUE) +endif() + +set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) + +FetchContent_Declare( + Xpdf + URL https://dl.xpdfreader.com/xpdf-4.04.tar.gz +) + +FetchContent_MakeAvailable( + Xpdf +) +# this does not work. Xpdf does not build a library for reuse, it only builds executable tools +target_link_libraries(${PROJECT_NAME} + goo + fofi + splash +) diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake new file mode 100644 index 000000000..4085b3d5c --- /dev/null +++ b/cmake/Platform.cmake @@ -0,0 +1,16 @@ +# +# Define LINUX and MACOS platform specifiers +# Set platform specific variables +# + +if(UNIX) + if(APPLE) + set(MACOS 1) + else() + set(LINUX 1) + endif() +endif() + +if(MACOS) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) +endif() diff --git a/cmake/Version.cmake b/cmake/Version.cmake new file mode 100644 index 000000000..08292aed6 --- /dev/null +++ b/cmake/Version.cmake @@ -0,0 +1,23 @@ +# +# Version +# + +set(VERSION "${${PROJECT_NAME}_VERSION}-${VERSION_TYPE}.${VERSION_BUILD}") + +if(VERSION_TYPE STREQUAL "r") + set(VERSION "${${PROJECT_NAME}_VERSION}") +endif() + +if(WIN32) + set(VERSION_RC "${${PROJECT_NAME}_VERSION_MAJOR},${${PROJECT_NAME}_VERSION_MINOR},${${PROJECT_NAME}_VERSION_PATCH},${VERSION_TYPE},${VERSION_BUILD}") +else() + set(VERSION_RC "${${PROJECT_NAME}_VERSION_MAJOR},${${PROJECT_NAME}_VERSION_MINOR},${${PROJECT_NAME}_VERSION_PATCH},${VERSION_TYPE}") +endif() + +string(REPLACE "a" "160" VERSION_RC ${VERSION_RC}) # 0xA0 +string(REPLACE "b" "176" VERSION_RC ${VERSION_RC}) # 0xB0 +string(REPLACE "rc" "192" VERSION_RC ${VERSION_RC}) # 0xC0 +string(REPLACE "r" "240" VERSION_RC ${VERSION_RC}) # 0xF0 + +add_compile_definitions(UBVERSION="${VERSION}") +add_compile_definitions(UBVERSION_RC=${VERSION_RC}) diff --git a/plugins/cffadaptor/src/CMakeLists.txt b/plugins/cffadaptor/src/CMakeLists.txt new file mode 100644 index 000000000..6109d8fb2 --- /dev/null +++ b/plugins/cffadaptor/src/CMakeLists.txt @@ -0,0 +1,7 @@ +target_sources(openboard PRIVATE + UBCFFAdaptor.cpp +) + +target_include_directories(${PROJECT_NAME} PRIVATE + . +) diff --git a/resources/forms/CMakeLists.txt b/resources/forms/CMakeLists.txt new file mode 100644 index 000000000..554b52e93 --- /dev/null +++ b/resources/forms/CMakeLists.txt @@ -0,0 +1,13 @@ +qt_add_resources(${PROJECT_NAME} + blackoutWidget.ui + brushProperties.ui + capturePublishing.ui + CMakeLists.txt + documents.ui + intranetPodcastPublishingDialog.ui + mainWindow.ui + preferences.ui + preferences.ui.autosave + trapFlash.ui + youTubePublishingDialog.ui +) diff --git a/resources/images/ch.openboard.OpenBoard.svg b/resources/images/ch.openboard.OpenBoard.svg new file mode 100644 index 000000000..4eecaaa2b --- /dev/null +++ b/resources/images/ch.openboard.OpenBoard.svg @@ -0,0 +1,4 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" version="1"> + <path fill="#505556" d="M451 89c10 0 28 13 34 25l5 14 1 111c-1 105-1 105-3 111-5 14-15 24-30 30l-6 2h-70l-71 1-59 59-61 60v-59l-1-59-65-2c-64 0-64 0-70-2-16-6-29-20-32-36V126c4-15 15-29 30-35l6-2 169-1 169 1m-18 26H222c-149 0-156 0-160 2-5 2-10 8-12 13l-1 106v102l3 6c2 4 4 6 8 8l5 3h74l75 1v42l1 43c1 1 21-19 45-42l44-43 72-1c81 0 75 1 82-7l5-8V131c-3-10-11-16-21-16"/> + <path fill="#f48c4f" d="M433 116l-20 35-27 45c-15 23-56 75-65 84-4 5-11 7-15 6-7-1-11-10-8-17a570 570 0 0 1 65-128l62-92c27-40 27-40 38-40 5 0 7 0 11 3s8 9 8 14-2 9-17 35l-14 26"/> +</svg> diff --git a/resources/linux/ch.openboard.OpenBoard.desktop b/resources/linux/ch.openboard.OpenBoard.desktop new file mode 100644 index 000000000..f7da8c44d --- /dev/null +++ b/resources/linux/ch.openboard.OpenBoard.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=OpenBoard +Comment=OpenBoard, an interactive white board application +Exec=openboard %f +Icon=ch.openboard.OpenBoard +StartupNotify=true +Terminal=false +Type=Application +MimeType=application/ubz +Categories=Education; diff --git a/resources/linux/ch.openboard.application-ubz.svg b/resources/linux/ch.openboard.application-ubz.svg new file mode 100644 index 000000000..0320a2c88 --- /dev/null +++ b/resources/linux/ch.openboard.application-ubz.svg @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="1024px" height="1024px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" xmlns:xlink="http://www.w3.org/1999/xlink"> +<g><path style="opacity:0.063" fill="#000000" d="M 163.5,1.5 C 264.834,1.33334 366.167,1.5 467.5,2C 497.021,2.80882 525.688,8.14215 553.5,18C 570.998,25.242 586.664,35.242 600.5,48C 670.167,114.333 739.833,180.667 809.5,247C 823.73,260.561 837.23,274.728 850,289.5C 872.244,321.014 885.911,356.014 891,394.5C 893.054,408.43 894.388,422.43 895,436.5C 895.667,610.167 895.667,783.833 895,957.5C 894.499,967.366 891.332,976.199 885.5,984C 877.748,989.444 869.081,992.444 859.5,993C 627.5,993.667 395.5,993.667 163.5,993C 153.634,992.499 144.801,989.332 137,983.5C 131.556,975.748 128.556,967.081 128,957.5C 127.333,650.833 127.333,344.167 128,37.5C 128.556,27.9189 131.556,19.2522 137,11.5C 145.004,5.79754 153.838,2.46421 163.5,1.5 Z"/></g> +<g><path style="opacity:1" fill="#ebebeb" d="M 445.5,15.5 C 446.301,17.0418 446.634,18.7085 446.5,20.5C 451.179,20.3342 455.845,20.5008 460.5,21C 461.833,21.6667 461.833,22.3333 460.5,23C 461.448,23.4828 462.448,23.6495 463.5,23.5C 463.5,24.5 463.5,25.5 463.5,26.5C 465.877,26.7845 468.044,26.7845 470,26.5C 470.5,27.6667 471.333,28.5 472.5,29C 474.577,29.1922 476.577,29.6922 478.5,30.5C 477.494,31.3957 477.494,32.0623 478.5,32.5C 479.768,31.5721 481.101,31.4054 482.5,32C 484.298,35.1559 486.798,35.9892 490,34.5C 490.956,35.5786 491.789,36.7453 492.5,38C 494.9,38.1858 497.234,38.6858 499.5,39.5C 502.511,41.6634 505.677,43.6634 509,45.5C 509.333,45.1667 509.667,44.8333 510,44.5C 513.602,48.0509 517.769,50.7176 522.5,52.5C 523.345,55.4122 525.012,56.4122 527.5,55.5C 528.541,57.9913 529.374,57.9913 530,55.5C 531.824,56.7487 531.657,57.9153 529.5,59C 530.5,59.3333 531.5,59.6667 532.5,60C 533.859,62.3336 535.693,64.1669 538,65.5C 538.333,64.5 538.667,63.5 539,62.5C 541.668,63.9804 541.835,65.4804 539.5,67C 541.745,69.0875 544.412,70.4208 547.5,71C 547.5,72 547.5,73 547.5,74C 550.032,74.6189 552.365,75.6189 554.5,77C 553.655,78.5581 554.321,79.5581 556.5,80C 556.167,80.3333 555.833,80.6667 555.5,81C 557.324,82.9893 559.324,84.8226 561.5,86.5C 561.291,87.086 560.957,87.586 560.5,88C 562,88.8333 563.167,90 564,91.5C 565.544,88.7364 566.711,88.9031 567.5,92C 566.911,93.8733 567.578,95.54 569.5,97C 568.5,97.3333 567.5,97.6667 566.5,98C 567.77,98.8996 568.77,100.066 569.5,101.5C 570.251,100.624 570.751,99.624 571,98.5C 571.309,99.7659 571.809,100.933 572.5,102C 571.044,102.423 570.544,103.256 571,104.5C 572,105.833 573,107.167 574,108.5C 574.667,107.167 575.333,107.167 576,108.5C 578.52,113.876 581.52,118.876 585,123.5C 585.617,124.449 585.451,125.282 584.5,126C 587.362,127.786 588.028,130.119 586.5,133C 587.76,134.113 588.927,134.28 590,133.5C 591.372,136.726 592.538,140.059 593.5,143.5C 593.291,144.086 592.957,144.586 592.5,145C 593.893,146.171 594.727,147.671 595,149.5C 596,149.833 597,150.167 598,150.5C 598.912,153.586 600.079,156.586 601.5,159.5C 600.098,160.842 600.431,161.676 602.5,162C 601.549,162.718 601.383,163.551 602,164.5C 602.718,163.549 603.551,163.383 604.5,164C 603.707,165.085 603.04,166.252 602.5,167.5C 605.39,169.266 607.057,171.433 607.5,174C 606.833,174.333 606.167,174.667 605.5,175C 606.669,177.007 607.335,179.173 607.5,181.5C 608.552,181.351 609.552,181.517 610.5,182C 607.707,184.734 608.041,185.734 611.5,185C 609.606,186.101 608.939,187.434 609.5,189C 610.87,190.441 611.87,192.108 612.5,194C 612.423,196.111 612.089,198.111 611.5,200C 612.138,203.935 612.804,207.769 613.5,211.5C 612.793,219.146 612.46,226.813 612.5,234.5C 613.5,234.5 614.5,234.5 615.5,234.5C 618.421,235.194 621.421,236.027 624.5,237C 626.607,239.227 628.94,241.227 631.5,243C 635.276,243.592 638.943,244.592 642.5,246C 645.124,248.658 647.791,251.325 650.5,254C 650.167,254.333 649.833,254.667 649.5,255C 652.323,257.489 655.157,259.989 658,262.5C 659.667,262.5 661.333,262.5 663,262.5C 667.686,265.119 672.52,267.452 677.5,269.5C 678.086,269.291 678.586,268.957 679,268.5C 681.058,269.109 681.891,270.109 681.5,271.5C 684.125,270.62 686.458,271.287 688.5,273.5C 689.716,272.998 690.883,272.665 692,272.5C 692.333,273.167 692.667,273.833 693,274.5C 694.49,273.272 695.99,273.272 697.5,274.5C 694.908,280.024 691.575,285.024 687.5,289.5C 686.132,288.694 684.799,287.694 683.5,286.5C 682.264,287.246 680.93,287.579 679.5,287.5C 679.349,284.282 678.516,283.949 677,286.5C 675.796,285.529 675.296,284.529 675.5,283.5C 674.914,283.709 674.414,284.043 674,284.5C 670.717,283.391 667.55,282.057 664.5,280.5C 662.877,281.476 661.543,280.976 660.5,279C 650.411,277.605 642.078,273.772 635.5,267.5C 634.5,267 633.5,266.5 632.5,266C 632.833,265.667 633.167,265.333 633.5,265C 630.789,263.739 628.622,261.906 627,259.5C 626.667,260.167 626.333,260.833 626,261.5C 625.667,260.167 625.333,258.833 625,257.5C 623.025,257.492 621.191,256.492 619.5,254.5C 622.153,249.811 621.653,249.477 618,253.5C 617.691,252.234 617.191,251.067 616.5,250C 617.167,249.667 617.833,249.333 618.5,249C 616.153,248.154 614.32,246.654 613,244.5C 611.334,245.34 611.167,244.84 612.5,243C 610.699,242.683 610.366,242.016 611.5,241C 609.117,240.935 608.45,240.102 609.5,238.5C 605.646,232.459 602.646,225.959 600.5,219C 601.791,216.91 601.124,215.576 598.5,215C 599.167,214.667 599.833,214.333 600.5,214C 598.243,211.885 597.243,209.552 597.5,207C 597.012,205.416 596.012,204.249 594.5,203.5C 595.902,202.158 595.569,201.324 593.5,201C 594.022,200.439 594.355,199.772 594.5,199C 592.65,197.474 591.15,195.641 590,193.5C 590.698,191.236 590.198,189.403 588.5,188C 588.833,187.667 589.167,187.333 589.5,187C 588.072,185.084 587.072,182.917 586.5,180.5C 585.15,179.05 583.484,178.383 581.5,178.5C 579.472,173.485 577.805,167.652 576.5,161C 577.833,158.333 577.833,155.667 576.5,153C 575,151.5 573.5,150 572,148.5C 571.667,149.5 571.333,150.5 571,151.5C 570.301,147.817 569.135,144.317 567.5,141C 568.167,140.667 568.833,140.333 569.5,140C 567.064,137.293 565.564,134.127 565,130.5C 564.581,131.672 563.915,132.672 563,133.5C 562.383,132.551 562.549,131.718 563.5,131C 560.237,130.131 559.904,128.797 562.5,127C 559.833,126 559.833,125 562.5,124C 560.875,123.147 560.542,122.147 561.5,121C 559.616,120.784 557.949,120.117 556.5,119C 556.957,118.586 557.291,118.086 557.5,117.5C 555.639,115.112 554.306,112.446 553.5,109.5C 550.371,108.611 548.038,106.778 546.5,104C 546.833,103.667 547.167,103.333 547.5,103C 545.981,101.782 544.814,100.282 544,98.5C 542.984,99.6341 542.317,99.3008 542,97.5C 540.667,98.1667 539.333,98.8333 538,99.5C 536.193,97.2939 535.693,94.9606 536.5,92.5C 534.878,90.5614 533.044,90.228 531,91.5C 530.727,89.6711 529.893,88.1711 528.5,87C 528.833,86.6667 529.167,86.3333 529.5,86C 527.552,85.0168 525.718,83.8502 524,82.5C 523.383,81.5509 523.549,80.7175 524.5,80C 523.256,79.5439 522.423,80.0439 522,81.5C 520.625,79.6239 519.458,77.6239 518.5,75.5C 516.339,74.9649 514.339,74.1316 512.5,73C 515.41,68.7377 514.744,67.9043 510.5,70.5C 508.196,70.6907 505.862,70.3573 503.5,69.5C 503.815,67.7741 503.981,66.1075 504,64.5C 502.667,67.1667 501.333,67.1667 500,64.5C 499.549,66.9288 498.715,67.0955 497.5,65C 497.959,63.0573 496.959,61.724 494.5,61C 494.833,60.6667 495.167,60.3333 495.5,60C 492.809,60.792 490.142,60.4587 487.5,59C 488.28,57.927 488.113,56.7604 487,55.5C 486.667,55.8333 486.333,56.1667 486,56.5C 484.266,55.7511 482.433,55.2511 480.5,55C 481.696,54.3457 481.696,53.8457 480.5,53.5C 479.808,54.0253 479.308,54.6919 479,55.5C 477.225,53.6055 475.225,51.9389 473,50.5C 472.667,50.8333 472.333,51.1667 472,51.5C 471.682,49.9391 470.849,48.7724 469.5,48C 467.899,47.7266 466.399,47.2266 465,46.5C 464.586,46.9574 464.086,47.2907 463.5,47.5C 460.785,45.5922 457.785,44.2589 454.5,43.5C 455.025,42.8076 455.692,42.3076 456.5,42C 448.664,41.9725 440.664,41.4725 432.5,40.5C 435.131,38.9954 434.797,38.3287 431.5,38.5C 431.167,42.5 430.833,42.5 430.5,38.5C 428.089,38.8633 426.589,37.8633 426,35.5C 422.867,35.4336 419.7,35.4336 416.5,35.5C 415.086,34.5345 414.253,33.5345 414,32.5C 413.228,32.6448 412.561,32.9781 412,33.5C 402.577,32.6803 393.077,32.1803 383.5,32C 384.993,30.8438 384.826,30.0104 383,29.5C 381.848,31.5117 380.682,31.6783 379.5,30C 375.911,29.7931 372.411,29.2931 369,28.5C 365.591,29.6219 362.091,29.7886 358.5,29C 359.654,28.0862 359.487,27.2529 358,26.5C 357.193,30.449 356.693,30.449 356.5,26.5C 286.592,26.6738 218.259,27.0071 151.5,27.5C 151.5,23.5 151.5,19.5 151.5,15.5C 249.5,15.5 347.5,15.5 445.5,15.5 Z"/></g> +<g><path style="opacity:1" fill="#e2e2e2" d="M 445.5,15.5 C 469.764,14.6996 493.764,16.6996 517.5,21.5C 520.628,23.1741 522.961,25.6741 524.5,29C 532.321,34.08 539.988,39.4134 547.5,45C 547.167,45.3333 546.833,45.6667 546.5,46C 550.721,48.9369 554.721,52.1035 558.5,55.5C 559.795,56.0983 561.128,56.5983 562.5,57C 563.641,57.7412 563.641,58.5745 562.5,59.5C 563.274,60.7112 564.107,60.7112 565,59.5C 565.785,61.286 566.951,62.786 568.5,64C 568.043,64.414 567.709,64.914 567.5,65.5C 568.891,65.1086 569.891,65.9419 570.5,68C 570.167,68.3333 569.833,68.6667 569.5,69C 570.76,70.113 571.927,70.2797 573,69.5C 578.665,77.4158 584.331,84.7492 590,91.5C 590.333,91.1667 590.667,90.8333 591,90.5C 592.368,91.9931 592.535,93.4931 591.5,95C 597.605,102.56 602.938,110.56 607.5,119C 607.167,119.333 606.833,119.667 606.5,120C 608.878,122.211 609.878,124.711 609.5,127.5C 611.456,134.69 612.623,142.024 613,149.5C 613.497,147.19 613.663,144.857 613.5,142.5C 613.833,142.5 614.167,142.5 614.5,142.5C 614.58,165.508 614.247,188.508 613.5,211.5C 612.804,207.769 612.138,203.935 611.5,200C 612.089,198.111 612.423,196.111 612.5,194C 611.87,192.108 610.87,190.441 609.5,189C 608.939,187.434 609.606,186.101 611.5,185C 608.041,185.734 607.707,184.734 610.5,182C 609.552,181.517 608.552,181.351 607.5,181.5C 607.335,179.173 606.669,177.007 605.5,175C 606.167,174.667 606.833,174.333 607.5,174C 607.057,171.433 605.39,169.266 602.5,167.5C 603.04,166.252 603.707,165.085 604.5,164C 603.551,163.383 602.718,163.549 602,164.5C 601.383,163.551 601.549,162.718 602.5,162C 600.431,161.676 600.098,160.842 601.5,159.5C 600.079,156.586 598.912,153.586 598,150.5C 597,150.167 596,149.833 595,149.5C 594.727,147.671 593.893,146.171 592.5,145C 592.957,144.586 593.291,144.086 593.5,143.5C 592.538,140.059 591.372,136.726 590,133.5C 588.927,134.28 587.76,134.113 586.5,133C 588.028,130.119 587.362,127.786 584.5,126C 585.451,125.282 585.617,124.449 585,123.5C 581.52,118.876 578.52,113.876 576,108.5C 575.333,107.167 574.667,107.167 574,108.5C 573,107.167 572,105.833 571,104.5C 570.544,103.256 571.044,102.423 572.5,102C 571.809,100.933 571.309,99.7659 571,98.5C 570.751,99.624 570.251,100.624 569.5,101.5C 568.77,100.066 567.77,98.8996 566.5,98C 567.5,97.6667 568.5,97.3333 569.5,97C 567.578,95.54 566.911,93.8733 567.5,92C 566.711,88.9031 565.544,88.7364 564,91.5C 563.167,90 562,88.8333 560.5,88C 560.957,87.586 561.291,87.086 561.5,86.5C 559.324,84.8226 557.324,82.9893 555.5,81C 555.833,80.6667 556.167,80.3333 556.5,80C 554.321,79.5581 553.655,78.5581 554.5,77C 552.365,75.6189 550.032,74.6189 547.5,74C 547.5,73 547.5,72 547.5,71C 544.412,70.4208 541.745,69.0875 539.5,67C 541.835,65.4804 541.668,63.9804 539,62.5C 538.667,63.5 538.333,64.5 538,65.5C 535.693,64.1669 533.859,62.3336 532.5,60C 531.5,59.6667 530.5,59.3333 529.5,59C 531.657,57.9153 531.824,56.7487 530,55.5C 529.374,57.9913 528.541,57.9913 527.5,55.5C 525.012,56.4122 523.345,55.4122 522.5,52.5C 517.769,50.7176 513.602,48.0509 510,44.5C 509.667,44.8333 509.333,45.1667 509,45.5C 505.677,43.6634 502.511,41.6634 499.5,39.5C 497.234,38.6858 494.9,38.1858 492.5,38C 491.789,36.7453 490.956,35.5786 490,34.5C 486.798,35.9892 484.298,35.1559 482.5,32C 481.101,31.4054 479.768,31.5721 478.5,32.5C 477.494,32.0623 477.494,31.3957 478.5,30.5C 476.577,29.6922 474.577,29.1922 472.5,29C 471.333,28.5 470.5,27.6667 470,26.5C 468.044,26.7845 465.877,26.7845 463.5,26.5C 463.5,25.5 463.5,24.5 463.5,23.5C 462.448,23.6495 461.448,23.4828 460.5,23C 461.833,22.3333 461.833,21.6667 460.5,21C 455.845,20.5008 451.179,20.3342 446.5,20.5C 446.634,18.7085 446.301,17.0418 445.5,15.5 Z"/></g> +<g><path style="opacity:1" fill="#d5d5d5" d="M 517.5,21.5 C 527.31,23.3266 536.643,26.3266 545.5,30.5C 545.389,31.1174 545.056,31.6174 544.5,32C 557.617,41.9976 570.117,52.8309 582,64.5C 586.294,70.1365 590.628,75.8031 595,81.5C 600.367,90.4301 604.867,99.0968 608.5,107.5C 609.309,109.028 609.976,110.694 610.5,112.5C 612.232,122.42 613.232,132.42 613.5,142.5C 613.663,144.857 613.497,147.19 613,149.5C 612.623,142.024 611.456,134.69 609.5,127.5C 609.878,124.711 608.878,122.211 606.5,120C 606.833,119.667 607.167,119.333 607.5,119C 602.938,110.56 597.605,102.56 591.5,95C 592.535,93.4931 592.368,91.9931 591,90.5C 590.667,90.8333 590.333,91.1667 590,91.5C 584.331,84.7492 578.665,77.4158 573,69.5C 571.927,70.2797 570.76,70.113 569.5,69C 569.833,68.6667 570.167,68.3333 570.5,68C 569.891,65.9419 568.891,65.1086 567.5,65.5C 567.709,64.914 568.043,64.414 568.5,64C 566.951,62.786 565.785,61.286 565,59.5C 564.107,60.7112 563.274,60.7112 562.5,59.5C 563.641,58.5745 563.641,57.7412 562.5,57C 561.128,56.5983 559.795,56.0983 558.5,55.5C 554.721,52.1035 550.721,48.9369 546.5,46C 546.833,45.6667 547.167,45.3333 547.5,45C 539.988,39.4134 532.321,34.08 524.5,29C 522.961,25.6741 520.628,23.1741 517.5,21.5 Z"/></g> +<g><path style="opacity:1" fill="#f0f0f0" d="M 687.5,289.5 C 684.412,294.68 681.078,299.68 677.5,304.5C 675.643,303.246 673.643,303.246 671.5,304.5C 670.808,303.975 670.308,303.308 670,302.5C 669,302.833 668,303.167 667,303.5C 665.482,301.652 663.649,300.152 661.5,299C 658.157,297.487 654.99,296.321 652,295.5C 651.586,295.957 651.086,296.291 650.5,296.5C 649.167,295.167 647.833,293.833 646.5,292.5C 645.914,292.709 645.414,293.043 645,293.5C 640.818,292.144 637.318,289.811 634.5,286.5C 633.914,286.709 633.414,287.043 633,287.5C 630.394,283.831 627.227,281.664 623.5,281C 622.167,279.333 620.833,277.667 619.5,276C 611.155,271.659 603.988,265.826 598,258.5C 597.667,258.833 597.333,259.167 597,259.5C 595.003,255.515 593.003,251.515 591,247.5C 590.086,248.654 589.253,248.487 588.5,247C 588.64,245.403 588.64,243.903 588.5,242.5C 587.624,241.749 586.624,241.249 585.5,241C 585.833,240.667 586.167,240.333 586.5,240C 583.786,235.108 580.453,230.608 576.5,226.5C 575.627,224.587 574.627,222.753 573.5,221C 574.747,219.506 574.747,218.006 573.5,216.5C 572.325,217.855 571.325,217.688 570.5,216C 572.497,214.847 572.83,213.347 571.5,211.5C 569.253,208.835 566.753,207.168 564,206.5C 562.783,204.48 562.617,202.48 563.5,200.5C 561.559,198.166 559.893,195.666 558.5,193C 559.833,192.333 559.833,191.667 558.5,191C 560.583,189.68 560.249,188.346 557.5,187C 557.957,186.586 558.291,186.086 558.5,185.5C 556.869,183.78 555.703,181.78 555,179.5C 554.667,179.833 554.333,180.167 554,180.5C 553.333,179.167 553.333,177.833 554,176.5C 554.654,177.696 555.154,177.696 555.5,176.5C 554.624,175.749 553.624,175.249 552.5,175C 553.696,174.346 553.696,173.846 552.5,173.5C 550.997,174.052 549.331,174.052 547.5,173.5C 547.701,170.031 546.701,167.198 544.5,165C 544.616,163.732 544.949,162.398 545.5,161C 544.833,160.667 544.167,160.333 543.5,160C 543.306,158.57 543.306,157.07 543.5,155.5C 542.687,154.186 541.687,153.019 540.5,152C 540.833,151.667 541.167,151.333 541.5,151C 540.234,150.691 539.067,150.191 538,149.5C 537.667,149.833 537.333,150.167 537,150.5C 536.716,148.114 535.716,147.448 534,148.5C 533.383,147.551 533.549,146.718 534.5,146C 533.552,145.517 532.552,145.351 531.5,145.5C 531.33,144.178 531.663,143.011 532.5,142C 531.552,141.517 530.552,141.351 529.5,141.5C 529.323,139.019 530.323,137.186 532.5,136C 531.552,135.517 530.552,135.351 529.5,135.5C 529.439,133.408 528.439,131.908 526.5,131C 527.683,128.845 527.35,126.845 525.5,125C 527.878,124.026 527.544,123.359 524.5,123C 525.571,121.175 524.904,120.008 522.5,119.5C 521.032,121.532 519.365,121.365 517.5,119C 517.833,118.667 518.167,118.333 518.5,118C 516.437,116.428 515.771,114.595 516.5,112.5C 514.73,111.18 514.397,109.68 515.5,108C 514.234,107.691 513.067,107.191 512,106.5C 511.577,107.956 510.744,108.456 509.5,108C 510.833,107 510.833,106 509.5,105C 510.357,104.311 511.023,103.478 511.5,102.5C 511.154,101.304 510.654,101.304 510,102.5C 509.781,101.062 509.281,99.7287 508.5,98.5C 508.167,99.1667 507.833,99.8333 507.5,100.5C 506.252,99.9598 505.085,99.2931 504,98.5C 503.125,100.513 501.791,100.513 500,98.5C 499.111,95.7213 497.944,93.0546 496.5,90.5C 493.51,90.4795 490.177,90.4795 486.5,90.5C 486.719,89.325 486.386,88.325 485.5,87.5C 484.575,88.6405 483.741,88.6405 483,87.5C 483.311,86.0654 483.145,84.7321 482.5,83.5C 480.577,82.6922 478.577,82.1922 476.5,82C 477.517,80.9505 477.684,79.7839 477,78.5C 476.107,79.7112 475.274,79.7112 474.5,78.5C 475.025,77.8076 475.692,77.3076 476.5,77C 475.333,76.5 474.5,75.6667 474,74.5C 471.667,75.8333 469.333,75.8333 467,74.5C 466.667,75.1667 466.333,75.8333 466,76.5C 464.034,73.7735 462.034,73.4402 460,75.5C 457.526,73.8023 456.192,71.8023 456,69.5C 454.044,69.6607 452.044,69.9941 450,70.5C 449.155,67.5878 447.488,66.5878 445,67.5C 444.667,66.5 444.333,65.5 444,64.5C 443.667,64.8333 443.333,65.1667 443,65.5C 439.924,64.7117 436.758,64.2117 433.5,64C 432.044,63.5774 431.544,62.7441 432,61.5C 434.054,63.5472 435.054,63.5472 435,61.5C 433.333,60.8333 431.667,60.1667 430,59.5C 425.921,60.0703 421.921,60.4036 418,60.5C 416.319,58.7059 414.486,58.2059 412.5,59C 411.888,57.6967 411.554,56.5301 411.5,55.5C 410.268,56.1445 408.935,56.3112 407.5,56C 408.089,59.3461 407.422,59.3461 405.5,56C 398.167,55.6667 390.833,55.3333 383.5,55C 382.789,53.7453 381.956,52.5786 381,51.5C 379.128,55.2653 378.295,55.2653 378.5,51.5C 377.914,51.7093 377.414,52.0426 377,52.5C 372.019,52.094 367.186,51.094 362.5,49.5C 361.304,49.8457 361.304,50.3457 362.5,51C 360.687,50.9536 359.021,51.1203 357.5,51.5C 356.585,50.6721 355.919,49.6721 355.5,48.5C 353,48.1667 350.5,47.8333 348,47.5C 282.642,47.5326 217.142,47.5326 151.5,47.5C 151.5,40.8333 151.5,34.1667 151.5,27.5C 218.259,27.0071 286.592,26.6738 356.5,26.5C 356.693,30.449 357.193,30.449 358,26.5C 359.487,27.2529 359.654,28.0862 358.5,29C 362.091,29.7886 365.591,29.6219 369,28.5C 372.411,29.2931 375.911,29.7931 379.5,30C 380.682,31.6783 381.848,31.5117 383,29.5C 384.826,30.0104 384.993,30.8438 383.5,32C 393.077,32.1803 402.577,32.6803 412,33.5C 412.561,32.9781 413.228,32.6448 414,32.5C 414.253,33.5345 415.086,34.5345 416.5,35.5C 419.7,35.4336 422.867,35.4336 426,35.5C 426.589,37.8633 428.089,38.8633 430.5,38.5C 430.833,42.5 431.167,42.5 431.5,38.5C 434.797,38.3287 435.131,38.9954 432.5,40.5C 440.664,41.4725 448.664,41.9725 456.5,42C 455.692,42.3076 455.025,42.8076 454.5,43.5C 457.785,44.2589 460.785,45.5922 463.5,47.5C 464.086,47.2907 464.586,46.9574 465,46.5C 466.399,47.2266 467.899,47.7266 469.5,48C 470.849,48.7724 471.682,49.9391 472,51.5C 472.333,51.1667 472.667,50.8333 473,50.5C 475.225,51.9389 477.225,53.6055 479,55.5C 479.308,54.6919 479.808,54.0253 480.5,53.5C 481.696,53.8457 481.696,54.3457 480.5,55C 482.433,55.2511 484.266,55.7511 486,56.5C 486.333,56.1667 486.667,55.8333 487,55.5C 488.113,56.7604 488.28,57.927 487.5,59C 490.142,60.4587 492.809,60.792 495.5,60C 495.167,60.3333 494.833,60.6667 494.5,61C 496.959,61.724 497.959,63.0573 497.5,65C 498.715,67.0955 499.549,66.9288 500,64.5C 501.333,67.1667 502.667,67.1667 504,64.5C 503.981,66.1075 503.815,67.7741 503.5,69.5C 505.862,70.3573 508.196,70.6907 510.5,70.5C 514.744,67.9043 515.41,68.7377 512.5,73C 514.339,74.1316 516.339,74.9649 518.5,75.5C 519.458,77.6239 520.625,79.6239 522,81.5C 522.423,80.0439 523.256,79.5439 524.5,80C 523.549,80.7175 523.383,81.5509 524,82.5C 525.718,83.8502 527.552,85.0168 529.5,86C 529.167,86.3333 528.833,86.6667 528.5,87C 529.893,88.1711 530.727,89.6711 531,91.5C 533.044,90.228 534.878,90.5614 536.5,92.5C 535.693,94.9606 536.193,97.2939 538,99.5C 539.333,98.8333 540.667,98.1667 542,97.5C 542.317,99.3008 542.984,99.6341 544,98.5C 544.814,100.282 545.981,101.782 547.5,103C 547.167,103.333 546.833,103.667 546.5,104C 548.038,106.778 550.371,108.611 553.5,109.5C 554.306,112.446 555.639,115.112 557.5,117.5C 557.291,118.086 556.957,118.586 556.5,119C 557.949,120.117 559.616,120.784 561.5,121C 560.542,122.147 560.875,123.147 562.5,124C 559.833,125 559.833,126 562.5,127C 559.904,128.797 560.237,130.131 563.5,131C 562.549,131.718 562.383,132.551 563,133.5C 563.915,132.672 564.581,131.672 565,130.5C 565.564,134.127 567.064,137.293 569.5,140C 568.833,140.333 568.167,140.667 567.5,141C 569.135,144.317 570.301,147.817 571,151.5C 571.333,150.5 571.667,149.5 572,148.5C 573.5,150 575,151.5 576.5,153C 577.833,155.667 577.833,158.333 576.5,161C 577.805,167.652 579.472,173.485 581.5,178.5C 583.484,178.383 585.15,179.05 586.5,180.5C 587.072,182.917 588.072,185.084 589.5,187C 589.167,187.333 588.833,187.667 588.5,188C 590.198,189.403 590.698,191.236 590,193.5C 591.15,195.641 592.65,197.474 594.5,199C 594.355,199.772 594.022,200.439 593.5,201C 595.569,201.324 595.902,202.158 594.5,203.5C 596.012,204.249 597.012,205.416 597.5,207C 597.243,209.552 598.243,211.885 600.5,214C 599.833,214.333 599.167,214.667 598.5,215C 601.124,215.576 601.791,216.91 600.5,219C 602.646,225.959 605.646,232.459 609.5,238.5C 608.45,240.102 609.117,240.935 611.5,241C 610.366,242.016 610.699,242.683 612.5,243C 611.167,244.84 611.334,245.34 613,244.5C 614.32,246.654 616.153,248.154 618.5,249C 617.833,249.333 617.167,249.667 616.5,250C 617.191,251.067 617.691,252.234 618,253.5C 621.653,249.477 622.153,249.811 619.5,254.5C 621.191,256.492 623.025,257.492 625,257.5C 625.333,258.833 625.667,260.167 626,261.5C 626.333,260.833 626.667,260.167 627,259.5C 628.622,261.906 630.789,263.739 633.5,265C 633.167,265.333 632.833,265.667 632.5,266C 633.5,266.5 634.5,267 635.5,267.5C 642.078,273.772 650.411,277.605 660.5,279C 661.543,280.976 662.877,281.476 664.5,280.5C 667.55,282.057 670.717,283.391 674,284.5C 674.414,284.043 674.914,283.709 675.5,283.5C 675.296,284.529 675.796,285.529 677,286.5C 678.516,283.949 679.349,284.282 679.5,287.5C 680.93,287.579 682.264,287.246 683.5,286.5C 684.799,287.694 686.132,288.694 687.5,289.5 Z"/></g> +<g><path style="opacity:1" fill="#c7c7c7" d="M 545.5,30.5 C 561.686,37.023 575.686,46.6896 587.5,59.5C 586.475,59.8966 586.308,60.5632 587,61.5C 591.479,66.7976 595.313,72.4643 598.5,78.5C 603.029,87.7528 606.362,97.4194 608.5,107.5C 604.867,99.0968 600.367,90.4301 595,81.5C 590.628,75.8031 586.294,70.1365 582,64.5C 570.117,52.8309 557.617,41.9976 544.5,32C 545.056,31.6174 545.389,31.1174 545.5,30.5 Z"/></g> +<g><path style="opacity:1" fill="#f6f6f6" d="M 151.5,47.5 C 217.142,47.5326 282.642,47.5326 348,47.5C 350.5,47.8333 353,48.1667 355.5,48.5C 355.919,49.6721 356.585,50.6721 357.5,51.5C 359.021,51.1203 360.687,50.9536 362.5,51C 361.304,50.3457 361.304,49.8457 362.5,49.5C 367.186,51.094 372.019,52.094 377,52.5C 377.414,52.0426 377.914,51.7093 378.5,51.5C 378.295,55.2653 379.128,55.2653 381,51.5C 381.956,52.5786 382.789,53.7453 383.5,55C 390.833,55.3333 398.167,55.6667 405.5,56C 407.422,59.3461 408.089,59.3461 407.5,56C 408.935,56.3112 410.268,56.1445 411.5,55.5C 411.554,56.5301 411.888,57.6967 412.5,59C 414.486,58.2059 416.319,58.7059 418,60.5C 421.921,60.4036 425.921,60.0703 430,59.5C 431.667,60.1667 433.333,60.8333 435,61.5C 435.054,63.5472 434.054,63.5472 432,61.5C 431.544,62.7441 432.044,63.5774 433.5,64C 436.758,64.2117 439.924,64.7117 443,65.5C 443.333,65.1667 443.667,64.8333 444,64.5C 444.333,65.5 444.667,66.5 445,67.5C 447.488,66.5878 449.155,67.5878 450,70.5C 452.044,69.9941 454.044,69.6607 456,69.5C 456.192,71.8023 457.526,73.8023 460,75.5C 462.034,73.4402 464.034,73.7735 466,76.5C 466.333,75.8333 466.667,75.1667 467,74.5C 469.333,75.8333 471.667,75.8333 474,74.5C 474.5,75.6667 475.333,76.5 476.5,77C 475.692,77.3076 475.025,77.8076 474.5,78.5C 475.274,79.7112 476.107,79.7112 477,78.5C 477.684,79.7839 477.517,80.9505 476.5,82C 478.577,82.1922 480.577,82.6922 482.5,83.5C 483.145,84.7321 483.311,86.0654 483,87.5C 483.741,88.6405 484.575,88.6405 485.5,87.5C 486.386,88.325 486.719,89.325 486.5,90.5C 490.177,90.4795 493.51,90.4795 496.5,90.5C 497.944,93.0546 499.111,95.7213 500,98.5C 501.791,100.513 503.125,100.513 504,98.5C 505.085,99.2931 506.252,99.9598 507.5,100.5C 507.833,99.8333 508.167,99.1667 508.5,98.5C 509.281,99.7287 509.781,101.062 510,102.5C 510.654,101.304 511.154,101.304 511.5,102.5C 511.023,103.478 510.357,104.311 509.5,105C 510.833,106 510.833,107 509.5,108C 510.744,108.456 511.577,107.956 512,106.5C 513.067,107.191 514.234,107.691 515.5,108C 514.397,109.68 514.73,111.18 516.5,112.5C 515.771,114.595 516.437,116.428 518.5,118C 518.167,118.333 517.833,118.667 517.5,119C 519.365,121.365 521.032,121.532 522.5,119.5C 524.904,120.008 525.571,121.175 524.5,123C 527.544,123.359 527.878,124.026 525.5,125C 527.35,126.845 527.683,128.845 526.5,131C 528.439,131.908 529.439,133.408 529.5,135.5C 530.552,135.351 531.552,135.517 532.5,136C 530.323,137.186 529.323,139.019 529.5,141.5C 530.552,141.351 531.552,141.517 532.5,142C 531.663,143.011 531.33,144.178 531.5,145.5C 532.552,145.351 533.552,145.517 534.5,146C 533.549,146.718 533.383,147.551 534,148.5C 535.716,147.448 536.716,148.114 537,150.5C 537.333,150.167 537.667,149.833 538,149.5C 539.067,150.191 540.234,150.691 541.5,151C 541.167,151.333 540.833,151.667 540.5,152C 541.687,153.019 542.687,154.186 543.5,155.5C 543.306,157.07 543.306,158.57 543.5,160C 544.167,160.333 544.833,160.667 545.5,161C 544.949,162.398 544.616,163.732 544.5,165C 546.701,167.198 547.701,170.031 547.5,173.5C 549.331,174.052 550.997,174.052 552.5,173.5C 553.696,173.846 553.696,174.346 552.5,175C 553.624,175.249 554.624,175.749 555.5,176.5C 555.154,177.696 554.654,177.696 554,176.5C 553.333,177.833 553.333,179.167 554,180.5C 554.333,180.167 554.667,179.833 555,179.5C 555.703,181.78 556.869,183.78 558.5,185.5C 558.291,186.086 557.957,186.586 557.5,187C 560.249,188.346 560.583,189.68 558.5,191C 559.833,191.667 559.833,192.333 558.5,193C 559.893,195.666 561.559,198.166 563.5,200.5C 562.617,202.48 562.783,204.48 564,206.5C 566.753,207.168 569.253,208.835 571.5,211.5C 572.83,213.347 572.497,214.847 570.5,216C 571.325,217.688 572.325,217.855 573.5,216.5C 574.747,218.006 574.747,219.506 573.5,221C 574.627,222.753 575.627,224.587 576.5,226.5C 580.453,230.608 583.786,235.108 586.5,240C 586.167,240.333 585.833,240.667 585.5,241C 586.624,241.249 587.624,241.749 588.5,242.5C 588.64,243.903 588.64,245.403 588.5,247C 589.253,248.487 590.086,248.654 591,247.5C 593.003,251.515 595.003,255.515 597,259.5C 597.333,259.167 597.667,258.833 598,258.5C 603.988,265.826 611.155,271.659 619.5,276C 620.833,277.667 622.167,279.333 623.5,281C 627.227,281.664 630.394,283.831 633,287.5C 633.414,287.043 633.914,286.709 634.5,286.5C 637.318,289.811 640.818,292.144 645,293.5C 645.414,293.043 645.914,292.709 646.5,292.5C 647.833,293.833 649.167,295.167 650.5,296.5C 651.086,296.291 651.586,295.957 652,295.5C 654.99,296.321 658.157,297.487 661.5,299C 663.649,300.152 665.482,301.652 667,303.5C 668,303.167 669,302.833 670,302.5C 670.308,303.308 670.808,303.975 671.5,304.5C 673.643,303.246 675.643,303.246 677.5,304.5C 672.401,312.379 667.067,320.045 661.5,327.5C 660.338,326.322 659.338,325.155 658.5,324C 657.216,323.316 656.049,323.483 655,324.5C 654.395,322.519 653.395,322.185 652,323.5C 650.672,321.331 649.006,320.998 647,322.5C 643.518,320.839 640.018,319.339 636.5,318C 637.956,317.577 638.456,316.744 638,315.5C 634.984,317.767 633.15,316.767 632.5,312.5C 601.374,301.76 575.708,283.093 555.5,256.5C 555.709,255.914 556.043,255.414 556.5,255C 552.473,251.634 549.14,247.634 546.5,243C 547.089,241.127 546.422,239.46 544.5,238C 545.451,237.282 545.617,236.449 545,235.5C 542.871,236.863 542.371,236.529 543.5,234.5C 541,230.167 538.5,225.833 536,221.5C 535.28,219.888 535.446,218.388 536.5,217C 534.437,215.428 533.771,213.595 534.5,211.5C 533.5,210.667 532.5,209.833 531.5,209C 531.833,208.667 532.167,208.333 532.5,208C 531.034,206.448 530.034,204.614 529.5,202.5C 527.833,201.333 526.167,200.167 524.5,199C 528.683,199.336 529.017,198.502 525.5,196.5C 524.914,196.709 524.414,197.043 524,197.5C 521.866,193.687 519.699,189.853 517.5,186C 520.288,183.626 519.954,182.293 516.5,182C 517.956,181.577 518.456,180.744 518,179.5C 515.538,178.35 513.204,177.017 511,175.5C 510.667,176.167 510.333,176.833 510,177.5C 508.478,175.259 507.145,172.926 506,170.5C 505.465,172.271 504.631,172.604 503.5,171.5C 503.709,170.914 504.043,170.414 504.5,170C 502.262,167.896 501.262,165.562 501.5,163C 500.095,161.731 498.429,161.231 496.5,161.5C 496.162,159.146 495.662,156.813 495,154.5C 492.558,151.952 490.892,148.952 490,145.5C 488.39,145.87 486.89,145.203 485.5,143.5C 486.167,143.167 486.833,142.833 487.5,142.5C 486.687,141.186 485.687,140.019 484.5,139C 484.833,138.667 485.167,138.333 485.5,138C 483.25,137.389 481.583,136.056 480.5,134C 477.863,133.985 475.696,134.485 474,135.5C 473.667,134.833 473.333,134.167 473,133.5C 471.667,134.833 470.333,134.833 469,133.5C 468,134.167 467,134.833 466,135.5C 464.829,134.107 463.329,133.273 461.5,133C 461.833,132.667 462.167,132.333 462.5,132C 461.007,130.632 459.507,130.465 458,131.5C 457.689,130.258 458.189,129.258 459.5,128.5C 457.009,127.459 457.009,126.626 459.5,126C 458.377,124.956 457.044,124.29 455.5,124C 456.554,122.612 456.72,121.112 456,119.5C 455.751,120.624 455.251,121.624 454.5,122.5C 453.289,121.726 453.289,120.893 454.5,120C 453.333,119.833 452.167,119.667 451,119.5C 447.18,119.736 443.347,120.069 439.5,120.5C 439.992,116.71 439.159,116.044 437,118.5C 436.004,116.256 434.504,114.423 432.5,113C 433.624,112.751 434.624,112.251 435.5,111.5C 432.941,111.853 431.107,110.52 430,107.5C 421.635,107.897 413.302,108.231 405,108.5C 404.376,106.246 403.043,104.579 401,103.5C 400.544,104.744 401.044,105.577 402.5,106C 401.809,107.067 401.309,108.234 401,109.5C 400.683,107.699 400.016,107.366 399,108.5C 397.372,107.181 397.539,105.848 399.5,104.5C 398.833,104.167 398.167,103.833 397.5,103.5C 398.206,101.521 398.206,99.8543 397.5,98.5C 395.902,100.973 394.402,100.973 393,98.5C 383.662,98.186 374.162,98.5193 364.5,99.5C 364.323,96.9218 363.157,96.9218 361,99.5C 360.085,98.6721 359.419,97.6721 359,96.5C 357.333,97.5 355.667,98.5 354,99.5C 353.833,99 353.667,98.5 353.5,98C 354.866,95.5379 356.699,94.7045 359,95.5C 362.312,93.8788 362.312,93.5455 359,94.5C 358.085,93.6721 357.419,92.6721 357,91.5C 356.026,93.8776 355.359,93.5443 355,90.5C 354.581,91.6721 353.915,92.6721 353,93.5C 352.383,92.5509 352.549,91.7175 353.5,91C 352.451,90.5078 351.451,90.6744 350.5,91.5C 349.808,90.9747 349.308,90.3081 349,89.5C 346.76,89.09 344.593,89.7566 342.5,91.5C 340.452,90.917 338.619,90.917 337,91.5C 336.667,90.8333 336.333,90.1667 336,89.5C 333.876,90.2272 331.709,90.8938 329.5,91.5C 328.5,90.1667 327.5,90.1667 326.5,91.5C 325.808,90.9747 325.308,90.3081 325,89.5C 322.502,88.8788 320.168,89.5455 318,91.5C 317.333,90.1667 316.667,90.1667 316,91.5C 315.667,90.8333 315.333,90.1667 315,89.5C 312.539,90.2181 310.039,90.8847 307.5,91.5C 306.833,90.8333 306.167,90.1667 305.5,89.5C 304.28,90.7111 303.113,90.7111 302,89.5C 301.667,90.1667 301.333,90.8333 301,91.5C 299,90.8333 297,90.1667 295,89.5C 293.691,91.8912 292.691,91.8912 292,89.5C 289.065,90.0997 286.398,90.0997 284,89.5C 283.333,92.1667 282.667,92.1667 282,89.5C 280.149,91.7811 278.482,91.7811 277,89.5C 276.692,90.3081 276.192,90.9747 275.5,91.5C 274.5,90.8333 273.5,90.1667 272.5,89.5C 271.318,91.6454 269.818,91.6454 268,89.5C 267.692,90.3081 267.192,90.9747 266.5,91.5C 265.672,90.5853 264.672,89.9186 263.5,89.5C 258.601,89.9342 253.767,89.9342 249,89.5C 247.739,89.7591 246.739,90.4258 246,91.5C 244.333,90.1667 242.667,90.1667 241,91.5C 239.684,88.972 238.517,88.972 237.5,91.5C 236.459,89.0087 235.626,89.0087 235,91.5C 234,88.8333 233,88.8333 232,91.5C 231.667,90.8333 231.333,90.1667 231,89.5C 225.917,91.7995 221.084,91.7995 216.5,89.5C 215.808,90.0253 215.308,90.6919 215,91.5C 213.333,90.8333 211.667,90.1667 210,89.5C 206.238,90.1037 202.571,90.1037 199,89.5C 197.333,90.1667 195.667,90.8333 194,91.5C 193.692,90.6919 193.192,90.0253 192.5,89.5C 191.167,90.8333 189.833,90.8333 188.5,89.5C 187.318,91.6454 185.818,91.6454 184,89.5C 183.333,90.1667 182.667,90.8333 182,91.5C 178.667,90.1667 175.333,90.1667 172,91.5C 170.667,88.8333 169.333,88.8333 168,91.5C 164.221,89.293 160.555,89.293 157,91.5C 155.691,89.1088 154.691,89.1088 154,91.5C 153.292,90.6195 152.458,89.9528 151.5,89.5C 151.5,75.5 151.5,61.5 151.5,47.5 Z"/></g> +<g><path style="opacity:1" fill="#e0e0e0" d="M 587.5,59.5 C 613.136,83.1345 638.469,107.134 663.5,131.5C 663.351,132.552 663.517,133.552 664,134.5C 704.98,174.313 745.48,214.647 785.5,255.5C 779.432,252.795 773.432,250.128 767.5,247.5C 768.239,247.631 768.906,247.464 769.5,247C 713.404,190.573 656.571,134.073 599,77.5C 598.601,77.7284 598.435,78.0618 598.5,78.5C 595.313,72.4643 591.479,66.7976 587,61.5C 586.308,60.5632 586.475,59.8966 587.5,59.5 Z"/></g> +<g><path style="opacity:1" fill="#fefefe" d="M 151.5,89.5 C 152.458,89.9528 153.292,90.6195 154,91.5C 154.691,89.1088 155.691,89.1088 157,91.5C 160.555,89.293 164.221,89.293 168,91.5C 169.333,88.8333 170.667,88.8333 172,91.5C 175.333,90.1667 178.667,90.1667 182,91.5C 182.667,90.8333 183.333,90.1667 184,89.5C 185.818,91.6454 187.318,91.6454 188.5,89.5C 189.833,90.8333 191.167,90.8333 192.5,89.5C 193.192,90.0253 193.692,90.6919 194,91.5C 195.667,90.8333 197.333,90.1667 199,89.5C 202.571,90.1037 206.238,90.1037 210,89.5C 211.667,90.1667 213.333,90.8333 215,91.5C 215.308,90.6919 215.808,90.0253 216.5,89.5C 221.084,91.7995 225.917,91.7995 231,89.5C 231.333,90.1667 231.667,90.8333 232,91.5C 233,88.8333 234,88.8333 235,91.5C 235.626,89.0087 236.459,89.0087 237.5,91.5C 238.517,88.972 239.684,88.972 241,91.5C 242.667,90.1667 244.333,90.1667 246,91.5C 246.739,90.4258 247.739,89.7591 249,89.5C 253.767,89.9342 258.601,89.9342 263.5,89.5C 264.672,89.9186 265.672,90.5853 266.5,91.5C 267.192,90.9747 267.692,90.3081 268,89.5C 269.818,91.6454 271.318,91.6454 272.5,89.5C 273.5,90.1667 274.5,90.8333 275.5,91.5C 276.192,90.9747 276.692,90.3081 277,89.5C 278.482,91.7811 280.149,91.7811 282,89.5C 282.667,92.1667 283.333,92.1667 284,89.5C 286.398,90.0997 289.065,90.0997 292,89.5C 292.691,91.8912 293.691,91.8912 295,89.5C 297,90.1667 299,90.8333 301,91.5C 301.333,90.8333 301.667,90.1667 302,89.5C 303.113,90.7111 304.28,90.7111 305.5,89.5C 306.167,90.1667 306.833,90.8333 307.5,91.5C 310.039,90.8847 312.539,90.2181 315,89.5C 315.333,90.1667 315.667,90.8333 316,91.5C 316.667,90.1667 317.333,90.1667 318,91.5C 320.168,89.5455 322.502,88.8788 325,89.5C 325.308,90.3081 325.808,90.9747 326.5,91.5C 327.5,90.1667 328.5,90.1667 329.5,91.5C 331.709,90.8938 333.876,90.2272 336,89.5C 336.333,90.1667 336.667,90.8333 337,91.5C 338.619,90.917 340.452,90.917 342.5,91.5C 344.593,89.7566 346.76,89.09 349,89.5C 349.308,90.3081 349.808,90.9747 350.5,91.5C 351.451,90.6744 352.451,90.5078 353.5,91C 352.549,91.7175 352.383,92.5509 353,93.5C 353.915,92.6721 354.581,91.6721 355,90.5C 355.359,93.5443 356.026,93.8776 357,91.5C 357.419,92.6721 358.085,93.6721 359,94.5C 362.312,93.5455 362.312,93.8788 359,95.5C 356.699,94.7045 354.866,95.5379 353.5,98C 353.667,98.5 353.833,99 354,99.5C 355.667,98.5 357.333,97.5 359,96.5C 359.419,97.6721 360.085,98.6721 361,99.5C 363.157,96.9218 364.323,96.9218 364.5,99.5C 374.162,98.5193 383.662,98.186 393,98.5C 394.402,100.973 395.902,100.973 397.5,98.5C 398.206,99.8543 398.206,101.521 397.5,103.5C 398.167,103.833 398.833,104.167 399.5,104.5C 397.539,105.848 397.372,107.181 399,108.5C 400.016,107.366 400.683,107.699 401,109.5C 401.309,108.234 401.809,107.067 402.5,106C 401.044,105.577 400.544,104.744 401,103.5C 403.043,104.579 404.376,106.246 405,108.5C 413.302,108.231 421.635,107.897 430,107.5C 431.107,110.52 432.941,111.853 435.5,111.5C 434.624,112.251 433.624,112.751 432.5,113C 434.504,114.423 436.004,116.256 437,118.5C 439.159,116.044 439.992,116.71 439.5,120.5C 443.347,120.069 447.18,119.736 451,119.5C 452.167,119.667 453.333,119.833 454.5,120C 453.289,120.893 453.289,121.726 454.5,122.5C 455.251,121.624 455.751,120.624 456,119.5C 456.72,121.112 456.554,122.612 455.5,124C 457.044,124.29 458.377,124.956 459.5,126C 457.009,126.626 457.009,127.459 459.5,128.5C 458.189,129.258 457.689,130.258 458,131.5C 459.507,130.465 461.007,130.632 462.5,132C 462.167,132.333 461.833,132.667 461.5,133C 463.329,133.273 464.829,134.107 466,135.5C 467,134.833 468,134.167 469,133.5C 470.333,134.833 471.667,134.833 473,133.5C 473.333,134.167 473.667,134.833 474,135.5C 475.696,134.485 477.863,133.985 480.5,134C 481.583,136.056 483.25,137.389 485.5,138C 485.167,138.333 484.833,138.667 484.5,139C 485.687,140.019 486.687,141.186 487.5,142.5C 486.833,142.833 486.167,143.167 485.5,143.5C 486.89,145.203 488.39,145.87 490,145.5C 490.892,148.952 492.558,151.952 495,154.5C 495.662,156.813 496.162,159.146 496.5,161.5C 498.429,161.231 500.095,161.731 501.5,163C 501.262,165.562 502.262,167.896 504.5,170C 504.043,170.414 503.709,170.914 503.5,171.5C 504.631,172.604 505.465,172.271 506,170.5C 507.145,172.926 508.478,175.259 510,177.5C 510.333,176.833 510.667,176.167 511,175.5C 513.204,177.017 515.538,178.35 518,179.5C 518.456,180.744 517.956,181.577 516.5,182C 519.954,182.293 520.288,183.626 517.5,186C 519.699,189.853 521.866,193.687 524,197.5C 524.414,197.043 524.914,196.709 525.5,196.5C 529.017,198.502 528.683,199.336 524.5,199C 526.167,200.167 527.833,201.333 529.5,202.5C 530.034,204.614 531.034,206.448 532.5,208C 532.167,208.333 531.833,208.667 531.5,209C 532.5,209.833 533.5,210.667 534.5,211.5C 533.771,213.595 534.437,215.428 536.5,217C 535.446,218.388 535.28,219.888 536,221.5C 538.5,225.833 541,230.167 543.5,234.5C 542.371,236.529 542.871,236.863 545,235.5C 545.617,236.449 545.451,237.282 544.5,238C 546.422,239.46 547.089,241.127 546.5,243C 549.14,247.634 552.473,251.634 556.5,255C 556.043,255.414 555.709,255.914 555.5,256.5C 575.708,283.093 601.374,301.76 632.5,312.5C 633.15,316.767 634.984,317.767 638,315.5C 638.456,316.744 637.956,317.577 636.5,318C 640.018,319.339 643.518,320.839 647,322.5C 649.006,320.998 650.672,321.331 652,323.5C 653.395,322.185 654.395,322.519 655,324.5C 656.049,323.483 657.216,323.316 658.5,324C 659.338,325.155 660.338,326.322 661.5,327.5C 659.86,330.149 658.193,332.816 656.5,335.5C 541.833,335.333 427.166,335.5 312.5,336C 290.568,341.599 277.068,355.432 272,377.5C 271.333,449.833 271.333,522.167 272,594.5C 276.395,618.712 290.562,633.045 314.5,637.5C 356.997,638.499 399.663,638.832 442.5,638.5C 442.5,679.833 442.5,721.167 442.5,762.5C 443.791,762.737 444.791,762.404 445.5,761.5C 445.5,761.167 445.5,760.833 445.5,760.5C 485.965,719.535 526.632,678.701 567.5,638C 615.167,637.667 662.833,637.333 710.5,637C 733.865,631.635 747.698,617.135 752,593.5C 752.667,521.833 752.667,450.167 752,378.5C 751.304,375.522 750.804,372.522 750.5,369.5C 751.117,369.389 751.617,369.056 752,368.5C 754.106,373.147 757.606,376.314 762.5,378C 762.167,378.333 761.833,378.667 761.5,379C 764.71,379.395 767.21,380.895 769,383.5C 769.333,383.167 769.667,382.833 770,382.5C 771.563,385.728 774.063,387.895 777.5,389C 777.167,389.333 776.833,389.667 776.5,390C 779.638,391.971 782.305,394.471 784.5,397.5C 788.137,399.136 791.137,401.469 793.5,404.5C 793.291,405.086 792.957,405.586 792.5,406C 793.744,406.456 794.577,405.956 795,404.5C 796.274,408.485 798.274,409.152 801,406.5C 803.391,408.806 806.391,411.139 810,413.5C 811,412.167 812,412.167 813,413.5C 813.507,412.004 813.007,410.837 811.5,410C 813.127,410.43 814.627,410.596 816,410.5C 816.805,408.099 817.638,408.266 818.5,411C 819.833,411.667 821.167,411.667 822.5,411C 821.549,410.282 821.383,409.449 822,408.5C 824.016,408.697 826.016,409.697 828,411.5C 828.692,410.975 829.192,410.308 829.5,409.5C 828.572,408.232 828.405,406.899 829,405.5C 829.923,406.759 830.757,408.092 831.5,409.5C 831.833,408.833 832.167,408.167 832.5,407.5C 833.833,408.5 835.167,409.5 836.5,410.5C 836.669,409.603 837.002,408.603 837.5,407.5C 840.97,409.927 844.47,412.26 848,414.5C 849.343,413.786 850.676,414.12 852,415.5C 853.085,413.343 854.251,413.176 855.5,415C 853.099,415.805 853.266,416.638 856,417.5C 857.333,416.833 858.667,416.167 860,415.5C 863.508,417.587 866.842,419.92 870,422.5C 870.176,426.688 870.676,430.688 871.5,434.5C 871.5,609.5 871.5,784.5 871.5,959.5C 631.5,959.5 391.5,959.5 151.5,959.5C 151.5,669.5 151.5,379.5 151.5,89.5 Z"/></g> +<g><path style="opacity:1" fill="#eeeeee" d="M 767.5,247.5 C 758.082,244.471 748.749,241.471 739.5,238.5C 740.552,238.649 741.552,238.483 742.5,238C 707.429,204.385 672.262,170.885 637,137.5C 636.667,136.5 636.333,135.5 636,134.5C 635.086,135.654 634.253,135.487 633.5,134C 633.833,133.667 634.167,133.333 634.5,133C 631.851,132.206 629.684,130.706 628,128.5C 627.667,127.5 627.333,126.5 627,125.5C 625.16,126.833 624.66,126.666 625.5,125C 620.949,121.95 617.282,118.117 614.5,113.5C 613.311,112.571 611.978,112.238 610.5,112.5C 609.976,110.694 609.309,109.028 608.5,107.5C 606.362,97.4194 603.029,87.7528 598.5,78.5C 598.435,78.0618 598.601,77.7284 599,77.5C 656.571,134.073 713.404,190.573 769.5,247C 768.906,247.464 768.239,247.631 767.5,247.5 Z"/></g> +<g><path style="opacity:1" fill="#f6f6f6" d="M 610.5,112.5 C 611.978,112.238 613.311,112.571 614.5,113.5C 617.282,118.117 620.949,121.95 625.5,125C 624.66,126.666 625.16,126.833 627,125.5C 627.333,126.5 627.667,127.5 628,128.5C 629.684,130.706 631.851,132.206 634.5,133C 634.167,133.333 633.833,133.667 633.5,134C 634.253,135.487 635.086,135.654 636,134.5C 636.333,135.5 636.667,136.5 637,137.5C 672.262,170.885 707.429,204.385 742.5,238C 741.552,238.483 740.552,238.649 739.5,238.5C 730.585,236.625 721.585,235.292 712.5,234.5C 710.833,233.833 709.167,233.167 707.5,232.5C 708.239,232.631 708.906,232.464 709.5,232C 678.663,200.496 647.163,169.663 615,139.5C 614.517,140.448 614.351,141.448 614.5,142.5C 614.167,142.5 613.833,142.5 613.5,142.5C 613.232,132.42 612.232,122.42 610.5,112.5 Z"/></g> +<g><path style="opacity:0.999" fill="#cccccc" d="M 663.5,131.5 C 712.496,177.83 761.163,224.497 809.5,271.5C 801.492,266.164 793.492,260.83 785.5,255.5C 745.48,214.647 704.98,174.313 664,134.5C 663.517,133.552 663.351,132.552 663.5,131.5 Z"/></g> +<g><path style="opacity:1" fill="#fdfdfd" d="M 707.5,232.5 C 698.498,232.214 689.498,231.881 680.5,231.5C 667.326,230.35 653.993,230.35 640.5,231.5C 632.128,232.2 623.795,233.2 615.5,234.5C 614.5,234.5 613.5,234.5 612.5,234.5C 612.46,226.813 612.793,219.146 613.5,211.5C 614.247,188.508 614.58,165.508 614.5,142.5C 614.351,141.448 614.517,140.448 615,139.5C 647.163,169.663 678.663,200.496 709.5,232C 708.906,232.464 708.239,232.631 707.5,232.5 Z"/></g> +<g><path style="opacity:1" fill="#c5c5c5" d="M 680.5,231.5 C 689.498,231.881 698.498,232.214 707.5,232.5C 709.167,233.167 710.833,233.833 712.5,234.5C 740.588,241.545 768.255,251.545 795.5,264.5C 801.13,268.32 806.796,272.154 812.5,276C 816.044,280.046 820.044,283.546 824.5,286.5C 828.984,291.467 832.984,296.8 836.5,302.5C 819.292,288.978 800.625,276.811 780.5,266C 741.089,250.641 700.422,239.308 658.5,232C 665.826,231.5 673.159,231.334 680.5,231.5 Z"/></g> +<g><path style="opacity:1" fill="#e2e2e2" d="M 640.5,231.5 C 640.389,232.117 640.056,232.617 639.5,233C 642.095,233.226 644.595,233.726 647,234.5C 647.333,234.167 647.667,233.833 648,233.5C 665.555,239.587 683.555,245.587 702,251.5C 702.333,251.167 702.667,250.833 703,250.5C 705.938,253.209 709.438,254.876 713.5,255.5C 711.229,257.266 709.063,259.266 707,261.5C 704.301,266.256 701.134,270.589 697.5,274.5C 695.99,273.272 694.49,273.272 693,274.5C 692.667,273.833 692.333,273.167 692,272.5C 690.883,272.665 689.716,272.998 688.5,273.5C 686.458,271.287 684.125,270.62 681.5,271.5C 681.891,270.109 681.058,269.109 679,268.5C 678.586,268.957 678.086,269.291 677.5,269.5C 672.52,267.452 667.686,265.119 663,262.5C 661.333,262.5 659.667,262.5 658,262.5C 655.157,259.989 652.323,257.489 649.5,255C 649.833,254.667 650.167,254.333 650.5,254C 647.791,251.325 645.124,248.658 642.5,246C 638.943,244.592 635.276,243.592 631.5,243C 628.94,241.227 626.607,239.227 624.5,237C 621.421,236.027 618.421,235.194 615.5,234.5C 623.795,233.2 632.128,232.2 640.5,231.5 Z"/></g> +<g><path style="opacity:1" fill="#f58c50" d="M 741.5,264.5 C 741.5,264.833 741.5,265.167 741.5,265.5C 742.527,269.446 742.694,273.446 742,277.5C 738.729,284.378 735.229,291.045 731.5,297.5C 723.41,310.006 716.077,323.006 709.5,336.5C 703.414,344.997 698.081,353.997 693.5,363.5C 692.662,363.842 692.328,364.508 692.5,365.5C 677.855,389.443 663.689,413.776 650,438.5C 626.74,471.84 601.906,504.007 575.5,535C 572.287,537.572 568.62,539.072 564.5,539.5C 559.705,538.709 556.372,536.043 554.5,531.5C 552.938,525.305 553.438,519.305 556,513.5C 571.028,481.107 586.361,448.774 602,416.5C 613.33,399.013 624.83,381.68 636.5,364.5C 637.167,364.5 637.5,364.167 637.5,363.5C 643.833,354.167 650.167,344.833 656.5,335.5C 658.193,332.816 659.86,330.149 661.5,327.5C 667.067,320.045 672.401,312.379 677.5,304.5C 681.078,299.68 684.412,294.68 687.5,289.5C 691.575,285.024 694.908,280.024 697.5,274.5C 701.134,270.589 704.301,266.256 707,261.5C 709.063,259.266 711.229,257.266 713.5,255.5C 724.839,252.165 734.172,255.165 741.5,264.5 Z"/></g> +<g><path style="opacity:1" fill="#acacac" d="M 712.5,234.5 C 721.585,235.292 730.585,236.625 739.5,238.5C 748.749,241.471 758.082,244.471 767.5,247.5C 773.432,250.128 779.432,252.795 785.5,255.5C 793.492,260.83 801.492,266.164 809.5,271.5C 815.479,275.479 820.479,280.479 824.5,286.5C 820.044,283.546 816.044,280.046 812.5,276C 806.796,272.154 801.13,268.32 795.5,264.5C 768.255,251.545 740.588,241.545 712.5,234.5 Z"/></g> +<g><path style="opacity:1" fill="#d6d5d5" d="M 680.5,231.5 C 673.159,231.334 665.826,231.5 658.5,232C 700.422,239.308 741.089,250.641 780.5,266C 800.625,276.811 819.292,288.978 836.5,302.5C 840.251,306.995 843.251,311.995 845.5,317.5C 844.323,315.575 842.323,313.742 839.5,312C 837.913,311.138 836.246,310.471 834.5,310C 834.833,309.667 835.167,309.333 835.5,309C 833.2,307.275 831.034,305.442 829,303.5C 828.667,304.167 828.333,304.833 828,305.5C 827.654,303.152 826.487,301.319 824.5,300C 815.028,295.218 806.028,289.551 797.5,283C 795.324,282.837 793.491,282.004 792,280.5C 791.667,281.167 791.333,281.833 791,282.5C 777.998,276.048 764.498,270.548 750.5,266C 747.522,265.304 744.522,264.804 741.5,264.5C 734.172,255.165 724.839,252.165 713.5,255.5C 709.438,254.876 705.938,253.209 703,250.5C 702.667,250.833 702.333,251.167 702,251.5C 683.555,245.587 665.555,239.587 648,233.5C 647.667,233.833 647.333,234.167 647,234.5C 644.595,233.726 642.095,233.226 639.5,233C 640.056,232.617 640.389,232.117 640.5,231.5C 653.993,230.35 667.326,230.35 680.5,231.5 Z"/></g> +<g><path style="opacity:1" fill="#e1e1e1" d="M 741.5,265.5 C 741.5,265.167 741.5,264.833 741.5,264.5C 744.522,264.804 747.522,265.304 750.5,266C 764.498,270.548 777.998,276.048 791,282.5C 791.333,281.833 791.667,281.167 792,280.5C 793.491,282.004 795.324,282.837 797.5,283C 806.028,289.551 815.028,295.218 824.5,300C 826.487,301.319 827.654,303.152 828,305.5C 828.333,304.833 828.667,304.167 829,303.5C 831.034,305.442 833.2,307.275 835.5,309C 835.167,309.333 834.833,309.667 834.5,310C 836.246,310.471 837.913,311.138 839.5,312C 842.323,313.742 844.323,315.575 845.5,317.5C 849.785,324.335 853.118,331.668 855.5,339.5C 852.429,337.484 849.762,335.65 847.5,334C 843.885,333.386 841.051,331.553 839,328.5C 838.667,328.833 838.333,329.167 838,329.5C 837.082,327.368 835.749,326.701 834,327.5C 829.994,324.831 826.994,321.831 825,318.5C 823.984,319.634 823.317,319.301 823,317.5C 822.667,318.167 822.333,318.833 822,319.5C 817.916,314.348 813.416,311.348 808.5,310.5C 807.757,309.092 806.923,307.759 806,306.5C 804.84,308.797 803.84,308.464 803,305.5C 802.667,305.833 802.333,306.167 802,306.5C 802.077,305.262 801.911,304.262 801.5,303.5C 800.833,303.833 800.167,304.167 799.5,304.5C 797.889,302.465 796.056,301.798 794,302.5C 792.039,299.207 789.372,297.873 786,298.5C 785.492,296.096 784.325,295.429 782.5,296.5C 769.63,289.966 756.297,285.633 742.5,283.5C 742.167,283.167 741.833,282.833 741.5,282.5C 743.499,277.353 743.999,272.019 743,266.5C 742.617,265.944 742.117,265.611 741.5,265.5 Z"/></g> +<g><path style="opacity:1" fill="#eaeaea" d="M 741.5,265.5 C 742.117,265.611 742.617,265.944 743,266.5C 743.999,272.019 743.499,277.353 741.5,282.5C 741.833,282.833 742.167,283.167 742.5,283.5C 756.297,285.633 769.63,289.966 782.5,296.5C 784.325,295.429 785.492,296.096 786,298.5C 789.372,297.873 792.039,299.207 794,302.5C 796.056,301.798 797.889,302.465 799.5,304.5C 800.167,304.167 800.833,303.833 801.5,303.5C 801.911,304.262 802.077,305.262 802,306.5C 802.333,306.167 802.667,305.833 803,305.5C 803.84,308.464 804.84,308.797 806,306.5C 806.923,307.759 807.757,309.092 808.5,310.5C 813.416,311.348 817.916,314.348 822,319.5C 822.333,318.833 822.667,318.167 823,317.5C 823.317,319.301 823.984,319.634 825,318.5C 826.994,321.831 829.994,324.831 834,327.5C 835.749,326.701 837.082,327.368 838,329.5C 838.333,329.167 838.667,328.833 839,328.5C 841.051,331.553 843.885,333.386 847.5,334C 849.762,335.65 852.429,337.484 855.5,339.5C 858.072,345.215 860.072,351.215 861.5,357.5C 859.741,356.129 857.741,355.129 855.5,354.5C 853.489,351.187 850.823,349.52 847.5,349.5C 842.542,345.776 837.376,342.442 832,339.5C 831.439,340.022 830.772,340.355 830,340.5C 827.027,338.853 824.36,336.853 822,334.5C 818.681,335.492 816.681,334.159 816,330.5C 814.493,331.535 812.993,331.368 811.5,330C 811.833,329.667 812.167,329.333 812.5,329C 809.257,328.092 806.923,326.092 805.5,323C 804.216,322.316 803.049,322.483 802,323.5C 800.915,321.627 799.582,319.96 798,318.5C 795.76,321.167 794.26,320.667 793.5,317C 792.216,316.316 791.049,316.483 790,317.5C 789.383,316.551 789.549,315.718 790.5,315C 788.5,314.667 786.5,314.333 784.5,314C 782.657,313.226 780.824,311.726 779,309.5C 778.667,310.5 778.333,311.5 778,312.5C 775.441,311.02 772.774,309.687 770,308.5C 769.667,308.833 769.333,309.167 769,309.5C 767.089,307.658 765.089,305.991 763,304.5C 762.439,305.022 761.772,305.355 761,305.5C 756.136,303.909 751.303,302.243 746.5,300.5C 745.914,300.709 745.414,301.043 745,301.5C 742.832,299.545 740.498,298.879 738,299.5C 736.004,299.004 734.337,298.004 733,296.5C 732.617,297.056 732.117,297.389 731.5,297.5C 735.229,291.045 738.729,284.378 742,277.5C 742.694,273.446 742.527,269.446 741.5,265.5 Z"/></g> +<g><path style="opacity:1" fill="#f5f4f4" d="M 861.5,357.5 C 868.334,382.67 871.668,408.336 871.5,434.5C 870.676,430.688 870.176,426.688 870,422.5C 866.842,419.92 863.508,417.587 860,415.5C 858.667,416.167 857.333,416.833 856,417.5C 853.266,416.638 853.099,415.805 855.5,415C 854.251,413.176 853.085,413.343 852,415.5C 850.676,414.12 849.343,413.786 848,414.5C 844.47,412.26 840.97,409.927 837.5,407.5C 837.002,408.603 836.669,409.603 836.5,410.5C 835.167,409.5 833.833,408.5 832.5,407.5C 832.167,408.167 831.833,408.833 831.5,409.5C 830.757,408.092 829.923,406.759 829,405.5C 828.405,406.899 828.572,408.232 829.5,409.5C 829.192,410.308 828.692,410.975 828,411.5C 826.016,409.697 824.016,408.697 822,408.5C 821.383,409.449 821.549,410.282 822.5,411C 821.167,411.667 819.833,411.667 818.5,411C 817.638,408.266 816.805,408.099 816,410.5C 814.627,410.596 813.127,410.43 811.5,410C 813.007,410.837 813.507,412.004 813,413.5C 812,412.167 811,412.167 810,413.5C 806.391,411.139 803.391,408.806 801,406.5C 798.274,409.152 796.274,408.485 795,404.5C 794.577,405.956 793.744,406.456 792.5,406C 792.957,405.586 793.291,405.086 793.5,404.5C 791.137,401.469 788.137,399.136 784.5,397.5C 782.305,394.471 779.638,391.971 776.5,390C 776.833,389.667 777.167,389.333 777.5,389C 774.063,387.895 771.563,385.728 770,382.5C 769.667,382.833 769.333,383.167 769,383.5C 767.21,380.895 764.71,379.395 761.5,379C 761.833,378.667 762.167,378.333 762.5,378C 757.606,376.314 754.106,373.147 752,368.5C 751.617,369.056 751.117,369.389 750.5,369.5C 745.202,356.031 735.869,346.197 722.5,340C 718.278,338.362 713.945,337.195 709.5,336.5C 716.077,323.006 723.41,310.006 731.5,297.5C 732.117,297.389 732.617,297.056 733,296.5C 734.337,298.004 736.004,299.004 738,299.5C 740.498,298.879 742.832,299.545 745,301.5C 745.414,301.043 745.914,300.709 746.5,300.5C 751.303,302.243 756.136,303.909 761,305.5C 761.772,305.355 762.439,305.022 763,304.5C 765.089,305.991 767.089,307.658 769,309.5C 769.333,309.167 769.667,308.833 770,308.5C 772.774,309.687 775.441,311.02 778,312.5C 778.333,311.5 778.667,310.5 779,309.5C 780.824,311.726 782.657,313.226 784.5,314C 786.5,314.333 788.5,314.667 790.5,315C 789.549,315.718 789.383,316.551 790,317.5C 791.049,316.483 792.216,316.316 793.5,317C 794.26,320.667 795.76,321.167 798,318.5C 799.582,319.96 800.915,321.627 802,323.5C 803.049,322.483 804.216,322.316 805.5,323C 806.923,326.092 809.257,328.092 812.5,329C 812.167,329.333 811.833,329.667 811.5,330C 812.993,331.368 814.493,331.535 816,330.5C 816.681,334.159 818.681,335.492 822,334.5C 824.36,336.853 827.027,338.853 830,340.5C 830.772,340.355 831.439,340.022 832,339.5C 837.376,342.442 842.542,345.776 847.5,349.5C 850.823,349.52 853.489,351.187 855.5,354.5C 857.741,355.129 859.741,356.129 861.5,357.5 Z"/></g> +<g><path style="opacity:1" fill="#505556" d="M 656.5,335.5 C 650.167,344.833 643.833,354.167 637.5,363.5C 530.166,363.333 422.833,363.5 315.5,364C 314.584,364.278 313.918,364.778 313.5,365.5C 308.559,367.442 304.892,370.775 302.5,375.5C 301.207,376.842 300.374,378.509 300,380.5C 299.168,451.335 299.335,522.001 300.5,592.5C 302.284,599.283 306.284,604.283 312.5,607.5C 313.93,608.537 315.597,609.204 317.5,609.5C 367.331,610.499 417.331,610.832 467.5,610.5C 467.167,640.507 467.5,670.507 468.5,700.5C 469.107,700.376 469.44,700.043 469.5,699.5C 470.5,699.167 471.167,698.5 471.5,697.5C 500.833,668.5 530.167,639.5 559.5,610.5C 609.168,610.667 658.834,610.5 708.5,610C 709.416,609.722 710.082,609.222 710.5,608.5C 716.622,605.204 720.789,600.204 723,593.5C 723.667,522.167 723.667,450.833 723,379.5C 720.359,371.418 714.859,366.418 706.5,364.5C 702.366,363.515 698.032,363.182 693.5,363.5C 698.081,353.997 703.414,344.997 709.5,336.5C 713.945,337.195 718.278,338.362 722.5,340C 735.869,346.197 745.202,356.031 750.5,369.5C 750.804,372.522 751.304,375.522 752,378.5C 752.667,450.167 752.667,521.833 752,593.5C 747.698,617.135 733.865,631.635 710.5,637C 662.833,637.333 615.167,637.667 567.5,638C 526.632,678.701 485.965,719.535 445.5,760.5C 444.833,719.5 444.167,678.5 443.5,637.5C 400.5,637.5 357.5,637.5 314.5,637.5C 290.562,633.045 276.395,618.712 272,594.5C 271.333,522.167 271.333,449.833 272,377.5C 277.068,355.432 290.568,341.599 312.5,336C 427.166,335.5 541.833,335.333 656.5,335.5 Z"/></g> +<g><path style="opacity:1" fill="#c0c2c2" d="M 637.5,363.5 C 637.5,364.167 637.167,364.5 636.5,364.5C 528.812,364.175 421.145,364.508 313.5,365.5C 313.918,364.778 314.584,364.278 315.5,364C 422.833,363.5 530.166,363.333 637.5,363.5 Z"/></g> +<g><path style="opacity:1" fill="#bfbab7" d="M 693.5,363.5 C 698.032,363.182 702.366,363.515 706.5,364.5C 701.737,364.226 697.07,364.559 692.5,365.5C 692.328,364.508 692.662,363.842 693.5,363.5 Z"/></g> +<g><path style="opacity:1" fill="#fefefe" d="M 636.5,364.5 C 624.83,381.68 613.33,399.013 602,416.5C 586.361,448.774 571.028,481.107 556,513.5C 553.438,519.305 552.938,525.305 554.5,531.5C 556.372,536.043 559.705,538.709 564.5,539.5C 568.62,539.072 572.287,537.572 575.5,535C 601.906,504.007 626.74,471.84 650,438.5C 663.689,413.776 677.855,389.443 692.5,365.5C 697.07,364.559 701.737,364.226 706.5,364.5C 714.859,366.418 720.359,371.418 723,379.5C 723.667,450.833 723.667,522.167 723,593.5C 720.789,600.204 716.622,605.204 710.5,608.5C 660.02,609.149 609.687,609.815 559.5,610.5C 530.167,639.5 500.833,668.5 471.5,697.5C 469.836,668.348 468.836,639.014 468.5,609.5C 416.646,608.816 364.646,608.149 312.5,607.5C 306.284,604.283 302.284,599.283 300.5,592.5C 300.333,522.166 300.5,451.833 301,381.5C 302.128,379.655 302.628,377.655 302.5,375.5C 304.892,370.775 308.559,367.442 313.5,365.5C 421.145,364.508 528.812,364.175 636.5,364.5 Z"/></g> +<g><path style="opacity:1" fill="#a6a8a8" d="M 302.5,375.5 C 302.628,377.655 302.128,379.655 301,381.5C 300.5,451.833 300.333,522.166 300.5,592.5C 299.335,522.001 299.168,451.335 300,380.5C 300.374,378.509 301.207,376.842 302.5,375.5 Z"/></g> +<g><path style="opacity:1" fill="#cfd1d1" d="M 312.5,607.5 C 364.646,608.149 416.646,608.816 468.5,609.5C 418.167,609.5 367.833,609.5 317.5,609.5C 315.597,609.204 313.93,608.537 312.5,607.5 Z"/></g> +<g><path style="opacity:1" fill="#737778" d="M 317.5,609.5 C 367.833,609.5 418.167,609.5 468.5,609.5C 468.169,639.671 468.502,669.671 469.5,699.5C 469.44,700.043 469.107,700.376 468.5,700.5C 467.5,670.507 467.167,640.507 467.5,610.5C 417.331,610.832 367.331,610.499 317.5,609.5 Z"/></g> +<g><path style="opacity:1" fill="#6f7474" d="M 710.5,608.5 C 710.082,609.222 709.416,609.722 708.5,610C 658.834,610.5 609.168,610.667 559.5,610.5C 609.687,609.815 660.02,609.149 710.5,608.5 Z"/></g> +<g><path style="opacity:1" fill="#d2d3d4" d="M 468.5,609.5 C 468.836,639.014 469.836,668.348 471.5,697.5C 471.167,698.5 470.5,699.167 469.5,699.5C 468.502,669.671 468.169,639.671 468.5,609.5 Z"/></g> +<g><path style="opacity:1" fill="#d1d3d3" d="M 314.5,637.5 C 357.5,637.5 400.5,637.5 443.5,637.5C 442.839,679.18 443.506,720.513 445.5,761.5C 444.791,762.404 443.791,762.737 442.5,762.5C 442.5,721.167 442.5,679.833 442.5,638.5C 399.663,638.832 356.997,638.499 314.5,637.5 Z"/></g> +<g><path style="opacity:1" fill="#888b8c" d="M 443.5,637.5 C 444.167,678.5 444.833,719.5 445.5,760.5C 445.5,760.833 445.5,761.167 445.5,761.5C 443.506,720.513 442.839,679.18 443.5,637.5 Z"/></g> +</svg> diff --git a/resources/linux/ch.openboard.openboard-ubz.xml b/resources/linux/ch.openboard.openboard-ubz.xml new file mode 100644 index 000000000..aaa7feaf8 --- /dev/null +++ b/resources/linux/ch.openboard.openboard-ubz.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> + <mime-type type="application/ubz"> + <icon name="ch.openboard.application-ubz"/> + <comment>OpenBoard document file</comment> + <comment xml:lang="fr">Document OpenBoard</comment> + <comment xml:lang="de">OpenBoard Dokument</comment> + <glob pattern="*.ubz"/> + </mime-type> +</mime-info> diff --git a/resources/etc/asyncAPI.js b/resources/template/asyncAPI.js similarity index 100% rename from resources/etc/asyncAPI.js rename to resources/template/asyncAPI.js diff --git a/resources/etc/img/loading.gif b/resources/template/img/loading.gif similarity index 100% rename from resources/etc/img/loading.gif rename to resources/template/img/loading.gif diff --git a/resources/etc/intranet-podcast-metadata.template b/resources/template/intranet-podcast-metadata.template similarity index 100% rename from resources/etc/intranet-podcast-metadata.template rename to resources/template/intranet-podcast-metadata.template diff --git a/resources/etc/npapi-wrapper.application.x-shockwave-flash.swf.htm b/resources/template/npapi-wrapper.application.x-shockwave-flash.swf.htm similarity index 100% rename from resources/etc/npapi-wrapper.application.x-shockwave-flash.swf.htm rename to resources/template/npapi-wrapper.application.x-shockwave-flash.swf.htm diff --git a/resources/etc/npapi-wrapper.config.xml b/resources/template/npapi-wrapper.config.xml similarity index 100% rename from resources/etc/npapi-wrapper.config.xml rename to resources/template/npapi-wrapper.config.xml diff --git a/src/adaptors/CMakeLists.txt b/src/adaptors/CMakeLists.txt new file mode 100644 index 000000000..ef91e1096 --- /dev/null +++ b/src/adaptors/CMakeLists.txt @@ -0,0 +1,38 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBCFFSubsetAdaptor.cpp + UBCFFSubsetAdaptor.h + UBExportAdaptor.cpp + UBExportAdaptor.h + UBExportCFF.cpp + UBExportCFF.h + UBExportDocument.cpp + UBExportDocument.h + UBExportDocumentSetAdaptor.cpp + UBExportDocumentSetAdaptor.h + UBExportFullPDF.cpp + UBExportFullPDF.h + UBExportPDF.cpp + UBExportPDF.h + UBExportWeb.cpp + UBExportWeb.h + UBImportAdaptor.cpp + UBImportAdaptor.h + UBImportCFF.cpp + UBImportCFF.h + UBImportDocument.cpp + UBImportDocument.h + UBImportDocumentSetAdaptor.cpp + UBImportDocumentSetAdaptor.h + UBImportImage.cpp + UBImportImage.h + UBImportPDF.cpp + UBImportPDF.h + UBMetadataDcSubsetAdaptor.cpp + UBMetadataDcSubsetAdaptor.h + UBSvgSubsetAdaptor.cpp + UBSvgSubsetAdaptor.h + UBThumbnailAdaptor.cpp + UBThumbnailAdaptor.h + UBWidgetUpgradeAdaptor.cpp + UBWidgetUpgradeAdaptor.h +) diff --git a/src/adaptors/UBWidgetUpgradeAdaptor.cpp b/src/adaptors/UBWidgetUpgradeAdaptor.cpp index 503897c15..cb9c98f18 100644 --- a/src/adaptors/UBWidgetUpgradeAdaptor.cpp +++ b/src/adaptors/UBWidgetUpgradeAdaptor.cpp @@ -206,7 +206,7 @@ UBWidgetUpgradeAdaptor::Widget::Widget(const QString &dir) : m_path(dir), m_hasU if (widgetHashes.empty()) { - QFile widgetsMd5sum(UBPlatformUtils::applicationResourcesDirectory() + "/etc/widgets.md5sum"); + QFile widgetsMd5sum(UBPlatformUtils::applicationEtcDirectory() + "/widgets.md5sum"); if (widgetsMd5sum.open(QIODevice::ReadOnly)) { diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt new file mode 100644 index 000000000..0e2636097 --- /dev/null +++ b/src/api/CMakeLists.txt @@ -0,0 +1,8 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBW3CWidgetAPI.cpp + UBW3CWidgetAPI.h + UBWidgetMessageAPI.cpp + UBWidgetMessageAPI.h + UBWidgetUniboardAPI.cpp + UBWidgetUniboardAPI.h +) diff --git a/src/board/CMakeLists.txt b/src/board/CMakeLists.txt new file mode 100644 index 000000000..8e20f849e --- /dev/null +++ b/src/board/CMakeLists.txt @@ -0,0 +1,12 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBBoardController.cpp + UBBoardController.h + UBBoardPaletteManager.cpp + UBBoardPaletteManager.h + UBBoardView.cpp + UBBoardView.h + UBDrawingController.cpp + UBDrawingController.h + UBFeaturesController.cpp + UBFeaturesController.h +) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt new file mode 100644 index 000000000..eda1052a9 --- /dev/null +++ b/src/core/CMakeLists.txt @@ -0,0 +1,38 @@ +target_sources(${PROJECT_NAME} PRIVATE + main.cpp + UB.h + UBApplication.cpp + UBApplication.h + UBApplicationController.cpp + UBApplicationController.h + UBDisplayManager.cpp + UBDisplayManager.h + UBDocumentManager.cpp + UBDocumentManager.h + UBDownloadManager.cpp + UBDownloadManager.h + UBDownloadThread.cpp + UBDownloadThread.h + UBForeignObjectsHandler.cpp + UBForeignObjectsHandler.h + UBIdleTimer.cpp + UBIdleTimer.h + UBMimeData.cpp + UBMimeData.h + UBOpenSankoreImporter.cpp + UBOpenSankoreImporter.h + UBPersistenceManager.cpp + UBPersistenceManager.h + UBPersistenceWorker.cpp + UBPersistenceWorker.h + UBPreferencesController.cpp + UBPreferencesController.h + UBSceneCache.cpp + UBSceneCache.h + UBSetting.cpp + UBSetting.h + UBSettings.cpp + UBSettings.h + UBTextTools.cpp + UBTextTools.h +) diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index c076241df..c1b0f6236 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -139,7 +139,7 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : Single setStyle("fusion"); - QString css = UBFileSystemUtils::readTextFile(UBPlatformUtils::applicationResourcesDirectory() + "/etc/"+ qApp->applicationName()+".css"); + QString css = UBFileSystemUtils::readTextFile(UBPlatformUtils::applicationEtcDirectory() + "/"+ qApp->applicationName()+".css"); if (css.length() > 0) setStyleSheet(css); diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 9a7a6f691..c07c9b7a1 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -158,7 +158,7 @@ QSettings* UBSettings::getAppSettings() if (!UBSettings::sAppSettings) { QString tmpSettings = QDir::tempPath() + "/" + qApp->applicationName() + ".config"; - QString appSettings = UBPlatformUtils::applicationResourcesDirectory() + "/etc/" + qApp->applicationName() + ".config"; + QString appSettings = UBPlatformUtils::applicationEtcDirectory() + "/" + qApp->applicationName() + ".config"; // tmpSettings exists when upgrading Uniboard on Mac (see UBPlatformUtils_mac.mm updater:willInstallUpdate:) if (QFile::exists(tmpSettings)) diff --git a/src/desktop/CMakeLists.txt b/src/desktop/CMakeLists.txt new file mode 100644 index 000000000..6721aca8a --- /dev/null +++ b/src/desktop/CMakeLists.txt @@ -0,0 +1,10 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBCustomCaptureWindow.cpp + UBCustomCaptureWindow.h + UBDesktopAnnotationController.cpp + UBDesktopAnnotationController.h + UBDesktopPalette.cpp + UBDesktopPalette.h + UBDesktopPropertyPalette.cpp + UBDesktopPropertyPalette.h +) diff --git a/src/document/CMakeLists.txt b/src/document/CMakeLists.txt new file mode 100644 index 000000000..01211a908 --- /dev/null +++ b/src/document/CMakeLists.txt @@ -0,0 +1,10 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBDocumentContainer.cpp + UBDocumentContainer.h + UBDocumentController.cpp + UBDocumentController.h + UBDocumentProxy.cpp + UBDocumentProxy.h + UBSortFilterProxyModel.cpp + UBSortFilterProxyModel.h +) diff --git a/src/domain/CMakeLists.txt b/src/domain/CMakeLists.txt new file mode 100644 index 000000000..15bcab6b5 --- /dev/null +++ b/src/domain/CMakeLists.txt @@ -0,0 +1,58 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBGraphicsDelegateFrame.cpp + UBGraphicsDelegateFrame.h + UBGraphicsGroupContainerItem.cpp + UBGraphicsGroupContainerItem.h + UBGraphicsGroupContainerItemDelegate.cpp + UBGraphicsGroupContainerItemDelegate.h + UBGraphicsItemDelegate.cpp + UBGraphicsItemDelegate.h + UBGraphicsItemGroupUndoCommand.cpp + UBGraphicsItemGroupUndoCommand.h + UBGraphicsItemTransformUndoCommand.cpp + UBGraphicsItemTransformUndoCommand.h + UBGraphicsItemUndoCommand.cpp + UBGraphicsItemUndoCommand.h + UBGraphicsItemZLevelUndoCommand.cpp + UBGraphicsItemZLevelUndoCommand.h + UBGraphicsMediaItem.cpp + UBGraphicsMediaItem.h + UBGraphicsMediaItemDelegate.cpp + UBGraphicsMediaItemDelegate.h + UBGraphicsPDFItem.cpp + UBGraphicsPDFItem.h + UBGraphicsPixmapItem.cpp + UBGraphicsPixmapItem.h + UBGraphicsPolygonItem.cpp + UBGraphicsPolygonItem.h + UBGraphicsScene.cpp + UBGraphicsScene.h + UBGraphicsStroke.cpp + UBGraphicsStroke.h + UBGraphicsStrokesGroup.cpp + UBGraphicsStrokesGroup.h + UBGraphicsSvgItem.cpp + UBGraphicsSvgItem.h + UBGraphicsTextItem.cpp + UBGraphicsTextItem.h + UBGraphicsTextItemDelegate.cpp + UBGraphicsTextItemDelegate.h + UBGraphicsTextItemUndoCommand.cpp + UBGraphicsTextItemUndoCommand.h + UBGraphicsWidgetItem.cpp + UBGraphicsWidgetItem.h + UBGraphicsWidgetItemDelegate.cpp + UBGraphicsWidgetItemDelegate.h + UBItem.cpp + UBItem.h + UBPageSizeUndoCommand.cpp + UBPageSizeUndoCommand.h + UBResizableGraphicsItem.cpp + UBResizableGraphicsItem.h + UBSelectionFrame.cpp + UBSelectionFrame.h + UBUndoCommand.cpp + UBUndoCommand.h + UBWebEngineView.cpp + UBWebEngineView.h +) diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index 2ecad9587..53c01e9c8 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -1279,14 +1279,14 @@ void UBGraphicsW3CWidgetItem::loadNPAPIWrappersTemplates() if (!sTemplateLoaded) { sNPAPIWrapperTemplates.clear(); - QString etcPath = UBPlatformUtils::applicationResourcesDirectory() + "/etc/"; + QString templatePath = UBPlatformUtils::applicationResourcesDirectory() + "/template/"; - QDir etcDir(etcPath); + QDir templateDir(templatePath); - foreach(QString fileName, etcDir.entryList()) { + foreach(QString fileName, templateDir.entryList()) { if (fileName.startsWith("npapi-wrapper") && (fileName.endsWith(".htm") || fileName.endsWith(".html"))) { - QString htmlContent = UBFileSystemUtils::readTextFile(etcPath + fileName); + QString htmlContent = UBFileSystemUtils::readTextFile(templatePath + fileName); if (htmlContent.length() > 0) { QStringList tokens = fileName.split("."); @@ -1303,7 +1303,7 @@ void UBGraphicsW3CWidgetItem::loadNPAPIWrappersTemplates() } } } - sNPAPIWrappperConfigTemplate = UBFileSystemUtils::readTextFile(etcPath + "npapi-wrapper.config.xml"); + sNPAPIWrappperConfigTemplate = UBFileSystemUtils::readTextFile(templatePath + "npapi-wrapper.config.xml"); sTemplateLoaded = true; } } diff --git a/src/frameworks/CMakeLists.txt b/src/frameworks/CMakeLists.txt new file mode 100644 index 000000000..3bb0d7766 --- /dev/null +++ b/src/frameworks/CMakeLists.txt @@ -0,0 +1,32 @@ +target_sources(openboard PRIVATE + UBBase32.cpp + UBBase32.h + UBCoreGraphicsScene.cpp + UBCoreGraphicsScene.h + UBCryptoUtils.cpp + UBCryptoUtils.h + UBFileSystemUtils.cpp + UBFileSystemUtils.h + UBGeometryUtils.cpp + UBGeometryUtils.h + UBPlatformUtils.cpp + UBPlatformUtils.h + UBStringUtils.cpp + UBStringUtils.h + UBVersion.cpp + UBVersion.h +) + +if(LINUX) + target_sources(openboard PRIVATE + UBPlatformUtils_linux.cpp + ) +elseif(WIN32) + target_sources(openboard PRIVATE + UBPlatformUtils_win.cpp + ) +elseif(MACOS) + target_sources(openboard PRIVATE + UBPlatformUtils_mac.mm + ) +endif() diff --git a/src/frameworks/UBPlatformUtils.h b/src/frameworks/UBPlatformUtils.h index da9fd1295..2c9515a5d 100644 --- a/src/frameworks/UBPlatformUtils.h +++ b/src/frameworks/UBPlatformUtils.h @@ -191,6 +191,7 @@ class UBPlatformUtils static void init(); static void destroy(); static QString applicationResourcesDirectory(); + static QString applicationEtcDirectory(); static void hideFile(const QString &filePath); static void setFileType(const QString &filePath, unsigned long fileType); static void fadeDisplayOut(); diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp index cff17b1d3..61a2d0aad 100644 --- a/src/frameworks/UBPlatformUtils_linux.cpp +++ b/src/frameworks/UBPlatformUtils_linux.cpp @@ -33,6 +33,7 @@ #include <QApplication> #include <QDBusConnectionInterface> #include <QDBusInterface> +#include <QProcessEnvironment> #include <unistd.h> #include <X11/keysym.h> @@ -50,7 +51,20 @@ void UBPlatformUtils::init() QString UBPlatformUtils::applicationResourcesDirectory() { +#ifdef APP_PREFIX + return QProcessEnvironment::systemEnvironment().value("APP_PREFIX", APP_PREFIX); +#else return QApplication::applicationDirPath(); +#endif +} + +QString UBPlatformUtils::applicationEtcDirectory() +{ +#ifdef ETC_PREFIX + return QProcessEnvironment::systemEnvironment().value("ETC_PREFIX", ETC_PREFIX); +#else + return applicationResourcesDirectory() + "/etc"; +#endif } void UBPlatformUtils::hideFile(const QString &filePath) diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm index 4ecb705a6..14c6ed303 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -123,6 +123,11 @@ OSStatus emptySetSystemUIMode ( return path; } +QString UBPlatformUtils::applicationEtcDirectory() +{ + return applicationResourcesDirectory() + "/etc"; +} + void UBPlatformUtils::hideFile(const QString &filePath) { FSRef ref; diff --git a/src/frameworks/UBPlatformUtils_win.cpp b/src/frameworks/UBPlatformUtils_win.cpp index c85dafa75..bb6f4c68f 100644 --- a/src/frameworks/UBPlatformUtils_win.cpp +++ b/src/frameworks/UBPlatformUtils_win.cpp @@ -51,6 +51,10 @@ QString UBPlatformUtils::applicationResourcesDirectory() return QApplication::applicationDirPath(); } +QString UBPlatformUtils::applicationEtcDirectory() +{ + return applicationResourcesDirectory() + "/etc"; +} void UBPlatformUtils::hideFile(const QString &filePath) { diff --git a/src/globals/CMakeLists.txt b/src/globals/CMakeLists.txt new file mode 100644 index 000000000..f49f865ec --- /dev/null +++ b/src/globals/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBGlobals.h +) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt new file mode 100644 index 000000000..524041d07 --- /dev/null +++ b/src/gui/CMakeLists.txt @@ -0,0 +1,98 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBActionPalette.cpp + UBActionPalette.h + UBBackgroundPalette.cpp + UBBackgroundPalette.h + UBBlackoutWidget.cpp + UBBlackoutWidget.h + UBBoardThumbnailsView.cpp + UBBoardThumbnailsView.h + UBCachePropertiesWidget.cpp + UBCachePropertiesWidget.h + UBCircleFrame.cpp + UBCircleFrame.h + UBColorPicker.cpp + UBColorPicker.h + UBDockDownloadWidget.cpp + UBDockDownloadWidget.h + UBDockPalette.cpp + UBDockPalette.h + UBDockPaletteWidget.cpp + UBDockPaletteWidget.h + UBDocumentThumbnailWidget.cpp + UBDocumentThumbnailWidget.h + UBDocumentToolsPalette.cpp + UBDocumentToolsPalette.h + UBDownloadWidget.cpp + UBDownloadWidget.h + UBFavoriteToolPalette.cpp + UBFavoriteToolPalette.h + UBFeaturesActionBar.cpp + UBFeaturesActionBar.h + UBFeaturesWidget.cpp + UBFeaturesWidget.h + UBFloatingPalette.cpp + UBFloatingPalette.h + UBIconButton.cpp + UBIconButton.h + UBKeyboardPalette.cpp + UBKeyboardPalette.h + UBLeftPalette.cpp + UBLeftPalette.h + UBMagnifer.cpp + UBMagnifer.h + UBMainWindow.cpp + UBMainWindow.h + UBMessageWindow.cpp + UBMessageWindow.h + UBMessagesDialog.cpp + UBMessagesDialog.h + UBMousePressFilter.cpp + UBMousePressFilter.h + UBOpenSankoreImporterWidget.cpp + UBOpenSankoreImporterWidget.h + UBPageNavigationWidget.cpp + UBPageNavigationWidget.h + UBPropertyPalette.cpp + UBPropertyPalette.h + UBResources.cpp + UBResources.h + UBRightPalette.cpp + UBRightPalette.h + UBRubberBand.cpp + UBRubberBand.h + UBScreenMirror.cpp + UBScreenMirror.h + UBSpinningWheel.cpp + UBSpinningWheel.h + UBStartupHintsPalette.cpp + UBStartupHintsPalette.h + UBStylusPalette.cpp + UBStylusPalette.h + UBThumbnailView.cpp + UBThumbnailView.h + UBThumbnailWidget.cpp + UBThumbnailWidget.h + UBToolWidget.cpp + UBToolWidget.h + UBToolbarButtonGroup.cpp + UBToolbarButtonGroup.h + UBUpdateDlg.cpp + UBUpdateDlg.h + UBWebToolsPalette.cpp + UBWebToolsPalette.h + UBWidgetMirror.cpp + UBWidgetMirror.h + UBZoomPalette.cpp + UBZoomPalette.h +) + +if(LINUX) + target_sources(openboard PRIVATE + UBKeyboardPalette_linux.cpp + ) +elseif(WIN32) + target_sources(openboard PRIVATE + UBKeyboardPalette_win.cpp + ) +endif() diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt new file mode 100644 index 000000000..c8a76aa13 --- /dev/null +++ b/src/network/CMakeLists.txt @@ -0,0 +1,14 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBAutoSaver.cpp + UBAutoSaver.h + UBCookieJar.cpp + UBCookieJar.h + UBHttpFileDownloader.cpp + UBHttpFileDownloader.h + UBHttpGet.cpp + UBHttpGet.h + UBNetworkAccessManager.cpp + UBNetworkAccessManager.h + UBServerXMLHttpRequest.cpp + UBServerXMLHttpRequest.h +) diff --git a/src/pdf-merger/CMakeLists.txt b/src/pdf-merger/CMakeLists.txt new file mode 100644 index 000000000..e70903075 --- /dev/null +++ b/src/pdf-merger/CMakeLists.txt @@ -0,0 +1,50 @@ +target_sources(${PROJECT_NAME} PRIVATE + ASCII85Decode.cpp + ASCII85Decode.h + ASCIIHexDecode.cpp + ASCIIHexDecode.h + AnnotsHandler.cpp + AnnotsHandler.h + CCITTFaxDecode.cpp + CCITTFaxDecode.h + ContentHandler.cpp + ContentHandler.h + DCTDecode.cpp + DCTDecode.h + Document.cpp + Document.h + Filter.cpp + Filter.h + FilterPredictor.cpp + FilterPredictor.h + FlateDecode.cpp + FlateDecode.h + JBIG2Decode.cpp + JBIG2Decode.h + LZWDecode.cpp + LZWDecode.h + Merger.cpp + Merger.h + Object.cpp + Object.h + OverlayDocumentParser.cpp + OverlayDocumentParser.h + Page.cpp + Page.h + PageElementHandler.cpp + PageElementHandler.h + Parser.cpp + Parser.h + Rectangle.cpp + Rectangle.h + RemoveHimselfHandler.cpp + RemoveHimSelfHandler.h + RunLengthDecode.cpp + RunLengthDecode.h + Utils.cpp + Utils.h +) + +target_include_directories(${PROJECT_NAME} PRIVATE + . +) diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt new file mode 100644 index 000000000..278eb64d2 --- /dev/null +++ b/src/pdf/CMakeLists.txt @@ -0,0 +1,8 @@ +target_sources(${PROJECT_NAME} PRIVATE + GraphicsPDFItem.cpp + GraphicsPDFItem.h + PDFRenderer.cpp + PDFRenderer.h + XPDFRenderer.cpp + XPDFRenderer.h +) diff --git a/src/podcast/CMakeLists.txt b/src/podcast/CMakeLists.txt new file mode 100644 index 000000000..ca7087809 --- /dev/null +++ b/src/podcast/CMakeLists.txt @@ -0,0 +1,30 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBAbstractVideoEncoder.cpp + UBAbstractVideoEncoder.h + UBPodcastController.cpp + UBPodcastController.h + UBPodcastRecordingPalette.cpp + UBPodcastRecordingPalette.h + intranet/UBIntranetPodcastPublisher.cpp + intranet/UBIntranetPodcastPublisher.h + youtube/UBYouTubePublisher.cpp + youtube/UBYouTubePublisher.h +) + +if(WIN32) + target_sources(${PROJECT_NAME} PRIVATE + windowsmedia/UBWindowsMediaVideoEncoder.cpp + windowsmedia/UBWindowsMediaVideoEncoder.h + windowsmedia/UBWindowsMediaFile.cpp + windowsmedia/UBWindowsMediaFile.h + windowsmedia/UBWaveRecorder.cpp + windowsmedia/UBWaveRecorder.h + ) +else() + target_sources(${PROJECT_NAME} PRIVATE + ffmpeg/UBFFmpegVideoEncoder.cpp + ffmpeg/UBFFmpegVideoEncoder.h + ffmpeg/UBMicrophoneInput.cpp + ffmpeg/UBMicrophoneInput.h + ) +endif() diff --git a/src/podcast/intranet/UBIntranetPodcastPublisher.cpp b/src/podcast/intranet/UBIntranetPodcastPublisher.cpp index 3f9a96f40..d7a107b64 100644 --- a/src/podcast/intranet/UBIntranetPodcastPublisher.cpp +++ b/src/podcast/intranet/UBIntranetPodcastPublisher.cpp @@ -154,7 +154,7 @@ QString UBIntranetPodcastPublisher::metadata() QString computerName = UBPlatformUtils::computerName(); QString fileSize = QString("%1").arg(fi.size()); - QString templatePath = UBPlatformUtils::applicationResourcesDirectory() + "/etc/intranet-podcast-metadata.template"; + QString templatePath = UBPlatformUtils::applicationResourcesDirectory() + "/template/intranet-podcast-metadata.template"; QString templateContent = UBFileSystemUtils::readTextFile(templatePath); return templateContent.replace("{title}", mTitle) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt new file mode 100644 index 000000000..3886d6963 --- /dev/null +++ b/src/tools/CMakeLists.txt @@ -0,0 +1,22 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBAbstractDrawRuler.cpp + UBAbstractDrawRuler.h + UBGraphicsAxes.cpp + UBGraphicsAxes.h + UBGraphicsCache.cpp + UBGraphicsCache.h + UBGraphicsCompass.cpp + UBGraphicsCompass.h + UBGraphicsCurtainItem.cpp + UBGraphicsCurtainItem.h + UBGraphicsCurtainItemDelegate.cpp + UBGraphicsCurtainItemDelegate.h + UBGraphicsProtractor.cpp + UBGraphicsProtractor.h + UBGraphicsRuler.cpp + UBGraphicsRuler.h + UBGraphicsTriangle.cpp + UBGraphicsTriangle.h + UBToolsManager.cpp + UBToolsManager.h +) diff --git a/src/web/CMakeLists.txt b/src/web/CMakeLists.txt new file mode 100644 index 000000000..45277ec12 --- /dev/null +++ b/src/web/CMakeLists.txt @@ -0,0 +1,35 @@ +target_sources(${PROJECT_NAME} PRIVATE + UBEmbedContent.cpp + UBEmbedContent.h + UBEmbedController.cpp + UBEmbedController.h + UBEmbedParser.cpp + UBEmbedParser.h + UBWebController.cpp + UBWebController.h + simplebrowser/WBHistory.cpp + simplebrowser/WBHistory.h + simplebrowser/WBModelMenu.cpp + simplebrowser/WBModelMenu.h + simplebrowser/browserwindow.cpp + simplebrowser/browserwindow.h + simplebrowser/downloadmanagerwidget.cpp + simplebrowser/downloadmanagerwidget.h + simplebrowser/downloadwidget.cpp + simplebrowser/downloadwidget.h + simplebrowser/tabwidget.cpp + simplebrowser/tabwidget.h + simplebrowser/webpage.cpp + simplebrowser/webpage.h + simplebrowser/webpopupwindow.cpp + simplebrowser/webpopupwindow.h + simplebrowser/webview.cpp + simplebrowser/webview.h +) + +qt_add_resources(${PROJECT_NAME} + simplebrowser/certificateerrordialog.ui + simplebrowser/downloadmanagerwidget.ui + simplebrowser/downloadwidget.ui + simplebrowser/passworddialog.ui +) diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp index df3bffba5..31e4e8616 100644 --- a/src/web/UBWebController.cpp +++ b/src/web/UBWebController.cpp @@ -415,7 +415,7 @@ void UBWebController::injectScripts(QWebEngineView *view) qDebug() << "Injecting qwebchannel.js"; QString src = js.readAll(); - QFile asyncwrapper(UBPlatformUtils::applicationResourcesDirectory() + "/etc/asyncAPI.js"); + QFile asyncwrapper(UBPlatformUtils::applicationResourcesDirectory() + "/template/asyncAPI.js"); if (asyncwrapper.open(QIODevice::ReadOnly)) { From 5ed9d68afc52d071135640e8da5c35308cd5d318 Mon Sep 17 00:00:00 2001 From: letsfindaway <me@letsfindaway.de> Date: Sun, 30 Oct 2022 08:09:24 +0100 Subject: [PATCH 2/3] fix: compatibility with Qt 5.12 and Qt 6 - use qt5_add_resources and qt5_add_translation for Qt 5.12 - add .ui and .ts files using target_sources - add QT_VERSION when linking to Qt libraries (needed for Qt 5.12) --- CMakeLists.txt | 18 +++++++++++++++--- cmake/DependencyQt.cmake | 2 +- resources/forms/CMakeLists.txt | 3 +-- src/web/CMakeLists.txt | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65b487911..f6900ac39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ cmake_minimum_required(VERSION 3.16) # cmake -S <srcdir> -B <builddir> -DCMAKE_INSTALL_PREFIX:PATH=/opt # # Build and install +# cd <builddir> # cmake --build . [-j<n>] # DESTDIR=<installdir> cmake --install . # ========================================================================== @@ -174,7 +175,12 @@ endif() # Resources # ========================================================================== -qt_add_resources(OPENBOARD_RESOURCES ${OPENBOARD_QRC_FILE}) +if(Qt5_VERSION AND Qt5_VERSION VERSION_LESS "5.15") + qt5_add_resources(OPENBOARD_RESOURCES ${OPENBOARD_QRC_FILE}) +else() + qt_add_resources(OPENBOARD_RESOURCES ${OPENBOARD_QRC_FILE}) +endif() + target_sources(${PROJECT_NAME} PRIVATE ${OPENBOARD_RESOURCES}) @@ -184,8 +190,14 @@ target_sources(${PROJECT_NAME} PRIVATE ${OPENBOARD_RESOURCES}) file(GLOB OPENBOARD_TS_FILES ${OPENBOARD_TS_DIR}/*.ts) set_source_files_properties(${OPENBOARD_TS_FILES} PROPERTIES OUTPUT_LOCATION ${PROJECT_BINARY_DIR}/i18n) -qt_add_translation(QM_FILES ${OPENBOARD_TS_FILES}) -target_sources(${PROJECT_NAME} PRIVATE ${QM_FILES}) + +if(Qt5_VERSION AND Qt5_VERSION VERSION_LESS "5.15") + qt5_add_translation(QM_FILES ${OPENBOARD_TS_FILES}) +else() + qt_add_translation(QM_FILES ${OPENBOARD_TS_FILES}) +endif() + +target_sources(${PROJECT_NAME} PRIVATE ${QM_FILES} ${OPENBOARD_TS_FILES}) # ========================================================================== diff --git a/cmake/DependencyQt.cmake b/cmake/DependencyQt.cmake index d8d0a1339..506f12293 100644 --- a/cmake/DependencyQt.cmake +++ b/cmake/DependencyQt.cmake @@ -32,7 +32,7 @@ else() message(FATAL_ERROR "Qt Version ${QT_VERSION} not supported") endif() -list(TRANSFORM QT_COMPONENTS PREPEND Qt::) +list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION}::) target_link_libraries(${PROJECT_NAME} ${QT_COMPONENTS} diff --git a/resources/forms/CMakeLists.txt b/resources/forms/CMakeLists.txt index 554b52e93..547ea5411 100644 --- a/resources/forms/CMakeLists.txt +++ b/resources/forms/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_add_resources(${PROJECT_NAME} +target_sources(${PROJECT_NAME} PRIVATE blackoutWidget.ui brushProperties.ui capturePublishing.ui @@ -7,7 +7,6 @@ qt_add_resources(${PROJECT_NAME} intranetPodcastPublishingDialog.ui mainWindow.ui preferences.ui - preferences.ui.autosave trapFlash.ui youTubePublishingDialog.ui ) diff --git a/src/web/CMakeLists.txt b/src/web/CMakeLists.txt index 45277ec12..590476e34 100644 --- a/src/web/CMakeLists.txt +++ b/src/web/CMakeLists.txt @@ -27,7 +27,7 @@ target_sources(${PROJECT_NAME} PRIVATE simplebrowser/webview.h ) -qt_add_resources(${PROJECT_NAME} +target_sources(${PROJECT_NAME} PRIVATE simplebrowser/certificateerrordialog.ui simplebrowser/downloadmanagerwidget.ui simplebrowser/downloadwidget.ui From 6ff5d2c7f339e1612a8e6e836061f0d96b03d8fc Mon Sep 17 00:00:00 2001 From: letsfindaway <me@letsfindaway.de> Date: Sat, 5 Nov 2022 08:52:48 +0100 Subject: [PATCH 3/3] chore: add cpack packaging (by @sebojolais) - add cpack packaging instructions - configure for deb and rpm packages based on proposal of @sebojolais --- CMakeLists.txt | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6900ac39..ebd94ffce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,9 @@ cmake_minimum_required(VERSION 3.16) # cd <builddir> # cmake --build . [-j<n>] # DESTDIR=<installdir> cmake --install . +# +# Package +# cpack -G <DEB|RPM|NSIS|DMG> # ========================================================================== # ========================================================================== @@ -31,7 +34,12 @@ cmake_minimum_required(VERSION 3.16) # The project will now be named all lowercase on all platforms # ========================================================================== -project(openboard VERSION 1.7.0 LANGUAGES CXX) +project(openboard + VERSION 1.7.0 + DESCRIPTION "OpenBoard is an open source cross-platform interactive white board application designed primarily for use in schools. It was originally forked from Open-Sankoré, which was itself based on Uniboard." + HOMEPAGE_URL "https://www.openboard.org" + LANGUAGES CXX +) set(VERSION_TYPE a) # a = alpha, b = beta, rc = release candidate, r = release, other => error set(VERSION_BUILD 1027) @@ -244,3 +252,25 @@ if(LINUX) install(FILES ${OPENBOARD_MIMETYPE_FILE} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mime/packages) install(FILES ${OPENBOARD_MIMEICON_FILE} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/mimetypes) endif() + + +# ========================================================================== +# Packaging +# ========================================================================== + +include(InstallRequiredSystemLibraries) +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") +set(CPACK_PACKAGE_VERSION "${VERSION}") +set(CPACK_PACKAGE_CONTACT "The OpenBoard team") +set(CPACK_STRIP_FILES TRUE) + +# Debian specific settings +set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") +set(CPACK_DEBIAN_PACKAGE_SUGGESTS onboard) + +# RPM specific settings +set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") +set(CPACK_RPM_PACKAGE_SUGGESTS onboard) + +# create packager +include(CPack)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
