Skip to content
Commits on Source (5)
Expand all Show whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ 6411d982
......@@ -24,7 +24,7 @@ string(TIMESTAMP YEAR "%Y")
set(EXPIRE_YEAR "2021")
set(DEBIAN_RELEASE_INFO "/etc/debian_version")
if((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR}))
if(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR APPLE)
message( STATUS "Apply patches to fix build system on Debian")
execute_process(COMMAND bash "-c" "patch --quiet -p1 < FindPROJ4.patch"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
......@@ -32,7 +32,7 @@ if((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR}))
execute_process(COMMAND bash "-c" "patch --quiet -p1 < FindQuaZip5.patch"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_QUIET)
endif((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR}))
endif(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR APPLE)
......@@ -40,7 +40,7 @@ endif((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR}))
# Define project name and version tags
###############################################################################################
# this is not only the QMS version it will be the package version, too.
project(QMapShack VERSION 1.13.1)
project(QMapShack VERSION 1.13.2)
# FOR A RELEASE:
# remove "development" for a release
......@@ -105,11 +105,10 @@ if (APPLE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -framework Foundation -framework DiskArbitration")
SET(LINK_FLAGS "${LINK_FLAGS} -framework Foundation -framework DiskArbitration")
SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.11")
endif(APPLE)
if(WIN32)
set(QT_DEV_PATH "C:\\Qt5\\5.12.1\\msvc2017_64" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.12.1\\msvc2017_64")
set(QT_DEV_PATH "C:\\Qt5\\5.12.3\\msvc2017_64" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.12.3\\msvc2017_64")
set(GDAL_DEV_PATH "C:\\GDAL" CACHE PATH "Path to directory containing GDAL include and lib, e.g. M:\\lib\\gdal")
set(PROJ4_DEV_PATH "C:\\PROJ6" CACHE PATH "Path to directory containing PROJ.4 include and lib, e.g. M:\\lib\\PROJ6")
set(ROUTINO_DEV_PATH "C:\\routino" CACHE PATH "Path to directory containing routino include and lib, e.g. M:\\lib\\routino")
......
CMakeLists.txt.user
View file @ 6411d982
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.6.1, 2019-07-22T14:47:05. -->
<!-- Written by QtCreator 4.6.1, 2019-09-11T13:28:32. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
......@@ -67,7 +67,7 @@
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<valuelist type="QVariantList" key="CMake.Configuration">
<value type="QString">BUILD_QMAPTOOL:BOOL=OFF</value>
<value type="QString">BUILD_QMAPTOOL:BOOL=ON</value>
<value type="QString">CMAKE_BUILD_TYPE:STRING=Debug</value>
<value type="QString">CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++</value>
<value type="QString">CMAKE_C_COMPILER:FILEPATH=/usr/bin/cc</value>
......@@ -231,7 +231,7 @@
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmaptool</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/build-QMapShack/bin</value>
<value type="int" key="PE.EnvironmentAspect.Base">-1</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmaptool</value>
......@@ -287,7 +287,7 @@
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmt_rgb2pct</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/build-QMapShack/bin</value>
<value type="int" key="PE.EnvironmentAspect.Base">-1</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmt_rgb2pct</value>
......@@ -343,7 +343,7 @@
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmt_map2jnx</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/build-QMapShack/bin</value>
<value type="int" key="PE.EnvironmentAspect.Base">-1</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmt_map2jnx</value>
......
MacOSX/HowtoBuildOSX.txt
View file @ 6411d982
Howto Building QMapShack on OS-X
Howto Building QMapShack on OS-X ( 21/8/2019 )
********************************
This document describes how to build QMapShack on OS-X.
......@@ -19,24 +19,29 @@ required:
- svn command line tool (for routino)
- mercurial (hg) command line tool
The best way is to install most of the required packages is by using brew.
Because brew nowadays does not include qt5 with mysql the best way is to install most of the required packages by using MacPorts and some by using brew.
When your build machine runs Mojave 10.14 QMapShack will also need 10.14 to run. For older OS X build system has to be an older version too.
Download the adequate MacPorts package 2.5.4 from https://github.com/macports/macports-base/releases/tag/v2.5.4, install it and use terminal to install the following packages:
sudo port install cmake
sudo port install qt5-qtbase
sudo port install qt5-mysql-plugin
sudo port install qt5-sqlite-plugin
sudo port install qt5-qttranslations
sudo port install qt5-qtwebengine
sudo port install gdal
sudo port install mercurial
sudo port install proj4
sudo port install quazip
Download the brew package manager if you not already have:
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
After istalling brew use it to install most of the required packages:
brew install proj4
brew install gdal (unfortunately not the newest version is prvided with brew)
brew install cmake
brew install qt5 --with-d-bus, --with-mysql
After istalling brew use it to install the required packages:
brew install svn
brew install hg
The qt5 package needs some patience if you have selected the options "--with-d-bus"
and "--with-mysql".
But you will need this to successfully build QMapShack. You may also considering
to install the qt5 additions "--with-docs --with-examples --with-developer"
The routino library source must be downloaded from the SVN repository
"http://routino.org/svn/trunk/" built manually.
To checkout routino create a new directory where the source should be stored,
......@@ -53,57 +58,55 @@ ROUTINO_SRC_DIR=... (absolute path to directory where the source code will be ch
Script call:
./build-routino.sh routino-build
For building the Quazip library there is the bash script "build-quazip.sh" in the MacOSX subdirectory.
The Quazip source has to be downloaded manually from "https://sourceforge.net/projects/quazip/".
To run the script, you need to set three environment variables in advanced:
QUAZIP_LIB_DIR=.. (absolute path to directory where the build library and other files will be stored)
QUAZIP_SRC_DIR=.. (absolute path to directory where the extracted source code has been saved to)
QT_DIR=.. (absolute path to directory where QT has been installed to. If done with brew, it is like /usr/local/Cellar/qt5/5.5..)
Script call:
./build-quazip.sh quazip-build
Building and Bundling QMapShack
Building QMapShack and QMapTool
*******************************
To get the source of QMapShack:
hg clone https://bitbucket.org/maproom/qmapshack
In the same directory as this how to is the bash script "bundle.sh". The script
In the same directory as this how to is the bash script "bundle-all.sh". The script
does all steps for packaging the application but not building the binary.
So you need to build the binary first with the command:
So you need to build the binary first with the commands:
mkdir build_QMapShack
cd build_QMapShack
cmake ../QMapShack -DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.5... -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DROUTINO_DEV_PATH=... -DQUAZIP_DEV_PATH=... -DCMAKE_BUILD_TYPE=Release
cmake ../QMapShack -DCMAKE_PREFIX_PATH=/opt/local/libexec/qt5 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DROUTINO_DEV_PATH=... -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DQUAZIP_INCLUDE_DIR=/opt/local/include/quazip5 -DQUAZIP_LIBRARIES=/opt/local/lib/libquazip5.1.0.0.dylib -DPROJ4_ROOT=/opt/local/lib/proj5 -DPROJ4_INCLUDE_DIRS=/opt/local/lib/proj5/include -DPROJ4_LIBRARIES=/opt/local/lib/proj5/lib/libproj.13.dylib
make
"QMapShack" is the relative path to where you have checked out QMapShack.
The four passed parameter are more or less self describing:
The passed parameter are more or less self describing:
CMAKE_PREFIX_PATH path to used libraries by QMapShack, QT5 needs to be set by default.
CMAKE_OSX_DEPLOYMENT_TARGET the target system of the build (10.11 is the El Capitan OS-X, see https://en.wikipedia.org/wiki/OS_X#Versions for a full list)
CMAKE_OSX_DEPLOYMENT_TARGET the target system of the build (10.12 is the Sierra OS-X, see https://en.wikipedia.org/wiki/OS_X#Versions for a full list)
ROUTINO_DEV_PATH The path to the routino library (is the same as you set previously with ROUTINO_LIB_DIR)
QUAZIP_DEV_PATH The path to the quazip library (is the same as you set previously with QUAZIP_LIB_DIR)
CMAKE_BUILD_TYPE "Debug" or "Release" depending what you want.
CMAKE_BUILD_TYPE "Debug" or "Release" depending what you want
DCMAKE_VERBOSE_MAKEFILE enable verbose output from Makefile builds
DQUAZIP_INCLUDE_DIR path to used include directory for Quazip
DQUAZIP_LIBRARIES path to used libraries for Quazip
DPROJ4_ROOT look exclusively in this directory
DPROJ4_INCLUDE_DIRS path to used include directory for proj
DPROJ4_LIBRARIES path to used libraries for proj
Bundling QMapShack and QMapTool
*******************************
If the build was successful, you can run the packaging with several environment
variables set:
QT_DIR=... (absolute path to the qt5 library base package, same as in CMAKE_PREFIX_PATH)
GDAL_DIR=... (absolute path to the gdal library base package)
PROJ_DIR=... (absolute path to the proj4 library base package)
ROUTINO_LIB_DIR=.. (absolute path to the routino library base package, same as ROUTINO_LIB_DIR / ROUTINO_DEV_PATH)
QT_DIR=... (absolute path to the qt5 library base package, same as in CMAKE_PREFIX_PATH, z.B. /opt/local/libexec/qt5 )
GDAL_DIR=... (absolute path to the gdal library base package, z.B. /opt/local )
PROJ_DIR=... (absolute path to the proj4 library base package, z.B. /opt/local/lib/proj5)
ROUTINO_LIB_DIR=.. (absolute path to the routino library base package, same as ROUTINO_LIB_DIR / ROUTINO_DEV_PATH, z.B. /Users/.../Desktop/ROUTINO_BUILD )
QUAZIP_LIB_DIR=.. (absolute path to the Quazip library base package)
BUILD_DIR=.. (absolute path to the QMapShack build directory, the created directory "build_QMapShack" for the cmake build)
QMS_SRC_DIR=... (absolute path to the QMapShack source, the directory "QMapShack" used by cmake)
BUILD_BIN_DIR=... (absolute path to the directory with the qmapshack binary, typically build_QMapShack/bin for cmake build; depends on IDE)
BUILD_RELEASE_DIR=... (absolute path to the directory where the application bundle should be placed)
./bundle.sh bundle
./bundle-all.sh bundle
If everything is ok, you will get the package "QMapShack.app" in the directory "BUILD_RELEASE_DIR".
If everything is ok, you will get the package "QMapShack.app" and QMapTool.app in the directory "BUILD_RELEASE_DIR".
Double-click on the package and have fun with QMapShack.
......@@ -123,7 +126,7 @@ option "-G Xcode".
Nothing to be done, just open the Project folder in CLion.
You need to set "CMake options" under "Preferences > Build, Execution, Development > CMake".
-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.5... -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DROUTINO_DEV_PATH=... -DQUAZIP_DEV_PATH=...
-DCMAKE_PREFIX_PATH==/opt/local/libexec/qt5 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DROUTINO_DEV_PATH=... -DQUAZIP_DEV_PATH=...
The list is the same as described for the cmake build above.
......
MacOSX/bundle-qmaptool.sh 100644 → 100755
View file @ 6411d982
......@@ -36,16 +36,19 @@ if [[ "$1" == "bundle" ]]; then
readRevisionHash
echo "---build bundle --------------------"
buildAppStructure
extendAppStructure
echo "---replace version string ----------"
updateInfoPlist
echo "---qt deploy tool ------------------"
qtDeploy
removeDuplicatedQtLibs
echo "---copy external files -------------"
copyQtTrqnslations
echo "---link to QMS ------------------"
linkToQMapShack
copyExternalFiles
echo "---adjust linking ------------------"
adjustLinking
echo "---external tools ------------------"
copyExtTools
adjustLinkingExtTools
printLinkingExtTools
echo "------------------------------------"
fi
changelog.txt
View file @ 6411d982
V 1.13.2
[Issue #446] Advanced Filtering System
[Issue #491] Skip saving of geo search
[Issue #493] "Clone Waypoint and Move Clone" does not Respect Chosen Units
[Issue #488] Printing Preview
[Issue #494] BRouter segments download error
[Issue #499] Screen overflow German localisation on a Notebook with 1.600 x 900 pixel
[Issue #500] Tab order in Filter Cycle dialog is confused
[Issue #498 ] BRouter setup issue (Windows)
Add: Computation of "Energy Use Cycling" (consumption) for cycling tours
V 1.13.1
[Issue #451] Make red border around a highlighted track an option
[Issue #452] Project Details: Add elevation info to entries with track point information.
......
debian/changelog
View file @ 6411d982
qmapshack (1.13.2-1) unstable; urgency=medium
* New upstream release.
* Add patch to fix spelling errors.
-- Bas Couwenberg <sebastic@debian.org> Wed, 11 Sep 2019 18:31:46 +0200
qmapshack (1.13.1-1) unstable; urgency=medium
* New upstream release.
......
debian/patches/series
View file @ 6411d982
FindPROJ4.patch
FindQuaZip5.patch
spelling-errors.patch
debian/patches/spelling-errors.patch 0 → 100644
View file @ 6411d982
This diff is collapsed.
msvc_64/QMapShack_Installer.nsi
View file @ 6411d982
......@@ -192,7 +192,7 @@ Section "QMapShack" QMapShack
;BEGIN PROJ.4 Files
SetOutPath $INSTDIR
File Files\proj_6_0.dll
File Files\proj_6_1.dll
File Files\proj.exe
File Files\projinfo.exe
File Files\cct.exe
......
msvc_64/cmake/FindPROJ4.cmake
View file @ 6411d982
......@@ -41,6 +41,7 @@ endif(WIN32)
find_library(LIBPROJ4_LIBRARY
NAMES
proj_6_0
proj_6_1
PATHS
if(WIN32)
${PROJ4_DEV_PATH}/lib
......
msvc_64/copyfiles.bat
View file @ 6411d982
......@@ -3,7 +3,7 @@ rem Please adapt environment variables in section 1) to your system
rem Section 1.) Define path to Qt, MSVC, .... installations
set QMSI_QT_PATH="C:\Qt5\5.12.1\msvc2017_64"
set QMSI_QT_PATH="C:\Qt5\5.12.3\msvc2017_64"
rem get the VC redistributable installer from https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads
set QMSI_VCREDIST_PATH="M:\deploy_2017"
set QMSI_GDAL_PATH="M:\lib2017\gdal"
......@@ -97,7 +97,7 @@ copy %QMSI_GDAL_PATH%\bin\*.dll
copy %QMSI_GDAL_PATH%\bin\*.exe
rem section 2.2.4) PROJ.4
xcopy %QMSI_PROJ_PATH%\share share /s /i
copy %QMSI_PROJ_PATH%\bin\proj_6_0.dll
copy %QMSI_PROJ_PATH%\bin\proj_6_1.dll
copy %QMSI_PROJ_PATH%\bin\proj.exe
copy %QMSI_PROJ_PATH%\bin\projinfo.exe
copy %QMSI_PROJ_PATH%\bin\cct.exe
......
src/icons/Attention.svg 0 → 100644
View file @ 6411d982
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg3513"
version="1.1"
inkscape:version="0.92.2 5c3e80d, 2017-08-06"
sodipodi:docname="Attention.svg">
<defs
id="defs3515">
<marker
inkscape:stockid="Arrow1Send"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow1Send"
style="overflow:visible;"
inkscape:isstock="true">
<path
id="path4215"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
transform="scale(0.2) rotate(180) translate(6,0)" />
</marker>
<marker
inkscape:stockid="Arrow2Sstart"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Sstart"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path4230"
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(0.3) translate(-2.3,0)" />
</marker>
<marker
inkscape:stockid="Arrow2Send"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Send"
style="overflow:visible;"
inkscape:isstock="true">
<path
id="path4233"
style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(0.3) rotate(180) translate(-2.3,0)" />
</marker>
<marker
inkscape:isstock="true"
style="overflow:visible;"
id="marker7570"
refX="0.0"
refY="0.0"
orient="auto"
inkscape:stockid="Arrow1Send">
<path
transform="scale(0.2) rotate(180) translate(6,0)"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
id="path7572" />
</marker>
<marker
inkscape:stockid="Arrow2Mend"
orient="auto"
refY="0.0"
refX="0.0"
id="marker7453"
style="overflow:visible;"
inkscape:isstock="true">
<path
id="path4227"
style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(0.6) rotate(180) translate(0,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Send"
orient="auto"
refY="0.0"
refX="0.0"
id="marker7353"
style="overflow:visible;"
inkscape:isstock="true">
<path
id="path7355"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
transform="scale(0.2) rotate(180) translate(6,0)" />
</marker>
<marker
inkscape:isstock="true"
style="overflow:visible"
id="marker7253"
refX="0.0"
refY="0.0"
orient="auto"
inkscape:stockid="Arrow2Sstart">
<path
transform="scale(0.3) translate(-2.3,0)"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
id="path7255" />
</marker>
<marker
inkscape:stockid="Arrow1Sstart"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow1Sstart"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path4212"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
transform="scale(0.2) translate(6,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Send"
orient="auto"
refY="0.0"
refX="0.0"
id="marker7079"
style="overflow:visible;"
inkscape:isstock="true">
<path
id="path7081"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
transform="scale(0.2) rotate(180) translate(6,0)" />
</marker>
<marker
inkscape:stockid="Arrow2Mend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Mend"
style="overflow:visible;">
<path
id="path3901"
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(0.6) rotate(180) translate(0,0)" />
</marker>
<marker
inkscape:stockid="Arrow2Lend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Lend"
style="overflow:visible;">
<path
id="path3895"
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(1.1) rotate(180) translate(1,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mstart"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow1Mstart"
style="overflow:visible">
<path
id="path3880"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
transform="scale(0.4) translate(10,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Lstart"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow1Lstart"
style="overflow:visible">
<path
id="path3874"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
transform="scale(0.8) translate(12.5,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mstart"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mstart-0"
style="overflow:visible">
<path
inkscape:connector-curvature="0"
id="path3880-4"
d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
transform="matrix(0.4,0,0,0.4,4,0)" />
</marker>
<marker
inkscape:stockid="Arrow2Sstart"
orient="auto"
refY="0"
refX="0"
id="Arrow2Sstart-3"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path4230-6"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="matrix(0.3,0,0,0.3,-0.69,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Send"
orient="auto"
refY="0"
refX="0"
id="Arrow1Send-7"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path4215-5"
d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
transform="matrix(-0.2,0,0,-0.2,-1.2,0)" />
</marker>
<marker
inkscape:isstock="true"
style="overflow:visible"
id="marker7253-5"
refX="0"
refY="0"
orient="auto"
inkscape:stockid="Arrow2Sstart">
<path
inkscape:connector-curvature="0"
transform="matrix(0.3,0,0,0.3,-0.69,0)"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
id="path7255-6" />
</marker>
<marker
inkscape:stockid="Arrow2Send"
orient="auto"
refY="0"
refX="0"
id="Arrow2Send-2"
style="overflow:visible"
inkscape:isstock="true">
<path
inkscape:connector-curvature="0"
id="path4233-9"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="matrix(-0.3,0,0,-0.3,0.69,0)" />
</marker>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11"
inkscape:cx="18.521079"
inkscape:cy="34.607866"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1920"
inkscape:window-height="997"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid3090" />
</sodipodi:namedview>
<metadata
id="metadata3518">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
style="fill:#ffff00;stroke:#b3b3b3;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 5,54 H 55 L 30,9 Z"
id="path995"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:34.66666794px;line-height:1.25;font-family:'Adobe Courier';-inkscape-font-specification:'Adobe Courier Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
x="25.057291"
y="47.64529"
id="text999"><tspan
sodipodi:role="line"
id="tspan997"
x="25.057291"
y="47.64529"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold'">!</tspan></text>
</g>
</svg>
src/icons/EnergyCycling.svg 0 → 100644
View file @ 6411d982
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64"
height="64"
id="svg2"
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="FilterCalculateEnergy2.svg">
<defs
id="defs4">
<inkscape:path-effect
cusp_linecap_type="round"
end_linecap_type="zerowidth"
miter_limit="4"
linejoin_type="round"
start_linecap_type="zerowidth"
interpolator_beta="0.2"
interpolator_type="CubicBezierJohan"
sort_points="true"
offset_points="0,0.5"
is_visible="true"
id="path-effect3452"
effect="powerstroke" />
<inkscape:path-effect
cusp_linecap_type="round"
end_linecap_type="zerowidth"
miter_limit="45"
linejoin_type="round"
start_linecap_type="zerowidth"
interpolator_beta="0.24705882"
interpolator_type="CubicBezierJohan"
sort_points="true"
offset_points="0,0.60211787"
is_visible="true"
id="path-effect3448"
effect="powerstroke" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.959798"
inkscape:cx="-70.782856"
inkscape:cy="-9.4060449"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1025"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid2985"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-988.3622)">
<rect
style="fill:none;stroke:none"
id="rect3792"
width="60"
height="60"
x="0"
y="988.61218" />
<rect
style="fill:none;stroke:none"
id="rect3847"
width="60"
height="60"
x="2.5000534"
y="991.38416" />
<path
style="fill:#d40000;fill-opacity:1;stroke:none;stroke-width:0.95232934;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.52941165;paint-order:stroke fill markers"
d="m 26,1025.7362 c 0,-1.0917 0.641859,-1.725 1.748222,-1.725 h 1.090998 l 0.08824,-15.2315 0.08824,-15.2313 1.037795,-1.03766 1.037795,-1.03754 h 7.606426 7.606425 l 1.037796,1.03716 1.037794,1.03703 0.158721,7.68911 0.158722,7.6892 1.458786,0.2081 c 2.951647,0.4214 3.44879,1.2309 3.775455,6.1477 0.13022,1.9599 0.453306,4.014 0.736472,4.6822 0.428586,1.0114 0.652609,1.1904 1.4892,1.1904 1.550698,0 1.978833,-1.4027 2.154884,-7.0601 l 0.145618,-4.6792 -1.903705,-2.0351 -1.903702,-2.0351 -0.230099,-2.809 -0.230097,-2.80887 -1.896844,-2.14207 c -1.938768,-2.18946 -2.244705,-3.17395 -1.040144,-3.34717 0.466036,-0.0666 1.705193,0.98889 4.471767,3.8105 2.104899,2.14681 4.076154,4.38501 4.380573,4.97361 0.493366,0.9541 0.538215,1.8849 0.412879,8.5698 -0.153173,8.1693 -0.349197,9.3113 -1.8573,10.8193 -0.810013,0.8101 -1.213131,0.9656 -2.50383,0.9656 -1.291933,0 -1.693609,-0.1553 -2.507379,-0.9691 -1.209623,-1.2096 -1.603849,-2.6518 -1.930112,-7.0606 -0.278964,-3.7698 -0.412584,-4.0202 -2.149453,-4.0283 h -1.031684 v 6.3489 6.3487 h 1.118908 c 0.908984,0 1.17699,0.1529 1.428494,0.8143 0.170272,0.4479 0.309586,0.9478 0.309586,1.1111 0,0.1791 -5.033656,0.2968 -12.697725,0.2968 -11.312191,0 -12.697725,-0.054 -12.697725,-0.497 z m 19.610842,-21.2659 c 0.674337,-0.4722 0.705519,-0.6991 0.705519,-5.13337 0,-3.87146 -0.08696,-4.73541 -0.525364,-5.21986 -0.476847,-0.52694 -1.134368,-0.58049 -7.119796,-0.58049 -5.57168,0 -6.671798,0.0779 -7.093271,0.49878 -0.408767,0.40878 -0.498839,1.35129 -0.498839,5.21987 0,4.51867 0.03023,4.74217 0.705519,5.21507 1.040974,0.7292 12.785258,0.7292 13.826232,0 z"
id="path180"
inkscape:connector-curvature="0" />
<g
id="g3851"
transform="translate(110,-5)"
style="stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none">
<path
sodipodi:open="true"
sodipodi:end="6.2787911"
sodipodi:start="0"
transform="translate(0,988.3622)"
d="m -85,54 a 10,10 0 0 1 -9.989014,9.999994 10,10 0 0 1 -10.010966,-9.978023 10,10 0 0 1 9.967024,-10.021917 10,10 0 0 1 10.032859,9.956004"
sodipodi:ry="10"
sodipodi:rx="10"
sodipodi:cy="54"
sodipodi:cx="-95"
id="path3813"
style="fill:none;stroke:#000080;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
sodipodi:type="arc" />
<path
sodipodi:open="true"
sodipodi:end="6.2787911"
sodipodi:start="0"
d="m -85,54 a 10,10 0 0 1 -9.989014,9.999994 10,10 0 0 1 -10.010966,-9.978023 10,10 0 0 1 9.967024,-10.021917 10,10 0 0 1 10.032859,9.956004"
sodipodi:ry="10"
sodipodi:rx="10"
sodipodi:cy="54"
sodipodi:cx="-95"
id="path3813-2"
style="fill:none;stroke:#000080;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
sodipodi:type="arc"
transform="translate(35.000097,988.40614)" />
<path
inkscape:connector-curvature="0"
id="path3833"
d="m -60,1042.3622 -5,-15"
style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="ccc"
transform="translate(0,988.3622)"
inkscape:connector-curvature="0"
id="path3835"
d="m -95,54 10,-15 h 20"
style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="ccc"
transform="translate(0,988.3622)"
inkscape:connector-curvature="0"
id="path3839"
d="m -65,39 -15,15 -5,-15 -2,-5"
style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
transform="translate(0,988.3622)"
inkscape:connector-curvature="0"
id="path3841"
d="M -80,54 H -95"
style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3843"
d="m -90,1022.3622 h 7 l -7,1"
style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
transform="translate(0,988.3622)"
inkscape:connector-curvature="0"
id="path3845"
d="m -65,39 v -4 l 3,-2 -6,-1"
style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g>
</svg>
src/icons/Hint.svg 0 → 100644
View file @ 6411d982
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2"
version="1.1"
inkscape:version="0.92.2 5c3e80d, 2017-08-06"
width="64"
height="67"
sodipodi:docname="Hint.svg">
<metadata
id="metadata8">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs6" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="997"
id="namedview4"
showgrid="true"
inkscape:zoom="9.962818"
inkscape:cx="6.6105699"
inkscape:cy="38.815249"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2">
<inkscape:grid
type="xygrid"
id="grid2982" />
</sodipodi:namedview>
<path
style="fill:#ffff00;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 61,3.9999999 H 3.7324497 L 3.937943,37.975192 h 13.594593 l -5.206141,25.02481 22.559944,-25.02481 h 26.319154 z"
id="path4482"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc" />
<path
style="fill:#ffff00;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 9.1440839,11.162896 H 56.287802"
id="path4484"
inkscape:connector-curvature="0" />
<path
style="fill:#ffff00;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 8.8556342,18.312841 H 55.999352"
id="path4486"
inkscape:connector-curvature="0" />
<path
style="fill:#ffff00;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 9.1440839,25.462788 H 56.287802"
id="path4488"
inkscape:connector-curvature="0" />
</svg>