logic: Hide non-fatal errors in unindexed files

* added database field indexed to error to tell if the error occured within an indexed file
* added checkbox to Preferences for showing them

.git_pre_commit_hook.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-ABORT="\033[31mAbort:\033[00m"
-SUCCESS="\033[32mSuccess:\033[00m"
-INFO="\033[33mInfo:\033[00m"
-
-BRANCH_NAME=$(git symbolic-ref -q --short HEAD)
-
-if [ -z $BRANCH_NAME ]
-then
-	echo -e $ABORT "You are not on any branch."
-	exit 1
-fi
-
-if [ $BRANCH_NAME == "master" ]
-then
-	echo -e $ABORT "Commiting to master is prohibited."
-	exit 1
-fi
-
-if [ $BRANCH_NAME == "public_beta" ]
-then
-	echo -e $ABORT "Commiting to public_beta is prohibited."
-	exit 1
-fi
-
-exit 0

.gitignore

@@ -4,16 +4,18 @@
 
 /bin/app/Debug/
 /bin/app/Release/
-/bin/app/data/log/
 /bin/app/data/projects/ignored/
-/bin/app/data/ApplicationSettings.xml
-/bin/app/data/window_settings.ini
+/bin/app/user/log/
+/bin/app/user/ApplicationSettings.xml
+/bin/app/user/window_settings.ini
 
 /bin/lib/
 /bin/lib_gui/
 /bin/lib_parser/
+/bin/lib_license/
 
-/bin/gen/
+/bin/license_generator/Debug/
+/bin/license_generator/Release/
 
 /bin/test/Debug/
 /bin/test/Release/
@@ -25,28 +27,43 @@
 
 .DS_Store
 .idea
+
 /ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/bin
 /ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/obj
 
 *.coatidb
-
-/deployment/windows/CoatiSetup/CoatiSetup/Debug
-/deployment/windows/CoatiSetup/CoatiSetup/Release
-
-/deployment/windows/CoatiSetup/CoatiSetup.v12.suo
-
-/deployment/windows/CoatiSetup/SetupApplicationSettingsLib/bin/
-/deployment/windows/CoatiSetup/SetupApplicationSettingsLib/obj/
-
-/deployment/windows/CoatiSetup/SetupCreateDesktopShortcutLib/bin/
-/deployment/windows/CoatiSetup/SetupCreateDesktopShortcutLib/obj/
-
-/deployment/windows/CoatiSetup/SetupCreateStartMenuShortcutLib/bin/
-/deployment/windows/CoatiSetup/SetupCreateStartMenuShortcutLib/obj/
-
-/deployment/windows/CoatiSetup/SetupRemoveCacheFiles/bin/
-/deployment/windows/CoatiSetup/SetupRemoveCacheFiles/obj/
-
+*.suo
 *.sqlite
+*.pch
 *.swp
-.clang_complete
+*.swo
+.clang_complete
+.ycm_extra_conf.py
+.ycm_extra_conf.pyc
+coati.coatiproject
+compile_commands.json
+Makefile
+/__pycache__/
+
+/deployment/windows/CoatiAppSetup/CoatiSetup/Debug
+/deployment/windows/CoatiAppSetup/CoatiSetup/Release
+/deployment/windows/CoatiAppSetup/SetupApplicationSettingsLib/bin/
+/deployment/windows/CoatiAppSetup/SetupApplicationSettingsLib/obj/
+/deployment/windows/CoatiAppSetup/SetupCreateDesktopShortcutLib/bin/
+/deployment/windows/CoatiAppSetup/SetupCreateDesktopShortcutLib/obj/
+/deployment/windows/CoatiAppSetup/SetupCreateStartMenuShortcutLib/bin/
+/deployment/windows/CoatiAppSetup/SetupCreateStartMenuShortcutLib/obj/
+/deployment/windows/CoatiAppSetup/SetupRemoveCacheFiles/bin/
+/deployment/windows/CoatiAppSetup/SetupRemoveCacheFiles/obj/
+
+/deployment/windows/CoatiTrialSetup/CoatiSetup/Debug
+/deployment/windows/CoatiTrialSetup/CoatiSetup/Release
+/deployment/windows/CoatiTrialSetup/SetupApplicationSettingsLib/bin/
+/deployment/windows/CoatiTrialSetup/SetupApplicationSettingsLib/obj/
+/deployment/windows/CoatiTrialSetup/SetupCreateDesktopShortcutLib/bin/
+/deployment/windows/CoatiTrialSetup/SetupCreateDesktopShortcutLib/obj/
+/deployment/windows/CoatiTrialSetup/SetupCreateStartMenuShortcutLib/bin/
+/deployment/windows/CoatiTrialSetup/SetupCreateStartMenuShortcutLib/obj/
+/deployment/windows/CoatiTrialSetup/SetupRemoveCacheFiles/bin/
+/deployment/windows/CoatiTrialSetup/SetupRemoveCacheFiles/obj/
+

CMakeLists.txt

@@ -1,9 +1,4 @@
-cmake_minimum_required(VERSION 2.8.9)
-
-# to get CMP0043 warnings, upgrade to version 3 and change the line above to VERSION 3.0 and remove the line below
-if(POLICY CMP0043)
-   cmake_policy(SET CMP0043 OLD)
-endif()
+cmake_minimum_required(VERSION 3.1)
 
 include(cmake/add_files.cmake)
 include(cmake/create_source_groups.cmake)
@@ -11,15 +6,18 @@ include(cmake/version.cmake)
 include(cmake/version_setup.cmake)
 include(cmake/licenses.cmake)
 
+
 # Variables --------------------------------------------------------------------
 
 set(PROJECT_NAME Coati)
 
 set(APP_PROJECT_NAME "${PROJECT_NAME}")
 set(TRIAL_PROJECT_NAME "${PROJECT_NAME}_trial")
+set(LIB_LICENSE_PROJECT_NAME "${PROJECT_NAME}_lib_license")
 set(LIB_GUI_PROJECT_NAME "${PROJECT_NAME}_lib_gui")
 set(LIB_PARSER_PROJECT_NAME "${PROJECT_NAME}_lib_parser")
 set(LIB_PROJECT_NAME "${PROJECT_NAME}_lib")
+set(LICENSE_GENERATOR_PROJECT_NAME "${PROJECT_NAME}_license_generator")
 set(TEST_PROJECT_NAME "${PROJECT_NAME}_test")
 
 if (WIN32)
@@ -28,54 +26,153 @@ if (WIN32)
 elseif (APPLE)
 	set(PLATFORM_INCLUDE "includesMac.h")
 else ()
-	set(PLATFORM_INCLUDE "includesDefault.h")
-endif ()
-
-# Settings ---------------------------------------------------------------------
-
-if (UNIX)
-	add_definitions(-std=c++11 -Wno-unknown-warning-option -fcolor-diagnostics -DQT_COMPILING_QSTRING_COMPAT_CPP )
+	set(PLATFORM_INCLUDE "includesLinux.h")
 endif ()
 
 # Project ----------------------------------------------------------------------
+
 project(${PROJECT_NAME})
 
+# set Standerd build type to Release
+set(CMAKE_BUILD_TYPE_INIT "Release")
+
+#RPATH
+if(UNIX AND NOT APPLE)
+	set(CMAKE_SKIP_BUILD_RPATH FALSE)
+	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+	set(CMAKE_INSTALL_RPATH "$ORIGIN/lib/:$$ORIGIN/lib/")
+	include(cmake/external.cmake)
+endif()
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_C_STANDARD 99)
+
+# Settings ---------------------------------------------------------------------
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -fcolor-diagnostics")
+endif()
+
+if (UNIX)
+	#add_definitions(-std=c++11 -Wno-unknown-warning-option -fcolor-diagnostics -DQT_COMPILING_QSTRING_COMPAT_CPP )
+	add_definitions(-fno-omit-frame-pointer  -DQT_COMPILING_QSTRING_COMPAT_CPP )
+endif ()
+
 # Clang ------------------------------------------------------------------------
 
-if (UNIX)
+if (UNIX AND APPLE)
 	if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake")
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake" NO_DEFAULT_PATH)
 	else()
-		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake")
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake" NO_DEFAULT_PATH)
 	endif()
+elseif(UNIX)
+	find_package(LLVM REQUIRED PATHS "${EXTERNAL_BUILD}/llvm/share/llvm/cmake" NO_DEFAULT_PATH)
 else()
 	find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build/share/llvm/cmake")
 endif()
 
-find_package(CLANG REQUIRED PATHS "${CMAKE_SOURCE_DIR}/cmake")
+find_package(CLANG REQUIRED PATHS "${CMAKE_SOURCE_DIR}/cmake" NO_DEFAULT_PATH)
 
 add_definitions(${CLANG_DEFINITIONS})
 
 # Boost ------------------------------------------------------------------------
 
-set(BOOST_ROOT $ENV{BOOST_159_DIR})
+if(UNIX AND NOT APPLE)
+	set(BOOST_ROOT ${EXTERNAL_BUILD}/boost)
+else()
+	set(BOOST_ROOT $ENV{BOOST_159_DIR})
+endif()
 set(Boost_USE_MULTITHREAD ON)
-set(Boost_USE_STATIC_LIBS OFF)
+set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
 Set(Boost_NO_SYSTEM_PATHS ON)
 set(BOOST_LIBRARYDIR $ENV{BOOST_159_DIR})
 
-find_package(Boost 1.59 COMPONENTS system filesystem date_time REQUIRED)
+find_package(Boost 1.59 COMPONENTS system program_options filesystem date_time REQUIRED)
 
 # Eigen ------------------------------------------------------------------------
 
 add_definitions(-DEIGEN_MPL2_ONLY)
-set(EIGEN_ROOT $ENV{EIGEN_DIR})
+if(UNIX AND NOT APPLE)
+	set(EIGEN_ROOT ${EXTERNAL_SRC}/eigen)
+else()
+	set(EIGEN_ROOT $ENV{EIGEN_DIR})
+endif()
+
+# Botan -------------------------------------------------------------------------
+
+set(BOTAN_VERSION "botan-1.11")
+
+if(UNIX AND APPLE)
+	find_library(BOTAN ${BOTAN_VERSION} $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
+	find_library(BOTAN_D ${BOTAN_VERSION} $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
+elseif(UNIX)
+	find_library(BOTAN ${BOTAN_VERSION} "${EXTERNAL_BUILD}/botan" NO_DEFAULT_PATH)
+else()
+	find_library(BOTAN botan "$ENV{BOTAN_DIR}/release")
+	find_library(BOTAN_D botan "$ENV{BOTAN_DIR}/debug")
+endif()
+if(${BOTAN} STREQUAL "BOTAN-NOTFOUND")
+	message(FATAL_ERROR "Botan not found")
+else()
+	message(STATUS "Botan found")
+endif()
+if(UNIX AND NOT APPLE)
+	set(BOTAN_INCLUDE_DIR "${EXTERNAL_BUILD}/botan")
+else()
+	set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}")
+endif()
+
+# Lib License -------------------------------------------------------------------
+
+#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
+#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
+
+add_subdirectory(src/lib_license)
+
+add_library(${LIB_LICENSE_PROJECT_NAME} ${LIB_LICENSE_FILES})
+
+create_source_groups(${LIB_LICENSE_FILES})
+
+set_property(
+		TARGET ${LIB_LICENSE_PROJECT_NAME}
+		PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
+)
+
+set_target_properties(
+	${LIB_LICENSE_PROJECT_NAME}
+	PROPERTIES
+		DEBUG_OUTPUT_NAME ${LIB_LICENSE_PROJECT_NAME}_d
+		RELEASE_OUTPUT_NAME ${LIB_LICENSE_PROJECT_NAME}
+)
+
+target_include_directories(${LIB_LICENSE_PROJECT_NAME} SYSTEM
+	PUBLIC
+	${Boost_INCLUDE_DIRS}
+	${LIB_LICENSE_PROJECT_NAME}
+	${BOTAN_INCLUDE_DIR}
+)
+
+# target_include_directories(${LIB_LICENSE_PROJECT_NAME} optimized "$ENV{BOTAN_DIR}/release")
+# target_include_directories(${LIB_LICENSE_PROJECT_NAME} debug "$ENV{BOTAN_DIR}/debug")
+
+if(UNIX)
+	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} ${BOTAN})
+else()
+	link_directories(optimized "$ENV{BOTAN_DIR}/release")
+	link_directories(debug "$ENV{BOTAN_DIR}/debug")
+
+	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} debug ${BOTAN_D})
+	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} optimized ${BOTAN})
+endif()
 
 # Lib --------------------------------------------------------------------------
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
+#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
+#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
 
 add_subdirectory(src/lib)
 add_subdirectory(src/external)
@@ -100,6 +197,8 @@ set_property(
 	TARGET ${LIB_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/lib"
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
 )
 
 target_include_directories(${LIB_PROJECT_NAME} SYSTEM
@@ -107,15 +206,15 @@ target_include_directories(${LIB_PROJECT_NAME} SYSTEM
 	${CLANG_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS}
 	${EIGEN_ROOT}
-    "${CMAKE_SOURCE_DIR}/src/external"
+	"${CMAKE_SOURCE_DIR}/src/external"
 )
 
-target_link_libraries(${LIB_PROJECT_NAME} ${Boost_LIBRARIES})
+target_link_libraries(${LIB_PROJECT_NAME} ${Boost_LIBRARIES} ${LIB_LICENSE_PROJECT_NAME})
 
 # Lib Parser -------------------------------------------------------------------
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_parser)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_parser)
+#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_parser)
+#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_parser)
 
 add_subdirectory(src/lib_parser)
 
@@ -126,12 +225,19 @@ add_library(${LIB_PARSER_PROJECT_NAME} ${CLANG_FILES})
 create_source_groups(${CLANG_FILES})
 
 set_property(
-		TARGET ${LIB_PARSER_PROJECT_NAME}
-		PROPERTY INCLUDE_DIRECTORIES
+	TARGET ${LIB_PARSER_PROJECT_NAME}
+	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/lib_parser"
 		"${CMAKE_SOURCE_DIR}/src/lib"
 )
 
+set_target_properties(
+	${LIB_PARSER_PROJECT_NAME}
+	PROPERTIES
+		DEBUG_OUTPUT_NAME ${LIB_PARSER_PROJECT_NAME}_d
+		RELEASE_OUTPUT_NAME ${LIB_PARSER_PROJECT_NAME}
+)
+
 target_include_directories(${LIB_PARSER_PROJECT_NAME} SYSTEM
 	PUBLIC ${LLVM_INCLUDE_DIRS}
 	${CLANG_INCLUDE_DIRS}
@@ -139,13 +245,14 @@ target_include_directories(${LIB_PARSER_PROJECT_NAME} SYSTEM
 )
 
 link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
+llvm_map_components_to_libnames(REQ_LLVM_LIBS support core libdriver)
 
-target_link_libraries(${LIB_PARSER_PROJECT_NAME} ${CLANG_LIBRARIES} ${LLVM_AVAILABLE_LIBS})
+target_link_libraries(${LIB_PARSER_PROJECT_NAME} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBS})
 
 # Lib Gui ----------------------------------------------------------------------
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
+#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
+#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
 
 add_subdirectory(src/lib_gui)
 
@@ -155,21 +262,27 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
 # Find the QtWidgets library
-set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
+if(UNIX AND NOT APPLE)
+	set(CMAKE_PREFIX_PATH ${EXTERNAL_BUILD}/qt)
+else()
+	set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
+endif()
 
-set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
-set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
+if(UNIX AND APPLE)
+	set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
+	set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
+endif()
 
 find_package(Qt5Widgets)
 find_package(Qt5PrintSupport)
 find_package(Qt5Network)
 
 if(Qt5Widgets_FOUND)
-    MESSAGE(STATUS "Found Qt ${Qt5Widgets_VERSION_STRING}")
-    # FIX: Qt was built with -reduce-relocations
-    if (Qt5_POSITION_INDEPENDENT_CODE)
-        SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-    endif()
+	MESSAGE(STATUS "Found Qt ${Qt5Widgets_VERSION_STRING}")
+	# FIX: Qt was built with -reduce-relocations
+	if (Qt5_POSITION_INDEPENDENT_CODE)
+		SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+	endif()
 endif()
 
 # target for running versionnumber script
@@ -187,7 +300,7 @@ add_custom_command(
 	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake
 	BYPRODUCTS ${PROJECT_SOURCE_DIR}/build/src/lib_gui/version.h
 	DEPENDS ${LIB_GUI_PROJECT_NAME}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 	COMMENT "check/update version number"
 )
 add_dependencies(${LIB_GUI_PROJECT_NAME} versionnumber)
@@ -197,14 +310,24 @@ create_source_groups(${LIB_GUI_FILES})
 set_property(
 	TARGET ${LIB_GUI_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
+)
+
+set_target_properties(
+	${LIB_GUI_PROJECT_NAME}
+	PROPERTIES
+		DEBUG_OUTPUT_NAME ${LIB_GUI_PROJECT_NAME}_d
+		RELEASE_OUTPUT_NAME ${LIB_GUI_PROJECT_NAME}
 )
 
 # include external header without warnings
 target_include_directories(${LIB_GUI_PROJECT_NAME} SYSTEM
 		PUBLIC "${CMAKE_SOURCE_DIR}/src/external"
+		PUBLIC ${BOTAN_INCLUDE_DIR}
 		PUBLIC ${Boost_INCLUDE_DIRS}
 )
 
@@ -220,10 +343,13 @@ configure_file(
 
 #configure the versioning file
 configure_file(
-  ${CMAKE_SOURCE_DIR}/cmake/version.h.in
-  ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
+	${CMAKE_SOURCE_DIR}/cmake/version.h.in
+	${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
 )
 
+# configure public key for the coati version
+include(cmake/publicKey.cmake)
+
 set(CMAKE_AUTOMOC OFF)
 
 # App --------------------------------------------------------------------------
@@ -236,7 +362,6 @@ endif ()
 
 add_subdirectory(src/app)
 
-
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -246,7 +371,8 @@ if (WIN32)
 		"// remains consistent on all systems.\n"
 		"IDI_ICON1               ICON                    \"${CMAKE_SOURCE_DIR}/build/coati.ico\"\n"
 	)
-	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CLANG_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc)
+
+	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CLANG_FILES} ${GEN_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc)
 
 	# hide the console when running a release build.
 	set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
@@ -255,14 +381,13 @@ if (WIN32)
 	set_target_properties(${APP_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "_CONSOLE")
 	set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE "/ENTRY:\"mainCRTStartup\" /SUBSYSTEM:WINDOWS")
 	set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
-
 else ()
-	add_executable(${APP_PROJECT_NAME} ${APP_FILES})
+	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${GEN_FILES})
 endif ()
 
 create_source_groups(${APP_FILES})
 
-target_link_libraries(${APP_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME} )
+target_link_libraries(${APP_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})
 
 set_property(
 	TARGET ${APP_PROJECT_NAME}
@@ -270,8 +395,11 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/app"
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
 		"${CMAKE_SOURCE_DIR}/src/lib_parser"
 		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
+		"${CMAKE_SOURCE_DIR}/build/src/app"
 )
 
 target_include_directories(${APP_PROJECT_NAME} SYSTEM
@@ -319,12 +447,16 @@ if (WIN32)
 	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
 
 else ()
-	add_executable(${TRIAL_PROJECT_NAME} ${TRIAL_FILES})
+	add_executable(${TRIAL_PROJECT_NAME} ${TRIAL_FILES} ${GEN_FILES})
 endif ()
 
 create_source_groups(${TRIAL_FILES})
 
-target_link_libraries(${TRIAL_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PROJECT_NAME})
+target_link_libraries(${TRIAL_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} )
+
+if(UNIX AND NOT APPLE)
+	target_link_libraries(${TRIAL_PROJECT_NAME} pthread dl rt)
+endif()
 
 set_property(
 	TARGET ${TRIAL_PROJECT_NAME}
@@ -333,6 +465,7 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
 )
 
 target_include_directories(${TRIAL_PROJECT_NAME} SYSTEM
@@ -392,8 +525,44 @@ if (APPLE)
 		@ONLY
 	)
 
+	configure_file(
+		${PROJECT_SOURCE_DIR}/setup/MacOSX/Info_trial.plist.in
+		${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bundle_info_trial.plist
+		@ONLY
+	)
+
 endif ()
 
+# License Generator  --------------------------------------------------------
+
+add_subdirectory(src/license_generator)
+
+if (UNIX)
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/license_generator/${CMAKE_BUILD_TYPE})
+else ()
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/license_generator/)
+endif ()
+
+add_executable(${LICENSE_GENERATOR_PROJECT_NAME} ${LICENSE_GENERATOR_FILES})
+
+create_source_groups(${LICENSE_GENERATOR_FILES})
+
+set_property(
+		TARGET ${LICENSE_GENERATOR_PROJECT_NAME}
+		PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
+)
+
+target_include_directories(${LICENSE_GENERATOR_PROJECT_NAME} SYSTEM
+		PUBLIC ${Boost_INCLUDE_DIRS}
+)
+
+if(UNIX AND NOT APPLE)
+	target_link_libraries(${LICENSE_GENERATOR_PROJECT_NAME} pthread dl rt)
+endif()
+
+target_link_libraries(${LICENSE_GENERATOR_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} ${Boost_LIBRARIES} )
+
 # CxxTest ----------------------------------------------------------------------
 
 if (UNIX)
@@ -404,27 +573,32 @@ endif ()
 
 add_subdirectory(src/test)
 
-set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
+if(UNIX AND NOT APPLE)
+	set(CXXTEST_INCLUDE_DIR ${EXTERNAL_SRC}/cxxtest)
+else()
+	set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
+endif()
 set(CXXTEST_PYTHON_TESTGEN_EXECUTABLE ${CXXTEST_INCLUDE_DIR}/bin/cxxtestgen)
 set(TESTGEN_FILE ${CMAKE_CURRENT_BINARY_DIR}/test_main.cpp)
 
 find_package(PythonInterp REQUIRED)
 
-add_executable (${TEST_PROJECT_NAME} ${TESTGEN_FILE} ${TEST_FILES})
+add_executable (${TEST_PROJECT_NAME} ${TESTGEN_FILE} ${TEST_FILES} )
 
 create_source_groups(${TEST_FILES})
 
-target_link_libraries(${TEST_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME})
+target_link_libraries(${TEST_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})
 
 find_package(CxxTest)
 if (CXXTEST_FOUND)
 	set_property(
 		TARGET ${TEST_PROJECT_NAME}
 		PROPERTY INCLUDE_DIRECTORIES
+			"${CXXTEST_INCLUDE_DIR}"
 			"${CMAKE_SOURCE_DIR}/src/lib"
 			"${CMAKE_SOURCE_DIR}/src/lib_parser"
-			"${CXXTEST_INCLUDE_DIR}"
 			"${CMAKE_SOURCE_DIR}/src/external"
+			"${CMAKE_SOURCE_DIR}/src/lib_license"
 			${Boost_INCLUDE_DIRS}
 	)
 endif (CXXTEST_FOUND)
@@ -450,6 +624,7 @@ elseif (UNIX)
 	add_custom_command(
 		OUTPUT ${TESTGEN_FILE}
 		PRE_BUILD
+		COMMAND rm -f ${TESTGEN_FILE}
 		COMMAND cd ${PROJECT_SOURCE_DIR} && ${PYTHON_EXECUTABLE} ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ParenPrinter -o ${TESTGEN_FILE} ${TEST_FILES}
 		COMMENT "Generating unittest code with cxxtestgen"
 	)
@@ -460,7 +635,6 @@ elseif (UNIX)
 
 endif ()
 
-
 # Visual Leak Detector ---------------------------------------------------------
 
 if (WIN32)

README.md

@@ -1,52 +1,68 @@
-### Masterproject
+## Masterproject
 
-#### Setup
+### Setup
 
-##### External Software
+#### External Software
 
-* QT 5.5
+* QT 5.6
 * CxxTest 4.3
 * Valgrind 3.9.0 (linux)
-* Clang & LLVM (installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
+* Clang & LLVM 3.8 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
 * Boost 1.59
 * Eigen 3.2.6
+* Botan 1.11.24
 
-##### Environment Variables
+#### Environment Variables
 
-* QT_DIR - ...\Qt\Qt5.2.1\5.2.1\<IDE>\
-* CXX_TEST_DIR - .../cxxtest-4.3/
-* CLANG_DIR - .../clang-llvm/
+* QT_DIR - .../Qt/Qt5.6.0/5.6/<IDE>
+* CXX_TEST_DIR - .../cxxtest-4.3
+* CLANG_DIR - .../clang-llvm
 * BOOST_159_DIR - .../boost_1_59_0
 * EIGEN_DIR - .../eigen
+* BOTAN_DIR - .../Botan-1.11.24
 
 For Win32:
 * VLD_DIR - .../Visual Leak Detector
 * path - apped path to git.exe
 
-##### Settings
+##### Botan setup
+
+Build release lib in ${BOTAN_DIR}/release
+Build debug lib in ${BOTAN_DIR}/debug
+
+for Windows release build:
+$ python configure.py --cc=msvc --cpu=x86_32 --via-amalgamation --disable-shared
+
+for Windows debug build:
+python configure.py --cc=msvc --cpu=x86_32 --via-amalgamation --disable-shared --no-optimizations --with-debug-info
+
+for other:
+$ python configure.py --via-amalgamation --disable-shared
+
+#### Settings
 
 Run setup script:
 $ ./script/setup.sh
 
-#### Release
+### Release
 
-##### App
+#### App
 * create release build
 * make sure it uses the Coati icon
 * obfuscate the executable using upx
 
-##### Data folder
+#### Data folder
 * put data folder in working directory
 * add empty log folder
 * add working tictactoe.xml project to /projects/tictactoe with sources in /projects/tictactoe/src
 * add empty app settings with one recent project tictactoe.xml
 * leave window_settings.ini with correct Coati start layout
 
-##### Package
+#### Package
 * add app
 * add web/coati_manual.pdf to package
 
-##### Updating Clang on UNIX
+#### Updating Clang on UNIX
 
 $ cd .../clang_llvm
 
@@ -67,30 +83,233 @@ $ cd ../release_build
 $ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ../llvm
 $ ninja -j4 check-all
 
-##### Remarks
+#### Remarks
 
 * Boost lib dir: rename library directory for your system (e.g.: 'lib32-msvc-12.0') to 'lib'
 
-#### Changelog
+### Tagging
 
-##### 0.3.0
+$ git tag -a VERSION_NUMBER -m "DESCRIPTION"
+$ git push --tags
+
+### Changelog
+
+#### 0.7.0.22
+released 2016-07-07
+
+* Fixed detected global header search paths lost correct order and caused problems with #include_next directives
+* Fixed MaxOSX build crashed on launch due to unknown command line option passed
+* Removed 'Save Project' and 'Save Project As' actions from menu
+* Fixed indexer getting stuck at 'building caches' when indexing is interrupted
+* Fixed database not properly closed when errors appeared during indexing
+* Fixed autocompletions popup flickering while typing
+* Added resize grip to bottom right corner of every dialog window
+* Fixed 'paths don't exist' dialog window getting too big with lots of paths shown
+* Added context menu with 'back' and 'forward' actions available in all views
+* Removed Clang compiler warnings from console output
+* Added handling of project specific VS macros to VS solution parser
+
+#### 0.7.0.0
+released 2016-06-15
+
+* Updated to clang 3.8
+* Fixed crash in search autocompletion retrieval due to edge case in sorting
+* Fixed size policies in code view to avoid global scrollbar
+* Added full text search via search field: ?<query> for case-insensitive search, ??<query> for case-sensitive search
+* Made initialization for full text search lazy: done on first full text search
+* Defined full text search color in all color schemes
+* Increased code view performance by caching file IDs and paths
+* Added multithreaded indexing. Number of threads can be set in the Preferences UI, default is 4
+* Reworked graph node bundling to only distinguish defined and undefined nodes in each bucket
+* Made graph node sorting alphabetical and put bundles at end
+* Changed code view snippet sorting to always show definition on top
+* Fixed local symbols were not available within lambdas
+* Added settings for font family, font size and tab with to Preferences UI
+* Fixed VS solution parser issue with internal macros
+* Removed header extensions, all included files within the project paths are now analyzed
+* Fixed crash in sqlite when symbol name has special characters
+* Improved code view performance by reducing amount of initially open code files
+* Improved graph view performance through faster data retrieval and smarter structures
+* Increased aggregation click speed with faster edge id retrieval
+* Fixed png color profiles to avoid console warning: "libpng warning: iCCP: known incorrect sRGB profile"
+* Fixed graph edge drawn wrong when leaving from child node of smaller node
+* Fixed Sublime Text Plugin issue with wrong encoding
+* Randomized source file order for multithreaded analysis to increase performance
+* Show name of removed symbol when going back after refreshing
+* Fixed macro definition not connected to file
+* Fixed macro use not found in #ifdef, #ifndef, defined() and some expand cases
+* Removed back and forward steps for some graph and code view manipulations
+* Fixed code view style broken on Mac due to change of working directory when analyzing compilation database
+* Added database optimization step after indexing to reduce database size by ~25%
+* Fixed artifacts after graph view change by clearing view
+* Fixed autocompletion list highlights at wrong location for long names
+* Allow files and directories to be excluded from analysis in advanced settings for project setup
+* Added Qt gif plugin to Mac Release so that loader gif in status bar is visible
+* Added link to download page to start screen to remind users of updating once in a while
+* Check if compilation database still exists before refreshing
+* Added separate step for defining project name, project location and compiliation database to project setup
+* Explain that the project stays up-to-date with the compilation databes on refresh in project setup UI
+* Disregard source extensions when loading from compilation database
+* Removed error logs in name resolver
+* Added plugin for VIM: https://github.com/CoatiSoftware/vim-coati
+
+#### 0.6.0.0
+released 2016-04-27
+
+* Smoother graph panning and zooming on keyboard using update loop
+* Differentiate between explicit and implicit nodes and only show implicit nodes in the graph view when connected
+* Improved file clearing performance on project refresh
+* Show deleted projects on the start screen and show messagebox to delete them
+* Show analysis duration in hh:mm:ss
+* Added suppport for temporary test licenses and show error message when it expired
+* Increased graph performance by reducing to fixed number of requests
+* Add vs-clang compatibility flags when creating project from Visual Studio solution
+* Increased graph edge drawing performance
+* Added auto detection for system header paths to project wizard and preferences when using gcc, clang or vs compilers
+* Added bug tracker to help menu
+* Increased search autocompletion performance to stay mostly below 100ms
+* Changed style of aggregation edge to cleaner look
+* Allow certain edge types to enter and leave at top and bottom of nodes as well e.g. inheritance
+* Increased project load performance
+* Increased graph creation performance for overview screen
+* Changed namespace activation to show the namespace name in the search bar and the namespace definitions in the code view
+* Updated to Qt 5.6
+* Added analysis for local symbols and allow selecting them in the code view
+* Improved error display performance by not expanding all of them at once
+* Added home button next to search field for showing the project overview
+* Added shortcut and menu item to show project overview
+* Fixed Path boxes not sized correctly when switching back and forth in the project wizard
+* Allow support for environment variables in project setup with syntax ${VARIABLE_NAME}
+* Show quit button on license enter screen when no valid license was entered yet
+* Allow color schemes to define text colors for code view highlights
+* Added support for function pointers to analysis
+* Added Windows system dlls to installer on Windows so users don't not need to install the redistributable package
+* Changed style of out-of-date files to be followed by *
+* Set Qt flag for high DPI scaling
+* Check analyzed paths for existence in project wizard
+* Inform the user about project changes and ask before reparsing the project
+* Removed "simple setup" step in project wizard and added "lazy include search"-checkbox
+* Edit the project settings by clicking the project name in the overview stats
+* Added welcome message to Coati trial
+* Defined new highlight colors for code view in all color schemes
+
+#### 0.5.1.21
+released 2016-03-16
+
+* Fixed file logger using wrong directory for first log file
+* Fixed crash when accessing files without read permission
+* Center windows on top of main window
+* Added font size limits
+* Prevent network message handling without valid license
+* Fixed type references in headers saved multiple times
+* Improved context detection for template parameters
+* Fixed Visual Studio plugin project loading
+* Added delay for changing fontsize via mouse wheel
+* Disabled config file warnings
+* Fixed interrupting of analysis to show message in status bar
+* Fixed children on namespace activation were bundled
+* Fixed expanding file with errors showed all locations in red
+* Show loader animation when loading project
+* Removed high traffic log messages
+* Fixed crash when opening newer project with older version of Coati
+* Fixed project paths are now saved relative if defined relative
+* Fixed project setup window sizes to adapt to content size
+* Fixed linux package creating ~/.config if not there
+* Show fatal errors in UI that stopped analysis
+* Added compiler flags UI to advanced settings in project setup summary
+* Added file extension UI to advanced settings in project setup summary
+* Added graph zooming with Shift + mouse wheel or Shift + WS
+* Added graph panning with WASD
+* Improved project load and code view performance
+* Improved analysis performance for large projects (10x as fast for 1.000.000 LoC)
+* Added project setup for Compilation Databases
+
+#### 0.5.0.4
+released 2016-02-25
+
+* Fixed preferences not saved
+* Added link to documentation to Help menu
+* Improved painting of icons in graph to be smoother
+* Improved logging to alternate between 2 files of 1000 lines to decrease logfile sizes
+* Improved analysis performance to take only 66% of the time
+* Save user data in ~/Library/Application Support/Coati on Mac
+* Improved style of ui windows
+* Added Visual Studio solution parsing via project wizard or VS plugin
+* Added project setup wizard for step-by-step project setup
+* Added overview and error keywords to search view
+* Show overview on project open with node bundles per type
+* Added application move protection to reenter license key
+* Improved log file names to be sorted chronologically
+* Improved graph view node bundeling to bundle more
+* Display scope name at bottom of code snippet
+* Added .coatiproject file associations with icon for Mac and Windows
+* Return to last scroll position when going back in code view
+* Improved back & forward in code view
+* Update error count while analysis
+* Improved code view annotation painting performance
+* Added web documentation
+* Added trial target without analysis
+* Added license key window and license checker
+* Refresh project editing settings
+* Added C and C++ standard setting to project
+* Fixed cursor changing for resize and text interactions
+* Added commandline option for project file
+* Improved performance of token name saving
+* Fixed number postions in graph
+* Added shortcuts for font size resetting to View menu
+* Added C support
+* Added option to hide widget window title bars to View menu
+
+#### 0.4.0
+released 2016-01-07
+
+* navigate back via backspace key
+* navigate back&forward via mouse buttons
+* renamed undo&redo to back&forward
+* Fixed tooltip colors in dark color scheme
+* Fixed style of function or method nodes with children
+* Improved lambda handling in analysis
+* Added help texts to project setup and preferences window
+* Removed 'close window' action from menu
+* Fixed constructors and destructors using return type 'void' withou source location
+* Parse errors will be displayed as they appear during analysis
+* Redesigned the about window
+* Installing prerequisits in Windows Installer
+* Added installer for Windows
+* Introduced file endings .coatiproject and .coatidb for Coati's project files
+* Removed Coati directory from Linux package
+* Fixed graph font size was too small for Windows and Linux
+* Show function and method signature in tooltip when hovering the graph node
+* Added analysis for template parameter packs
+* Fixed syntax highlighting to correctly identify strings, comments and block comments
+* Fixed source locations of many declarations
+* Coati shows a template's general definition when an implicit specialization is activated
+* Added new color scheme called "bad_rainbow"
+* Extended color schemes to allow more extensive use in the graph
+* Coati now handles anonymous symbols when parsing files
+* Improved handling of template arguments in analysis
+* Coati can now handle inclass initialization of members
+* Network ports for IDE communication can be defined in the ApplicationSettings.xml
+
+#### 0.3.0
+released 2015-12-14
 
-* Added Tutorial project
-* Added communication interface from and to Coati via TCP sockets
-* Added plugin for Visual Studio (2012, 2013, 2015)
-* Added plugin for Sublime Text (2 & 3)
-* Increased autocompletion performance by caching and limiting results to 100
-* Save Coati version to sqlite and reparse project whenever the version changes
-* Improved source locations of template scopes
-* Fixed horizontal scroll in code view not activated while scrolling vertically
-* Save errors to storage and reactivate them via button in the status bar
-* Save macro scopes
-* Fixed old data was still in new project window when creating another project
-* Save comment locations and display them when right next to active symbol
-* Reworked code view highlighting
-* Fixed cursor was jumping at end of query when editing a search query
-* Fixed search query disappeared when not token was found for it
-* Improved code view auto scroll to center the first active line in the middle
-* Focus all overlapping source locations in the code view
-* Added recent projects menu option
 * Saving all template arguments type uses
+* Added recent projects menu option
+* Focus all overlapping source locations in the code view
+* Improved code view auto scroll to center the first active line in the middle
+* Fixed search query disappeared when not token was found for it
+* Fixed cursor was jumping at end of query when editing a search query
+* Reworked code view highlighting
+* Save comment locations and display them when right next to active symbol
+* Fixed old data was still in new project window when creating another project
+* Save macro scopes
+* Save errors to storage and reactivate them via button in the status bar
+* Fixed horizontal scroll in code view not activated while scrolling vertically
+* Improved source locations of template scopes
+* Save Coati version to sqlite and reparse project whenever the version changes
+* Increased autocompletion performance by caching and limiting results to 100
+* Added plugin for Sublime Text (2 & 3)
+* Added plugin for Visual Studio (2012, 2013, 2015)
+* Added communication interface from and to Coati via TCP sockets
+* Added Tutorial project

bin/app/data/ApplicationSettings_for_package.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<config>
-    <user>
-        <recent_projects>
-            <recent_project>./data/projects/tutorial/tutorial.coatiproject</recent_project>
-            <recent_project>./data/projects/tictactoe/tictactoe.coatiproject</recent_project>
-        </recent_projects>
-    </user>
-</config>

bin/app/data/ProjectSettings_template.xml

@@ -7,6 +7,10 @@
 <!-- COLOR: int int int int - rgba e.g. 125 125 125 255 -->
 
 <config>
+	<info>
+		<description><!-- STRING: optional description shown in overview. Symbols can be linked with syntax [main] --></description>
+	</info>
+
 	<language_settings>
 		<language><!-- STRING: name of the language, e.g. c, c++, spanish, greek, greek++,... --></language>
 		<standard><!-- STRING: language version, e.g. c++ '11' --></standard>
@@ -31,9 +35,18 @@
 		</framework_search_paths>
 
 		<extensions>
-			<header_extensions><!-- STRING: extension for header/include e.g. .h --></header_extensions>
 			<source_extensions><!-- STRING: extension for source e.g. .cpp --></source_extensions>
 		</extensions>
 
+		<use_source_paths_for_header_search><!-- BOOL: If enabled all subfolder of the source paths will be used for header search --></use_source_paths_for_header_search>
+
+		<exclude_paths>
+			<exclude_path><!-- STRING: path to file or directory to exclude from analysis --></source_path>
+		</exclude_paths>
+
+		<build_file_path>
+			<vs_solution_path><!-- STRING: path to Visual Studio solution *.sln --></vs_solution_path>
+			<compilation_db_path><!-- STRING: path to Compilation Database --></compilation_db_path>
+		</build_file_path>
 	</source>
 </config>

bin/app/data/color_schemes/bad_rainbow.xml

@@ -13,7 +13,7 @@
 		</button>
 
 		<field>
-			<text>#3D3D3D</text>
+			<text>#FFFFFF</text>
 			<background>#808080</background>
 			<highlight>#B1B1B1</highlight>
 		</field>
@@ -27,17 +27,45 @@
 
 		<query>
 			<none>
-				<normal>#B1B1B1</normal>
-				<hover>#CCCCCC</hover>
+				<normal>
+					<fill>#B1B1B1</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#CCCCCC</fill>
+					<text>#3D3D3D</text>
+				</hover>
 			</none>
 			<command>
-				<normal>#406D4D</normal>
-				<hover>#4E855E</hover>
+				<normal>
+					<fill>#86BD40</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#9EC769</fill>
+					<text>#3D3D3D</text>
+				</hover>
 			</command>
 			<operator>
-				<normal>#7D2724</normal>
-				<hover>#8C2B29</hover>
+				<normal>
+					<fill>#7D2724</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#8C2B29</fill>
+					<text>#3D3D3D</text>
+				</hover>
 			</operator>
+			<fulltext>
+				<normal>
+					<fill>#C2AFEF</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#AB96EA</fill>
+					<text>#3D3D3D</text>
+				</hover>
+			</fulltext>
 		</query>
 	</search>
 
@@ -87,48 +115,59 @@
 			</syntax>
 
 			<selection>
-				<location>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#EDEDED</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#4A4A4A</fill>
+						<border>#EDEDED</border>
+						<fill>#EDEDED</fill>
+						<text>#262626</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#9BDAFF</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
-					<focus>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</active>
 				</scope>
 				<error>
 					<normal>
 						<border>transparent</border>
 						<fill>#A0FF0000</fill>
+						<text>#000000</text>
 					</normal>
 					<focus>
-						<border>transparent</border>
 						<fill>#FFFF0000</fill>
 					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>#FFFF0000</fill>
-					</active>
 				</error>
+				<fulltext>
+					<normal>
+						<fill>#C2AFEF</fill>
+						<text>#3D3D3D</text>
+					</normal>
+				</fulltext>
 			</selection>
 		</snippet>
 	</code>
@@ -192,6 +231,9 @@
 					<normal>transparent</normal>
 					<focus>#FFFFFF</focus>
 				</border>
+				<hatching>
+					<normal>#FFFFFF</normal>
+				</hatching>
 			</function>
 			<method>
 				<like>function</like>
@@ -206,6 +248,9 @@
 					<normal>transparent</normal>
 					<focus>#FFFFFF</focus>
 				</border>
+				<hatching>
+					<normal>#FFFFFF</normal>
+				</hatching>
 			</global_variable>
 			<field>
 				<like>global_variable</like>
@@ -216,10 +261,12 @@
 
 			<undefined>
 				<fill>
-					<normal>#00000000</normal>
+					<normal>#EE7326</normal>
+					<focus>#EE8A4C</focus>
 				</fill>
 				<border>
-					<normal>#78282D</normal>
+					<normal>#80FFFFFF</normal>
+					<focus>#FFFFFF</focus>
 				</border>
 			</undefined>
 			<namespace>
@@ -235,6 +282,12 @@
 					<normal>#20FFFFFF</normal>
 					<focus>#FFFFFF</focus>
 				</border>
+				<text>
+					<normal>#FFFFFF</normal>
+				</text>
+				<icon>
+					<normal>#FFFFFF</normal>
+				</icon>
 			</file>
 			<macro>
 				<like>file</like>

bin/app/data/color_schemes/bright.xml

@@ -27,17 +27,45 @@
 
 		<query>
 			<none>
-				<normal>white</normal>
-				<hover>#F5F5F5</hover>
+				<normal>
+					<fill>white</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#F5F5F5</fill>
+					<text>black</text>
+				</hover>
 			</none>
 			<command>
-				<normal>#8FBC92</normal>
-				<hover>#5EA071</hover>
+				<normal>
+					<fill>#8FBC92</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#5EA071</fill>
+					<text>black</text>
+				</hover>
 			</command>
 			<operator>
-				<normal>#FCA47E</normal>
-				<hover>#F97A4E</hover>
+				<normal>
+					<fill>#FCA47E</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#F97A4E</fill>
+					<text>black</text>
+				</hover>
 			</operator>
+			<fulltext>
+				<normal>
+					<fill>#C7C7E2</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#ABABDD</fill>
+					<text>black</text>
+				</hover>
+			</fulltext>
 		</query>
 	</search>
 
@@ -87,48 +115,57 @@
 			</syntax>
 
 			<selection>
-				<location>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#8E8E8E</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#EDEDED</fill>
+						<border>#A0A0A0</border>
+						<fill>#A0A0A0</fill>
+						<text>#FFFFFF</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#AAE0FF</border>
+						<fill>#C6EAFF</fill>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#C6EAFF</fill>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
-					<focus>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</active>
 				</scope>
 				<error>
 					<normal>
 						<border>transparent</border>
 						<fill>#80FF0000</fill>
+						<text>#000000</text>
 					</normal>
 					<focus>
-						<border>transparent</border>
 						<fill>#FFFF0000</fill>
 					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>#FFFF0000</fill>
-					</active>
 				</error>
+				<fulltext>
+					<normal>
+						<fill>#C7C7E2</fill>
+						<text>#000000</text>
+					</normal>
+				</fulltext>
 			</selection>
 		</snippet>
 	</code>
@@ -210,10 +247,11 @@
 
 			<undefined>
 				<fill>
-					<normal>#00000000</normal>
+					<normal>#CC8D91</normal>
 				</fill>
 				<border>
-					<normal>#CC8D91</normal>
+					<normal>#803C3C3C</normal>
+					<focus>#3C3C3C</focus>
 				</border>
 			</undefined>
 			<namespace>
@@ -294,8 +332,8 @@
 			</template_member_specialization>
 
 			<aggregation>
-				<normal>#EEE</normal>
-				<focus>#DDD</focus>
+				<normal>#DDD</normal>
+				<focus>#CCC</focus>
 			</aggregation>
 		</edge>
 	</graph>

bin/app/data/color_schemes/dark.xml

@@ -27,17 +27,64 @@
 
 		<query>
 			<none>
-				<normal>#2F2F2F</normal>
-				<hover>black</hover>
+				<normal></normal>
+				<hover></hover>
 			</none>
 			<command>
-				<normal>#406D4D</normal>
-				<hover>#4E855E</hover>
+				<normal></normal>
+				<hover></hover>
 			</command>
 			<operator>
-				<normal>#7D2724</normal>
-				<hover>#8C2B29</hover>
+				<normal></normal>
+				<hover></hover>
 			</operator>
+			<fulltext>
+				<normal></normal>
+				<hover></hover>
+			</fulltext>
+		</query>
+
+		<query>
+			<none>
+				<normal>
+					<fill>#2F2F2F</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>black</fill>
+					<text>#F7F7F7</text>
+				</hover>
+			</none>
+			<command>
+				<normal>
+					<fill>#406D4D</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>#4E855E</fill>
+					<text>#F7F7F7</text>
+				</hover>
+			</command>
+			<operator>
+				<normal>
+					<fill>#7D2724</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>#8C2B29</fill>
+					<text>#F7F7F7</text>
+				</hover>
+			</operator>
+			<fulltext>
+				<normal>
+					<fill>#207EA8</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>#006D93</fill>
+					<text>#F7F7F7</text>
+				</hover>
+			</fulltext>
 		</query>
 	</search>
 
@@ -87,48 +134,59 @@
 			</syntax>
 
 			<selection>
-				<location>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#F7F7F7</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#4A4A4A</fill>
+						<border>transparent</border>
+						<fill>#F7F7F7</fill>
+						<text>#272728</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#A0A0A0</border>
+						<fill>#969696</fill>
+						<text>#191919</text>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#969696</fill>
+						<text>#272728</text>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
-					<focus>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</active>
 				</scope>
 				<error>
 					<normal>
 						<border>transparent</border>
 						<fill>#A0FF0000</fill>
+						<text>#000000</text>
 					</normal>
 					<focus>
-						<border>transparent</border>
 						<fill>#FFFF0000</fill>
 					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>#FFFF0000</fill>
-					</active>
 				</error>
+				<fulltext>
+					<normal>
+						<fill>#207EA8</fill>
+						<text>#F7F7F7</text>
+					</normal>
+				</fulltext>
 			</selection>
 		</snippet>
 	</code>
@@ -225,10 +283,11 @@
 
 			<undefined>
 				<fill>
-					<normal>#00000000</normal>
+					<normal>#78282D</normal>
 				</fill>
 				<border>
-					<normal>#78282D</normal>
+					<normal>#80C3C3C3</normal>
+					<focus>#C3C3C3</focus>
 				</border>
 			</undefined>
 			<namespace>
@@ -316,8 +375,8 @@
 			</macro_use>
 
 			<aggregation>
-				<normal>#5D5D5D</normal>
-				<focus>#6D6D6D</focus>
+				<normal>#3D3D3D</normal>
+				<focus>#4D4D4D</focus>
 			</aggregation>
 		</edge>
 	</graph>

bin/app/data/fonts/FiraSans_License.txt

@@ -0,0 +1,45 @@
+Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ with Reserved Font Name Fira Sans.
+
+Copyright (c) 2014, Telefonica S.A.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.

bin/app/data/fonts/Roboto_License.txt

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

bin/app/data/fonts/SourceCodePro_License.txt

@@ -0,0 +1,93 @@
+Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

bin/app/data/gui/about/about.css

@@ -1,23 +1,19 @@
 * {
 	color: white;
-	font-size: 12px;
+	font-size: 14px;
 	font-weight: 100;
 }
 
-#small {
-	font-size: 12px;
-}
-
 #closeButton {
 	background: transparent;
 	border: none;
 	color: white;
 	font-size: 14pt;
-	height: 20px;
-	width: 20px;
+	height: 24px;
+	width: 24px;
 }
 
 #closeButton:hover {
 	border: 2px solid white;
-	border-radius: 10px;
+	border-radius: 12px;
 }

bin/app/data/gui/code_view/code_view.css

@@ -2,20 +2,21 @@
 	background-color: <color:code/background>;
 }
 
-* {
-	font-size: <setting:font_size>pt;
-}
-
 #code_file {
 	background-color: <color:code/snippet/background>;
 	border: 2px solid <color:code/file/background>;
-	border-radius: 14px;
+	border-radius: 12px;
+	border-top-left-radius: 14px;
+	border-top-right-radius: 14px;
+	font-size: <setting:font_size>pt;
+	padding-bottom: 7px;
 }
 
 #code_file #title_widget {
 	background-color: <color:code/file/background>;
-	border-top-left-radius: 10px;
-	border-top-right-radius: 10px;
+	border-top-left-radius: 7px;
+	border-top-right-radius: 7px;
+	font-size: <setting:font_size>pt;
 	padding-right: 5px;
 }
 
@@ -24,6 +25,7 @@
 	border: none;
 	border-radius: 3px;
 	color: <color:code/file/title/text>;
+	font-size: <setting:font_size>pt;
 	padding: 2px 4px;
 	margin: 1px 8px 3px;
 }
@@ -49,10 +51,7 @@
 #code_file #code_snippet {
 	background-color: <color:code/snippet/background>;
 	border-top: 2px solid <color:code/file/background>;
-}
-
-#code_file #code_snippet * {
-	font-family: "<setting:font_name>";
+	font-size: <setting:font_size>pt;
 }
 
 #code_file #code_snippet[isFirst=true] {
@@ -60,15 +59,12 @@
 	padding-top: 0px;
 }
 
-#code_file #code_snippet[isLast=true] {
-	border-bottom-left-radius: 12px;
-	border-bottom-right-radius: 12px;
-}
-
 #code_file #code_snippet #scope_name, #code_file #code_snippet #dots {
 	background-color: <color:code/snippet/title/background>;
-	color: <color:code/snippet/title/text>;
 	border: none;
+	color: <color:code/snippet/title/text>;
+	font-family: "<setting:font_name>";
+	font-size: <setting:font_size>pt;
 }
 
 #code_file #code_snippet #scope_name:hover {
@@ -90,15 +86,15 @@
 	background-color: <color:code/snippet/line_number/background>;
 	border: none;
 	color: <color:code/snippet/line_number/text>;
-}
-
-#code_file #code_snippet[isLast=true] #line_number_area {
-	border-bottom-left-radius: 12px;
+	font-family: "<setting:font_name>";
+	font-size: <setting:font_size>pt;
 }
 
 #code_area {
 	background-color: transparent;
 	color: <color:code/snippet/syntax/normal>;
+	font-family: "<setting:font_name>";
+	font-size: <setting:font_size>pt;
 }
 
 #code_file #maximize_button, #code_file #snippet_button, #code_file #minimize_button {
@@ -108,31 +104,25 @@
 }
 
 #code_file #maximize_button {
-	border-image: url(data/gui/code_view/images/maximize_inactive.png);
+	border-image: url(<setting:gui_path>code_view/images/maximize_inactive.png);
 }
 
 #code_file #maximize_button:enabled {
-	border-image: url(data/gui/code_view/images/maximize_active.png);
+	border-image: url(<setting:gui_path>code_view/images/maximize_active.png);
 }
 
 #code_file #snippet_button {
-	border-image: url(data/gui/code_view/images/snippet_inactive.png);
+	border-image: url(<setting:gui_path>code_view/images/snippet_inactive.png);
 }
 
 #code_file #snippet_button:enabled {
-	border-image: url(data/gui/code_view/images/snippet_active.png);
+	border-image: url(<setting:gui_path>code_view/images/snippet_active.png);
 }
 
 #code_file #minimize_button {
-	border-image: url(data/gui/code_view/images/minimize_inactive.png);
+	border-image: url(<setting:gui_path>code_view/images/minimize_inactive.png);
 }
 
 #code_file #minimize_button:enabled {
-	border-image: url(data/gui/code_view/images/minimize_active.png);
-}
-
-QToolTip {
-	background-color: #E0E0E0;
-	color: black;
-	font-size: <setting:font_size>pt;
+	border-image: url(<setting:gui_path>code_view/images/minimize_active.png);
 }

bin/app/data/gui/graph_view/graph_view.css

@@ -1,9 +1,3 @@
 QGraphicsView, QGraphicsScene {
 	background-color: <color:graph/background>;
 }
-
-QToolTip {
-	background-color: #E0E0E0;
-	color: black;
-	font-size: <setting:font_size>pt;
-}

bin/app/data/gui/installer/EULA.rtf

@@ -1,98 +1,76 @@
-{\rtf1\ansi\ansicpg1252\deff0\deflang3079{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
+{\rtf1\ansi\ansicpg1252\deff0\deflang3079{\fonttbl{\f0\fnil\fcharset0 Calibri;}{\f1\fnil\fcharset2 Symbol;}}
 {\colortbl ;\red0\green0\blue255;}
-{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\sa200\sl276\slmult1\lang7\f0\fs22 Coati\par
+{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\sl240\slmult1\lang7\f0\fs22 Coati\par
 Software License Agreement\par
 Effective 1.1.2016\par
-\par
+\pard\sa200\sl276\slmult1\par
 BY INSTALLING OR USING THIS SOFTWARE, YOU ARE BECOMING A PARTY TO, AND ARE CONSENTING TO BE BOUND BY, THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, DO NOT INSTALL OR USE THIS SOFTWARE.\par
 \par
-\par
 \b DEFINITIONS\b0\par
-\par
 "Software" means:\par
-\bullet\tab A major version of Coati in executable form. The major version is defined by the leading number of the version string (e.g. the major version of Coati 1.x.x.x is version 1); \par
-\bullet\tab documentation for that major version of Coati;\par
-\bullet\tab minor updates included in software maintenance which are indicated by an increase in the numbers that follow the major version number (e.g. the update from Coati 1.0.0.0 to Coati 1.0.1.4).\par
-"Licensor" means:\par
-\bullet\tab Coati Software OG, having a place of business at Schlossallee 7/1, 5412 Puch/Hallein, Austria.\par
-"Licensee" means:\par
-\bullet\tab the individual evaluating the trial version of the Software;\par
-\bullet\tab the company, corporation, or organization that purchased a License(s) for the Software;\par
-\bullet\tab the individual who purchased a License for the Software.\par
-"Activation Key" means:\par
-\bullet\tab the name of the Licensee, the kind of license, the major version of the software that is licensed, and a hashcode; the combination of these values allows the Licensee to activate a genuine copy of the Software.\par
-"Authorized User" means:\par
-\bullet\tab the individual evaluating the Software during a trial;\par
-\bullet\tab an employee or independent contractor who might at any time use the Software, of the company, corporation, or organization that purchased a License(s) for the Software; an entity has one Authorized User for each License purchased;\par
-\bullet\tab the individual who purchased a License for the Software; the individual is the only Authorized User.\par
-\par
-\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 A major version of Coati in executable form. The major version is defined by the leading number of the version string (e.g. the major version of Coati 1.x.x.x is version 1);\par
+{\pntext\f1\'B7\tab}documentation for that major version of Coati;\par
+{\pntext\f1\'B7\tab}minor updates included in software maintenance which are indicated by an increase in the numbers that follow the major version number (e.g. the update from Coati 1.0.0.0 to Coati 1.0.1.4).\par
+\pard\sa200\sl276\slmult1 "Licensor" means:\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 Coati Software OG, having a place of business at Schlossallee 7/1, 5412 Puch/Hallein, Austria.\par
+\pard\sa200\sl276\slmult1 "Licensee" means:\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 the individual evaluating the trial version of the Software;\par
+{\pntext\f1\'B7\tab}the company, corporation, or organization that purchased a License(s) for the Software;\par
+{\pntext\f1\'B7\tab}the individual who purchased a License for the Software.\par
+\pard\sa200\sl276\slmult1 "Activation Key" means:\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 the name of the Licensee, the kind of license, the major version of the software that is licensed, and a hashcode; the combination of these values allows the Licensee to activate a genuine copy of the Software.\par
+\pard\sa200\sl276\slmult1 "Authorized User" means:\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 the individual evaluating the Software during a trial;\par
+{\pntext\f1\'B7\tab}an employee or independent contractor who might at any time use the Software, of the company, corporation, or organization that purchased a License(s) for the Software; an entity has one Authorized User for each License purchased;\par
+{\pntext\f1\'B7\tab}the individual who purchased a License for the Software; the individual is the only Authorized User.\par
+\pard\sa200\sl276\slmult1\par
 \b GRANT\b0\par
-\par
-Subject to the terms of this Agreement, the Licensor hereby grants the Licensee a non-transferable, non-exclusive, non-sub-licensable, limited license that allows:\par
-\bullet\tab the Licensee to distribute (an) Activation Key(s) to Authorized User(s);\par
-\bullet\tab Authorized User(s) to install the licensed version of the Software on computer PCs where potential use of the Software is restricted exclusively to Authorized User(s);\par
-\bullet\tab Authorized User(s) to use the Software on computer PCs, in virtual machines, in combination with multiple IDEs, and in combination with multiple instances of an IDE;\par
-\bullet\tab Authorized User(s) to use the trial version of the software in order to examine the provided example project;\par
-\bullet\tab Licensee to make a copy of the Software for archival purposes provided the copy contains all of the proprietary notices of the Software.\par
-In case the Licensee of the software is a company, corporation, or organization the Licensor has the right to mention this usage of the Software on its own website.\par
-\par
-\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 Subject to the terms of this Agreement, the Licensor hereby grants the Licensee a non-transferable, non-exclusive, non-sub-licensable, limited license that allows:\par
+{\pntext\f1\'B7\tab}the Licensee to distribute (an) Activation Key(s) to Authorized User(s);\par
+{\pntext\f1\'B7\tab}Authorized User(s) to install the licensed version of the Software on computer PCs where potential use of the Software is restricted exclusively to Authorized User(s);\par
+{\pntext\f1\'B7\tab}Authorized User(s) to use the Software on computer PCs, in virtual machines, in combination with multiple IDEs, and in combination with multiple instances of an IDE;\par
+{\pntext\f1\'B7\tab}Authorized User(s) to use the trial version of the software in order to examine the provided example projects;\par
+{\pntext\f1\'B7\tab}Licensee to make a copy of the Software for archival purposes provided the copy contains all of the proprietary notices of the Software.\par
+{\pntext\f1\'B7\tab}In case the Licensee of the software is a company, corporation, or organization the Licensor has the right to mention this usage of the Software on its own website.\par
+\pard\sa200\sl276\slmult1\par
 \b RESTRICTIONS\b0\par
-\par
 Licensee will not, and will have no right to:\par
-\bullet\tab use the trial version of the software for any commercial purposes;\par
-\bullet\tab distribute, use, or transfer an Activation Key(s) that has been superseded by an Activation Key(s) provided with software maintenance;\par
-\bullet\tab modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the Software;\par
-\bullet\tab sell, rent, lease, distribute, or otherwise transfer rights to the Software without prior written consent from Licensor;\par
-\bullet\tab remove any proprietary notices or labels from the Software.\par
-\par
-\par
-\b TITLE AND COPYRIGHT\par
-\b0\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 use the trial version of the software in order to examine project other than the provided examples;\par
+{\pntext\f1\'B7\tab}use a private/academic license of the software for any commercial purposes;\par
+{\pntext\f1\'B7\tab}distribute, use, or transfer an Activation Key(s) that has been superseded by an Activation Key(s) provided with software maintenance;\par
+{\pntext\f1\'B7\tab}modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the Software;\par
+{\pntext\f1\'B7\tab}sell, rent, lease, distribute, or otherwise transfer rights to the Software without prior written consent from Licensor;\par
+{\pntext\f1\'B7\tab}remove any proprietary notices or labels from the Software.\par
+\pard\sa200\sl276\slmult1\par
+\b TITLE AND COPYRIGHT\b0\par
 Title, ownership rights, intellectual property rights, and copyright to the Software, and any copies or portions thereof, shall remain in Licensor. The Software is protected by European copyright directives, Austrian copyright laws as well as United States copyright laws and international treaty provisions.\par
-\par
-\par
-\b DISCLAIMER OF WARRANTY\b0\par
-\par
+\b\par
+DISCLAIMER OF WARRANTY\b0\par
 THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. LICENSOR HEREBY DISCLAIMS ALL EXPRESS OR IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS AGREEMENT. SOME U.S. STATES DO NOT ALLOW EXCLUSIONS OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO LICENSEE. LICENSEE MAY HAVE OTHER LEGAL RIGHTS THAT VARY FROM STATE TO STATE OR BY JURISDICTION.\par
 \par
-\par
-\b LIMITATION OF LIABILITY\par
-\b0\par
+\b LIMITATION OF LIABILITY\b0\par
 LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. LICENSOR ASSUMES NO LIABILITY FOR THE COST OF ANY SERVICE OR REPAIR IF THE SOFTWARE IS DEFECTIVE. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, STRICT LIABILITY, OR OTHERWISE, SHALL LICENSOR, OR ITS LICENSORS, SUPPLIERS OR RESELLERS, BE LIABLE TO LICENSEE OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES. IN NO EVENT WILL LICENSOR BE LIABLE FOR ANY DAMAGES IN EXCESS OF THE MONEY PAID FOR THE SOFTWARE, EVEN IF LICENSOR SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. FURTHERMORE, SOME U.S. STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION AND EXCLUSION MAY NOT APPLY TO LICENSEE.\par
 \par
-\par
-\b TERMINATION\par
-\b0\par
+\b TERMINATION\b0\par
 The license granted herein shall be perpetual. If Licensee fails to comply with any of the terms of this Agreement, this Agreement and the rights granted herein will terminate immediately. Licensor may, at its sole discretion and at any time, terminate this Agreement. On termination, Licensee must cease using and destroy all copies of the Software.\par
-\par
-\par
-\b EXPORT CONTROLS\par
-\b0\par
+\b\par
+EXPORT CONTROLS\b0\par
 Licensee shall comply with all export laws, restrictions and regulations of the United States, the Directive 2009/428/EC of the European Parliament and of the Council and the Austrian Au\'dfenwirtschaftsgesetz 2011, BGBl I No. 26/2011. Licensee shall not export, re-export or otherwise transfer the Software to any country for which the United States or the European Union or Austria maintains an embargo, or to any person or entity on the U.S. Department of Treasury List of Specially Designated Nationals or the U.S. Department of Commerce Denied Persons List or Entity List. Licensee represents and warrants that licensee is not located in, under the control of, or a national or resident of any restricted country or on any such list.\par
 \par
-\par
-\b THIRD PARTY CREDITS\par
-\b0\par
+\b THIRD PARTY CREDITS\b0\par
 Portions of the Software utilize or include third party software and other copyrighted materials. Credits, licensing terms, and disclaimers for such materials are contained in the installation directory for the Software, and are accessible via the \ldblquote Licenses\rdblquote  dialog for the Software. Licensee agrees that use of such copyrighted materials is governed by their respective terms.\par
 \par
-\par
-\b ENTIRE AGREEMENT\par
-\b0\par
+\b ENTIRE AGREEMENT\b0\par
 This Agreement represents the complete agreement concerning this license between the parties and supersedes all prior agreements and representations between them. It may be amended only in writing executed by both parties. Coati Software OG reserves the exclusive right to periodically update this EULA at its discretion at any time, with reasonable notice to you by posting the new EULA at the following URL: {\field{\*\fldinst{HYPERLINK "http://www.coati.io/"}}{\fldrslt{\ul\cf1 http://www.coati.io/}}}\f0\fs22 . Any action arising out of or relating to this Agreement may be brought exclusively in Salzburg, Austria, and Coati Software OG and you irrevocably consent to the jurisdiction of such courts and venue in Salzburg, Austria.\par
 \par
-\par
-\b CONTACT\par
-\b0\par
+\b CONTACT\b0\par
 If you have questions regarding this agreement, contact:\par
-\par
-Coati Software OG\par
+\pard\sl276\slmult1 Coati Software OG\par
 Schlossallee 7/1\par
 5412 Puch/Hallein\par
-Austria\par
-\par
+\pard\sa200\sl276\slmult1 Austria\par
 support@coati.io\par
 \par
+\par
 }
 

bin/app/data/gui/installer/EULA.txt

@@ -0,0 +1,72 @@
+Coati
+Software License Agreement
+Effective 1.1.2016
+
+BY INSTALLING OR USING THIS SOFTWARE, YOU ARE BECOMING A PARTY TO, AND ARE CONSENTING TO BE BOUND BY, THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, DO NOT INSTALL OR USE THIS SOFTWARE.
+
+DEFINITIONS
+"Software" means:
+·0 A major version of Coati in executable form. The major version is defined by the leading number of the version string (e.g. the major version of Coati 1.x.x.x is version 1);
+·1 documentation for that major version of Coati;
+·2 minor updates included in software maintenance which are indicated by an increase in the numbers that follow the major version number (e.g. the update from Coati 1.0.0.0 to Coati 1.0.1.4).
+"Licensor" means:
+·3 Coati Software OG, having a place of business at Schlossallee 7/1, 5412 Puch/Hallein, Austria.
+"Licensee" means:
+·4 the individual evaluating the trial version of the Software;
+·5 the company, corporation, or organization that purchased a License(s) for the Software;
+·6 the individual who purchased a License for the Software.
+"Activation Key" means:
+·7 the name of the Licensee, the kind of license, the major version of the software that is licensed, and a hashcode; the combination of these values allows the Licensee to activate a genuine copy of the Software.
+"Authorized User" means:
+·8 the individual evaluating the Software during a trial;
+·9 an employee or independent contractor who might at any time use the Software, of the company, corporation, or organization that purchased a License(s) for the Software; an entity has one Authorized User for each License purchased;
+·10 the individual who purchased a License for the Software; the individual is the only Authorized User.
+
+GRANT
+·11 Subject to the terms of this Agreement, the Licensor hereby grants the Licensee a non-transferable, non-exclusive, non-sub-licensable, limited license that allows:
+·12 the Licensee to distribute (an) Activation Key(s) to Authorized User(s);
+·13 Authorized User(s) to install the licensed version of the Software on computer PCs where potential use of the Software is restricted exclusively to Authorized User(s);
+·14 Authorized User(s) to use the Software on computer PCs, in virtual machines, in combination with multiple IDEs, and in combination with multiple instances of an IDE;
+·15 Authorized User(s) to use the trial version of the software in order to examine the provided example projects;
+·16 Licensee to make a copy of the Software for archival purposes provided the copy contains all of the proprietary notices of the Software.
+·17 In case the Licensee of the software is a company, corporation, or organization the Licensor has the right to mention this usage of the Software on its own website.
+
+RESTRICTIONS
+Licensee will not, and will have no right to:
+·18 use the trial version of the software in order to examine project other than the provided examples;
+·19 use a private/academic license of the software for any commercial purposes;
+·20 distribute, use, or transfer an Activation Key(s) that has been superseded by an Activation Key(s) provided with software maintenance;
+·21 modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the Software;
+·22 sell, rent, lease, distribute, or otherwise transfer rights to the Software without prior written consent from Licensor;
+·23 remove any proprietary notices or labels from the Software.
+
+TITLE AND COPYRIGHT
+Title, ownership rights, intellectual property rights, and copyright to the Software, and any copies or portions thereof, shall remain in Licensor. The Software is protected by European copyright directives, Austrian copyright laws as well as United States copyright laws and international treaty provisions.
+
+DISCLAIMER OF WARRANTY
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. LICENSOR HEREBY DISCLAIMS ALL EXPRESS OR IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS AGREEMENT. SOME U.S. STATES DO NOT ALLOW EXCLUSIONS OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO LICENSEE. LICENSEE MAY HAVE OTHER LEGAL RIGHTS THAT VARY FROM STATE TO STATE OR BY JURISDICTION.
+
+LIMITATION OF LIABILITY
+LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. LICENSOR ASSUMES NO LIABILITY FOR THE COST OF ANY SERVICE OR REPAIR IF THE SOFTWARE IS DEFECTIVE. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, STRICT LIABILITY, OR OTHERWISE, SHALL LICENSOR, OR ITS LICENSORS, SUPPLIERS OR RESELLERS, BE LIABLE TO LICENSEE OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES. IN NO EVENT WILL LICENSOR BE LIABLE FOR ANY DAMAGES IN EXCESS OF THE MONEY PAID FOR THE SOFTWARE, EVEN IF LICENSOR SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. FURTHERMORE, SOME U.S. STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION AND EXCLUSION MAY NOT APPLY TO LICENSEE.
+
+TERMINATION
+The license granted herein shall be perpetual. If Licensee fails to comply with any of the terms of this Agreement, this Agreement and the rights granted herein will terminate immediately. Licensor may, at its sole discretion and at any time, terminate this Agreement. On termination, Licensee must cease using and destroy all copies of the Software.
+
+EXPORT CONTROLS
+Licensee shall comply with all export laws, restrictions and regulations of the United States, the Directive 2009/428/EC of the European Parliament and of the Council and the Austrian Außenwirtschaftsgesetz 2011, BGBl I No. 26/2011. Licensee shall not export, re-export or otherwise transfer the Software to any country for which the United States or the European Union or Austria maintains an embargo, or to any person or entity on the U.S. Department of Treasury List of Specially Designated Nationals or the U.S. Department of Commerce Denied Persons List or Entity List. Licensee represents and warrants that licensee is not located in, under the control of, or a national or resident of any restricted country or on any such list.
+
+THIRD PARTY CREDITS
+Portions of the Software utilize or include third party software and other copyrighted materials. Credits, licensing terms, and disclaimers for such materials are contained in the installation directory for the Software, and are accessible via the “Licenses” dialog for the Software. Licensee agrees that use of such copyrighted materials is governed by their respective terms.
+
+ENTIRE AGREEMENT
+This Agreement represents the complete agreement concerning this license between the parties and supersedes all prior agreements and representations between them. It may be amended only in writing executed by both parties. Coati Software OG reserves the exclusive right to periodically update this EULA at its discretion at any time, with reasonable notice to you by posting the new EULA at the following URL: http://www.coati.io/. Any action arising out of or relating to this Agreement may be brought exclusively in Salzburg, Austria, and Coati Software OG and you irrevocably consent to the jurisdiction of such courts and venue in Salzburg, Austria.
+
+CONTACT
+If you have questions regarding this agreement, contact:
+Coati Software OG
+Schlossallee 7/1
+5412 Puch/Hallein
+Austria
+support@coati.io
+
+

bin/app/data/gui/license/license.css

@@ -0,0 +1,21 @@
+QLabel {
+	font-size: 12pt;
+}
+
+#licenseField {
+	font-family: "<setting:font_name>";
+	font-size: 10pt;
+	height: 200px;
+	padding: 5px;
+	width: 470px;
+}
+
+#licenseError {
+	color: red;
+}
+
+QTextEdit {
+	background-color: rgba(255, 255, 255, 200);
+	border-radius: 10px;
+	border: 1px solid lightgrey;
+}

bin/app/data/gui/main.css

@@ -0,0 +1,9 @@
+QToolTip {
+	background-color: #E0E0E0;
+	color: black;
+	font-size: <setting:font_size>pt;
+}
+
+* {
+	font-family: "Roboto";
+}

bin/app/data/gui/refresh_view/refresh_view.css

@@ -13,6 +13,10 @@ QPushButton:hover, QPushButton:checked {
 	background: <color:search/button/hover>;
 }
 
+QPushButton:disabled {
+	background: <color:search/button/disabled>;
+}
+
 QPushButton:pressed {
 	background: <color:search/button/press>;
 }
@@ -27,9 +31,3 @@ QPushButton:pressed {
 	border-bottom-right-radius: 12px;
 	border-top-right-radius: 12px;
 }
-
-QToolTip {
-	background-color: #E0E0E0;
-	color: black;
-	font-size: <setting:font_size>pt;
-}

bin/app/data/gui/search_view/search_view.css

@@ -16,6 +16,7 @@ QWidget#search_box_container {
 	border: none;
 	border-bottom-left-radius: 12px;
 	border-top-left-radius: 12px;
+	margin-left: 5px;
 	margin-right: 2px;
 }
 
@@ -23,6 +24,7 @@ QLineEdit#search_box {
 	background-color: transparent;
 	border: none;
 	color: <color:search/field/text>;
+	margin-left: 5px;
 	selection-background-color: <color:search/field/highlight>;
 }
 
@@ -41,25 +43,23 @@ QAbstractItemView#search_box_popup {
 	selection-background-color: <color:search/popup/highlight>;
 }
 
-QPushButton#search_button {
+#search_button, #home_button {
 	background: <color:search/button/normal>;
 	border: none;
-	border-bottom-right-radius: 12px;
-	border-top-right-radius: 12px;
+	border-radius: 12px;
 	background-position: 15px 5px;
 	width: 30px;
 }
 
-#search_button:hover {
+#search_button {
+	border-bottom-left-radius: 0px;
+	border-top-left-radius: 0px;
+}
+
+#search_button:hover, #home_button:hover {
 	background: <color:search/button/hover>;
 }
 
-#search_button:pressed {
+#search_button:pressed, #home_button:pressed {
 	background: <color:search/button/press>;
 }
-
-QToolTip {
-	background-color: #E0E0E0;
-	color: black;
-	font-size: <setting:font_size>pt;
-}

bin/app/data/gui/setting_window/listbox.css

@@ -1,58 +0,0 @@
-QtDirectoryListBox {
-	background-color: rgba(255, 255, 255, 200);
-	border: 1px solid lightgray;
-	border-radius: 12px;
-}
-
-QListWidget {
-	background: transparent;
-	border: none;
-	margin: 2px 0 2px 0;
-}
-
-QListWidget::item {
-	border-bottom: 1px solid lightgray;
-	height: 20px;
-}
-
-QListWidget::item:selected {
-	background-color: #EEE;
-}
-
-
-QtListItemWidget #field {
-	background-color: transparent;
-	border: none;
-	font-size: 12px;
-	margin-top: 2px;
-}
-
-QtListItemWidget #button {
-	border: 1px solid lightgray;
-	border-radius: 8px;
-	font-size: 12px;
-	margin-top: 2px;
-	margin-right: 2px;
-	width: 20px;
-}
-
-QtListItemWidget #button:hover {
-	color: white;
-	background: #2D3F85;
-}
-
-#bar {
-	border-top: 1px solid lightgray;
-}
-
-#roundedButton {
-	color: white;
-	height: 16px;
-	margin-right: 3px;
-	width: 16px;
-	border: none;
-}
-
-#dropInfo {
-	color: lightgray;
-}

bin/app/data/gui/setting_window/window.css

@@ -1,83 +0,0 @@
-#titleLabel {
-	color: black;
-	font-size: 16pt;
-	font-weight: bold;
-}
-
-QLineEdit {
-	background-color: rgba(255, 255, 255, 200);
-	border-radius: 10px;
-	border: 1px solid lightgrey;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-QLineEdit:disabled {
-	border: 1px solid lightgrey;
-}
-
-#formArea {
-	background-color: transparent;
-	border: none;
-	border-top: 1px solid lightgrey;
-	border-bottom: 1px solid lightgrey;
-}
-
-#form {
-	background-color: rgba(255, 255, 255, 150);
-}
-
-#form QLabel {
-	font-weight: bold;
-}
-
-#form #help {
-	background: transparent;
-	border: 1px solid #575656;
-	border-radius: 9px;
-	color: #575656;
-	height: 16px;
-	width: 16px;
-}
-
-#form #help:hover {
-	border-color: black;
-	color: black;
-}
-
-#moreButton {
-	background-color: rgba(255, 255, 255, 200);
-	border: 1px solid lightgray;
-	border-radius: 10px;
-	color: gray;
-	font-size: 15px;
-	height: 20px;
-	margin-left: 10px;
-	width: 28px;
-}
-
-#moreButton:hover {
-	color: white;
-	background: #2D3F85;
-}
-
-#windowButton {
-	background: white;
-	border: 1px solid lightgray;
-	border-radius: 10px;
-	color: black;
-	font-size: 17pt;
-	height: 30px;
-	width: 140px;
-}
-
-#windowButton:hover {
-	color: white;
-	background: #2D3F85;
-}
-
-QToolTip {
-	background-color: #E0E0E0;
-	color: black;
-	font-size: <setting:font_size>pt;
-}

bin/app/data/gui/startscreen/startscreen.css

@@ -1,13 +1,16 @@
 #projectButton {
 	background: white;
 	border: 1px solid lightgray;
-	border-radius: 10px;
-	font-size: 17pt;
+	border-radius: 8px;
+	color: black;
+	padding: 3px 5px 2px;
+	font-size: 14pt;
+	min-width: 6em;
 }
 
 #projectButton:hover {
-	background: #2D3F85;
 	color: white;
+	background: #2D3F85;
 }
 
 #recentButton {
@@ -17,8 +20,15 @@
 	font-size: 12pt;
 }
 
-#recentButton:hover {
-	background-color: rgba(45, 63, 133, 70);
+#recentButtonMissing {
+	background: none;
+	border: none;
+	color: grey;
+	font-size: 12pt;
+}
+
+#recentButton:hover, #recentButtonMissing:hover {
+	background-color: #CFD2E0;
 	border-radius: 10px;
 }
 
@@ -26,4 +36,21 @@
 	color: black;
 	font-size: 16pt;
 	font-weight: bold;
+	margin-left: 6px;
+}
+
+#versionLabel {
+	color: black;
+	font-size: 12pt;
+	font-weight: bold;
+}
+
+#updateLabel {
+	color: black;
+	font-size: 12pt;
+}
+
+#welcomeLabel {
+	color: black;
+	font-size: 12pt;
 }

bin/app/data/gui/undoredo_view/undoredo_view.css

@@ -32,9 +32,3 @@ QPushButton:hover {
 QPushButton:pressed {
 	background: <color:search/button/press>;
 }
-
-QToolTip {
-	background-color: #E0E0E0;
-	color: black;
-	font-size: <setting:font_size>pt;
-}

bin/app/data/gui/window/listbox.css

@@ -0,0 +1,75 @@
+* {
+	font-size: 12pt;
+}
+
+QtDirectoryListBox {
+	background-color: white;
+	border: 1px solid lightgray;
+	border-radius: 12px;
+}
+
+QListWidget {
+	background: transparent;
+	border: none;
+	margin: 2px 0 2px 0;
+}
+
+QListWidget::item {
+	height: 20px;
+	border-bottom: 1px solid lightgray;
+}
+
+QListWidget::item:selected {
+	background-color: #EEE;
+}
+
+QtListItemWidget #field {
+	background-color: transparent;
+	border: none;
+	margin-top: 2px;
+	margin-left: 5px;
+}
+
+#bar {
+	border-top: 1px solid lightgray;
+}
+
+#plusButton, #minusButton, #dotsButton {
+	color: white;
+	height: 1em;
+	margin-right: 3px;
+	width: 1em;
+	border: none;
+}
+
+#dotsButton {
+	margin-top: 2px;
+}
+
+#plusButton {
+	border-image: url(<setting:gui_path>window/plus.png);
+}
+
+#plusButton:hover {
+	border-image: url(<setting:gui_path>window/plus_hover.png);
+}
+
+#minusButton {
+	border-image: url(<setting:gui_path>window/minus.png);
+}
+
+#minusButton:hover {
+	border-image: url(<setting:gui_path>window/minus_hover.png);
+}
+
+#dotsButton {
+	border-image: url(<setting:gui_path>window/dots.png);
+}
+
+#dotsButton:hover {
+	border-image: url(<setting:gui_path>window/dots_hover.png);
+}
+
+#dropInfo {
+	color: #999;
+}

bin/app/data/gui/window/window.css

@@ -0,0 +1,167 @@
+* {
+	font-size: 12pt;
+}
+
+#title {
+	color: black;
+	font-size: 16pt;
+	font-weight: bold;
+}
+
+#section, #projectTitle {
+	color: black;
+	font-size: 14pt;
+	font-weight: bold;
+}
+
+#projectTitle {
+	background: white;
+	padding: 5px;
+	margin-left: 40px;
+}
+
+#projectDescription {
+	font-size: 12pt;
+	margin-left: 20px;
+}
+
+#description {
+	font-size: 12pt;
+}
+
+#label {
+	font-size: 12pt;
+	font-weight: bold;
+}
+
+#titleLabel {
+	font-size: 14pt;
+	font-weight: bold;
+}
+
+#formArea {
+	background: white;
+	border: none;
+}
+
+#scrollArea {
+	background: white;
+	border: none;
+	border-top: 1px solid lightgrey;
+	border-bottom: 1px solid lightgrey;
+}
+
+#form {
+	background: white;
+}
+
+#helpButton, #dotsButton, #refreshButton {
+	border: none;
+	color: white;
+	height: 1em;
+	width: 1em;
+}
+
+#helpButton {
+	border-image: url(<setting:gui_path>window/help.png);
+}
+
+#helpButton:hover {
+	border-image: url(<setting:gui_path>window/help_hover.png);
+}
+
+#dotsButton {
+	border-image: url(<setting:gui_path>window/dots.png);
+}
+
+#dotsButton:hover {
+	border-image: url(<setting:gui_path>window/dots_hover.png);
+}
+
+#refreshButton {
+	border-image: url(<setting:gui_path>window/refresh.png);
+}
+
+#refreshButton:hover {
+	border-image: url(<setting:gui_path>window/refresh_hover.png);
+}
+
+#name, #picker {
+	border-radius: 10px;
+	border: 1px solid lightgrey;
+	padding: 2px 5px 0px;
+}
+
+#locationField {
+	background: white;
+	border: none;
+	border-radius: 5px;
+	margin-left: 5px;
+	margin-top: 2px;
+}
+
+#dotsButton, #refreshButton {
+	margin-right: 2px;
+}
+
+#windowButton {
+	background: white;
+	border: 1px solid lightgray;
+	border-radius: 8px;
+	color: black;
+	padding: 3px 5px 2px;
+	font-size: 14pt;
+	min-width: 5em;
+}
+
+#menuButton {
+	background: white;
+	border: none;
+	border-radius: 8px;
+	border-bottom-right-radius: 0px;
+	border-top-right-radius: 0px;
+	font-size: 15pt;
+	margin-right: 0px;
+	height: 25px;
+	width: 90px;
+}
+
+#windowButton:hover {
+	color: white;
+	background: #2D3F85;
+}
+
+#menuButton:hover, #menuButton:checked {
+	background: #CFD2E0;
+}
+
+#windowButton:disabled {
+	color: lightgray;
+}
+
+#projectContainer {
+	background: white;
+	border: 1px solid lightgray;
+	border-radius: 8px;
+	margin-top: 15px;
+	margin-left: 20px;
+}
+
+#projectButton {
+	background: white;
+	border-radius: 8px;
+	font-size: 12pt;
+	width: 7em;
+	height: 7em;
+	margin-top: 10px;
+}
+
+#projectButton:hover, #projectButton:checked {
+	background: #CFD2E0;
+}
+
+#files {
+	border: 1px solid lightgray;
+	border-radius: 12px;
+	padding: 6px;
+}

bin/app/data/install/uninstall.bat

@@ -1 +0,0 @@
-%windir%\system32\msiexec.exe /I{2A3B2FF5-A114-4CAB-88FB-DE8942D5B8EB}

bin/app/data/install/uninstall_app.bat

@@ -0,0 +1 @@
+%windir%\system32\msiexec.exe /I{E6E16577-C547-4A66-8202-AB30A02DDBC2}

bin/app/data/install/uninstall_trail.bat

@@ -0,0 +1 @@
+%windir%\system32\msiexec.exe /I{225E11DF-20A0-4AE0-AD5C-00944A9E3D71}

bin/app/data/projects/tictactoe/src/human_player.h

@@ -3,6 +3,7 @@
 
 #include "player.h"
 
+
 class HumanPlayer : public Player {
 public:
 	HumanPlayer( Field::Token token, const char* name  );

bin/app/data/projects/tictactoe/tictactoe.coatiproject

@@ -5,8 +5,17 @@
         <standard>11</standard>
     </language_settings>
     <source>
+        <extensions>
+            <header_extensions>.h</header_extensions>
+            <header_extensions>.hpp</header_extensions>
+            <source_extensions>.cpp</source_extensions>
+            <source_extensions>.cxx</source_extensions>
+            <source_extensions>.cc</source_extensions>
+            <source_extensions>.c</source_extensions>
+        </extensions>
         <source_paths>
             <source_path>./src</source_path>
         </source_paths>
+        <use_source_paths_for_header_search>0</use_source_paths_for_header_search>
     </source>
 </config>