delta time for loader

* show custom icon for size grip
* add small margin at bottom of windows to show full shadow on Windows
* remove color_scheme_test keyword from autocompletions
* commented failing vs solution parser tests

.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

@@ -40,7 +40,10 @@
 .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

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,9 +6,6 @@ include(cmake/version.cmake)
 include(cmake/version_setup.cmake)
 include(cmake/licenses.cmake)
 
-# set Standerd build type to Release
-set(CMAKE_BUILD_TYPE_INIT "Release")
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Variables --------------------------------------------------------------------
 
@@ -37,23 +29,36 @@ else ()
 	set(PLATFORM_INCLUDE "includesLinux.h")
 endif ()
 
-# Settings ---------------------------------------------------------------------
-
-if (UNIX)
-	add_definitions(-std=c++11 -Wno-unknown-warning-option -fcolor-diagnostics -DQT_COMPILING_QSTRING_COMPAT_CPP )
-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)
+	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 AND APPLE)
@@ -63,7 +68,7 @@ if (UNIX AND APPLE)
 		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)
+	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()
@@ -75,9 +80,9 @@ add_definitions(${CLANG_DEFINITIONS})
 # Boost ------------------------------------------------------------------------
 
 if(UNIX AND NOT APPLE)
-    set(BOOST_ROOT ${EXTERNAL_BUILD}/boost)
+	set(BOOST_ROOT ${EXTERNAL_BUILD}/boost)
 else()
-    set(BOOST_ROOT $ENV{BOOST_159_DIR})
+	set(BOOST_ROOT $ENV{BOOST_159_DIR})
 endif()
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS ON)
@@ -91,37 +96,83 @@ find_package(Boost 1.59 COMPONENTS system program_options filesystem date_time R
 
 add_definitions(-DEIGEN_MPL2_ONLY)
 if(UNIX AND NOT APPLE)
-    set(EIGEN_ROOT ${EXTERNAL_SRC}/eigen)
+	set(EIGEN_ROOT ${EXTERNAL_SRC}/eigen)
 else()
-    set(EIGEN_ROOT $ENV{EIGEN_DIR})
+	set(EIGEN_ROOT $ENV{EIGEN_DIR})
 endif()
 
 # Botan -------------------------------------------------------------------------
 
+set(BOTAN_VERSION "botan-1.11")
+
 if(UNIX AND APPLE)
-    find_library(BOTAN botan-1.11 $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
-    find_library(BOTAN_D botan-1.11 $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
+	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-1.11 "${EXTERNAL_BUILD}/botan/lib" NO_DEFAULT_PATH)
+	find_library(BOTAN ${BOTAN_VERSION} "${EXTERNAL_BUILD}/botan" NO_DEFAULT_PATH)
 else()
-    find_library(BOTAN botan "$ENV{BOTAN_DIR}/release")
+	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")
+	message(FATAL_ERROR "Botan not found")
 else()
-    message(STATUS "Botan found")
+	message(STATUS "Botan found")
 endif()
 if(UNIX AND NOT APPLE)
-    set(BOTAN_INCLUDE_DIR "${EXTERNAL_SRC}/botan")
+	set(BOTAN_INCLUDE_DIR "${EXTERNAL_BUILD}/botan")
 else()
-    set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}")
+	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)
@@ -146,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
@@ -153,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)
 
@@ -172,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}
@@ -187,50 +247,12 @@ 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 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"
-)
-
-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 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)
 
@@ -241,14 +263,14 @@ set(CMAKE_AUTOMOC ON)
 
 # Find the QtWidgets library
 if(UNIX AND NOT APPLE)
-    set(CMAKE_PREFIX_PATH ${EXTERNAL_BUILD}/qt)
+	set(CMAKE_PREFIX_PATH ${EXTERNAL_BUILD}/qt)
 else()
-    set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
+	set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
 endif()
 
 if(UNIX AND APPLE)
-    set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
-    set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
+	set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
+	set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
 endif()
 
 find_package(Qt5Widgets)
@@ -256,11 +278,11 @@ 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
@@ -278,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)
@@ -292,6 +314,14 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/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
@@ -313,8 +343,8 @@ 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
@@ -342,7 +372,7 @@ if (WIN32)
 		"IDI_ICON1               ICON                    \"${CMAKE_SOURCE_DIR}/build/coati.ico\"\n"
 	)
 
-	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CLANG_FILES} ${GEN_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h)
+	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")
@@ -352,7 +382,7 @@ if (WIN32)
 	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} ${GEN_FILES} ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h)
+	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${GEN_FILES})
 endif ()
 
 create_source_groups(${APP_FILES})
@@ -368,6 +398,7 @@ set_property(
 		"${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"
 )
 
@@ -434,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
@@ -542,9 +574,9 @@ endif ()
 add_subdirectory(src/test)
 
 if(UNIX AND NOT APPLE)
-    set(CXXTEST_INCLUDE_DIR ${EXTERNAL_SRC}/cxxtest)
+	set(CXXTEST_INCLUDE_DIR ${EXTERNAL_SRC}/cxxtest)
 else()
-    set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
+	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)
@@ -592,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"
 	)

README.md

@@ -1,22 +1,22 @@
-### Masterproject
+## Masterproject
 
-#### Setup
+### Setup
 
-##### External Software
+#### External Software
 
-* QT 5.5
+* QT 5.6
 * CxxTest 4.3
 * Valgrind 3.9.0 (linux)
-* Clang & LLVM (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(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
@@ -25,7 +25,7 @@ For Win32:
 * VLD_DIR - .../Visual Leak Detector
 * path - apped path to git.exe
 
-###### Botan setup
+##### Botan setup
 
 Build release lib in ${BOTAN_DIR}/release
 Build debug lib in ${BOTAN_DIR}/debug
@@ -39,30 +39,30 @@ python configure.py --cc=msvc --cpu=x86_32 --via-amalgamation --disable-shared -
 for other:
 $ python configure.py --via-amalgamation --disable-shared
 
-##### Settings
+#### 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
 
@@ -83,66 +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'
 
-#### Tagging
+### Tagging
 
 $ git tag -a VERSION_NUMBER -m "DESCRIPTION"
 $ git push --tags
 
-#### Changelog
+### Changelog
 
-##### 0.3.0
+#### 0.7.0.22
+released 2016-07-07
 
-* 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
+* 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.4.0
+#### 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
 
-* Network ports for IDE communication can be defined in the ApplicationSettings.xml
-* Coati can now handle inclass initialization of members
-* Improved handling of template arguments in analysis
-* Coati now handles anonymous symbols when parsing files
-* Extended color schemes to allow more extensive use in the graph
-* Added new color scheme called "bad_rainbow"
-* Coati shows a template's general definition when an implicit specialization is activated
-* Fixed source locations of many declarations
-* Fixed syntax highlighting to correctly identify strings, comments and block comments
-* Added analysis for template parameter packs
-* Show function and method signature in tooltip when hovering the graph node
-* Fixed graph font size was too small for Windows and Linux
-* Removed Coati directory from Linux package
-* Introduced file endings .coatiproject and .coatidb for Coati's project files
-* Added installer for Windows
-* Installing prerequisits in Windows Installer
-* Redesigned the about window
-* Parse errors will be displayed as they appear during analysis
-* Fixed constructors and destructors using return type 'void' withou source location
-* Removed 'close window' action from menu
-* Added help texts to project setup and preferences window
-* Improved lambda handling in analysis
-* Fixed style of function or method nodes with children
-* Fixed tooltip colors in dark color scheme
-* renamed undo&redo to back&forward
-* navigate back&forward via mouse buttons
 * 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
+
+* 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/ProjectSettings_template.xml

@@ -35,12 +35,15 @@
 		</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>

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>#86BD40</normal>
-				<hover>#9EC769</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>
@@ -243,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>
@@ -295,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>
@@ -317,8 +375,8 @@
 			</macro_use>
 
 			<aggregation>
-				<normal>#5D5D5D</normal>
-				<focus>#6D6D6D</focus>
+				<normal>#3D3D3D</normal>
+				<focus>#4D4D4D</focus>
 			</aggregation>
 		</edge>
 	</graph>

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

@@ -4,10 +4,6 @@
 	font-weight: 100;
 }
 
-#small {
-	font-size: 12px;
-}
-
 #closeButton {
 	background: transparent;
 	border: none;

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

@@ -2,16 +2,13 @@
 	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: 12px;
 	border-top-left-radius: 14px;
 	border-top-right-radius: 14px;
+	font-size: <setting:font_size>pt;
 	padding-bottom: 7px;
 }
 
@@ -19,6 +16,7 @@
 	background-color: <color:code/file/background>;
 	border-top-left-radius: 7px;
 	border-top-right-radius: 7px;
+	font-size: <setting:font_size>pt;
 	padding-right: 5px;
 }
 
@@ -27,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;
 }
@@ -52,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] {
@@ -65,8 +61,10 @@
 
 #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 {
@@ -88,11 +86,15 @@
 	background-color: <color:code/snippet/line_number/background>;
 	border: none;
 	color: <color:code/snippet/line_number/text>;
+	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 {

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>;
 }

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,19 +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>;
 }

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

@@ -1,82 +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;
-	height: 20px;
-	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 #label {
-	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: 5px;
-	width: 28px;
-}
-
-#moreButton:hover {
-	color: white;
-	background: #2D3F85;
-}
-
-#windowButton {
-	background: white;
-	border: 1px solid lightgray;
-	border-radius: 8px;
-	color: black;
-	padding: 3px 5px 2px;
-	font-size: 14pt;
-	min-width: 5em;
-}
-
-#windowButton:hover {
-	color: white;
-	background: #2D3F85;
-}
-
-#windowButton:disabled {
-	color: lightgray;
-}

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

@@ -20,7 +20,14 @@
 	font-size: 12pt;
 }
 
-#recentButton:hover {
+#recentButtonMissing {
+	background: none;
+	border: none;
+	color: grey;
+	font-size: 12pt;
+}
+
+#recentButton:hover, #recentButtonMissing:hover {
 	background-color: #CFD2E0;
 	border-radius: 10px;
 }
@@ -29,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/window/listbox.css

@@ -47,27 +47,27 @@ QtListItemWidget #field {
 }
 
 #plusButton {
-	border-image: url(<setting:gui_path>setting_window/plus.png);
+	border-image: url(<setting:gui_path>window/plus.png);
 }
 
 #plusButton:hover {
-	border-image: url(<setting:gui_path>setting_window/plus_hover.png);
+	border-image: url(<setting:gui_path>window/plus_hover.png);
 }
 
 #minusButton {
-	border-image: url(<setting:gui_path>setting_window/minus.png);
+	border-image: url(<setting:gui_path>window/minus.png);
 }
 
 #minusButton:hover {
-	border-image: url(<setting:gui_path>setting_window/minus_hover.png);
+	border-image: url(<setting:gui_path>window/minus_hover.png);
 }
 
 #dotsButton {
-	border-image: url(<setting:gui_path>setting_window/dots.png);
+	border-image: url(<setting:gui_path>window/dots.png);
 }
 
 #dotsButton:hover {
-	border-image: url(<setting:gui_path>setting_window/dots_hover.png);
+	border-image: url(<setting:gui_path>window/dots_hover.png);
 }
 
 #dropInfo {

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

@@ -25,7 +25,17 @@
 	margin-left: 20px;
 }
 
+#description {
+	font-size: 12pt;
+}
+
 #label {
+	font-size: 12pt;
+	font-weight: bold;
+}
+
+#titleLabel {
+	font-size: 14pt;
 	font-weight: bold;
 }
 
@@ -53,27 +63,27 @@
 }
 
 #helpButton {
-	border-image: url(<setting:gui_path>setting_window/help.png);
+	border-image: url(<setting:gui_path>window/help.png);
 }
 
 #helpButton:hover {
-	border-image: url(<setting:gui_path>setting_window/help_hover.png);
+	border-image: url(<setting:gui_path>window/help_hover.png);
 }
 
 #dotsButton {
-	border-image: url(<setting:gui_path>setting_window/dots.png);
+	border-image: url(<setting:gui_path>window/dots.png);
 }
 
 #dotsButton:hover {
-	border-image: url(<setting:gui_path>setting_window/dots_hover.png);
+	border-image: url(<setting:gui_path>window/dots_hover.png);
 }
 
 #refreshButton {
-	border-image: url(<setting:gui_path>setting_window/refresh.png);
+	border-image: url(<setting:gui_path>window/refresh.png);
 }
 
 #refreshButton:hover {
-	border-image: url(<setting:gui_path>setting_window/refresh_hover.png);
+	border-image: url(<setting:gui_path>window/refresh_hover.png);
 }
 
 #name, #picker {
@@ -112,7 +122,6 @@
 	border-top-right-radius: 0px;
 	font-size: 15pt;
 	margin-right: 0px;
-	margin-bottom: 7px;
 	height: 25px;
 	width: 90px;
 }

bin/app/data/install/uninstall_app.bat

@@ -1 +1 @@
-%windir%\system32\msiexec.exe /I{2A3B2FF5-A114-4CAB-88FB-DE8942D5B8EB}
+%windir%\system32\msiexec.exe /I{E6E16577-C547-4A66-8202-AB30A02DDBC2}

bin/app/data/install/uninstall_trail.bat

@@ -1 +1 @@
-%windir%\system32\msiexec.exe /I{5DF07CC0-F774-4C4F-9397-0A749A22AB03}
+%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>

bin/app/data/projects/tutorial/src/code_tutorial_3.h

@@ -55,6 +55,7 @@ void function_with_snippets()
 	the_central_hub();
 
 
+
 	unrelated_but_very_important();
 };
 

bin/app/data/projects/tutorial/src/main.cpp

@@ -2,6 +2,19 @@
 #define MAIN_H
 
 
+#include "code_tutorial_1.h"
+#include "code_tutorial_2.h"
+#include "code_tutorial_3.h"
+#include "graph_tutorial_1.h"
+#include "graph_tutorial_2.h"
+#include "graph_tutorial_3.h"
+#include "graph_tutorial_4.h"
+#include "search_tutorial_1.h"
+#include "search_tutorial_2.h"
+#include "search_tutorial_3.h"
+#include "search_tutorial_4.h"
+#include "search_tutorial_5.h"
+
 #include "my_first_step.h"
 
 //------------------------------------------------------------------------------

bin/app/data/projects/tutorial/src/my_first_step.h

@@ -2,7 +2,7 @@
 #define MY_FIRST_STEP_H
 
 
-#include "the_central_hub.h"
+#include "my_next_step.h"
 
 //------------------------------------------------------------------------------
 //
@@ -19,14 +19,14 @@
 //  did, Coati allows you to jump through the code base on your own.
 //
 // I THINK I GOT IT!
-//  Now that you understand Coati's central concept you are ready to jump 
-//  further by activating "the_central_hub()" of this tutorial.
+//  Now that you understand Coati's central concept you are ready to activate 
+//  the "my_next_step()" symbol below.
 //
 //------------------------------------------------------------------------------
 
 void my_first_step()
 {
-	the_central_hub();
+	my_next_step(2);
 }
 
 

bin/app/data/projects/tutorial/src/my_next_step.h

@@ -0,0 +1,39 @@
+#ifndef MY_NEXT_STEP_H
+#define MY_NEXT_STEP_H
+
+
+#include "the_central_hub.h"
+
+//------------------------------------------------------------------------------
+//
+// ANYTING ELSE I SHOULD KNOW?
+//  I'm glad that you asked. Take a look at the code below. You will notice two
+//  different highlights when hovering different symbols in that snippet. One 
+//  is used for symbols that may be used everywhere throughout your code base 
+//  while the other one is used to quickly highlight references to local 
+//  symbols (like "foo" and "bar").
+//
+// MORE ON LOCAL SYMBOLS 
+//  These local symbols aren't covered by this tutorial. So don't you dare 
+//  clicking them! Just kidding. Even though this tutorial doesn't make 
+//  extensive use of local symbols these highlights prove really useful when 
+//  inspecting a real code project.
+//
+// THAT'S ALL FOR NOW
+//  Your preliminary training is complete. You may proceed to 
+//  "the_central_hub()" of this tutorial.
+//
+//------------------------------------------------------------------------------
+
+int my_next_step(int foo)
+{
+	the_central_hub();
+
+	int bar = 2 * foo;
+
+	return bar;
+}
+
+
+#endif // MY_NEXT_STEP_H
+

bin/app/data/projects/tutorial/src/search_tutorial_4.h

@@ -20,7 +20,10 @@
 //  of your code. The second button toggels the auto-refresh option. When
 //  enabled Coati refreshes your project every time it's window gets focused.
 //
-// 7 - WHAT'S NEXT?
+// 7 - HOME
+//  This last button takes you back to the initial overview screen.
+//
+// 8 - WHAT'S NEXT?
 //  Instead of the class activate the struct with the same name as before.
 //
 //------------------------------------------------------------------------------

bin/app/data/projects/tutorial/src/search_tutorial_5.h

@@ -6,7 +6,7 @@
 
 //------------------------------------------------------------------------------
 //
-// 8 - CONGRATULATONS
+// 9 - CONGRATULATONS
 //  You have completed the challenge of search.
 //  Oh, I almost forgot: You can only find nodes such as symbols via the search 
 //  bar. It doesn't allow you to find edges like calls or inheritance. At least

bin/app/data/projects/tutorial/tutorial.coatiproject

@@ -14,7 +14,7 @@
 			LET'S GET STARTED!\n
 			\tTo keep things simple just click the "main" symbol below to start the tour.\n
 			\n
-			[main](); // <- start here\n\n
+			[main\tint\r()](); // <- start here\n\n
 		</description>
 	</info>
 	<source>

bin/app/user/ApplicationSettings_for_package.xml

@@ -1,9 +1,14 @@
 <?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>
+	<application>
+		<indexer_thread_count>4</indexer_thread_count>
+		<window_base_width>500</window_base_width>
+		<window_base_height>500</window_base_height>
+	</application>
+	<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/user/ApplicationSettings_template.xml

@@ -7,8 +7,6 @@
 <!-- COLOR: int int int int - rgba e.g. 125 125 125 255 -->
 
 <config>
-	<startup_project><!-- STRING: path to project settings xml file --></startup_project>
-
 	<source>
 		<compiler_flags>
 			<compiler_flag><!-- STRING: compiler flag, including the dash e.g. -v --></compiler_flag>
@@ -28,6 +26,12 @@
 		<font_name><!-- STRING: font name --></font_name>
 		<font_size><!-- INTEGER: font size in pt --></font_size>
 		<color_scheme><!-- STRING: color scheme path --></color_scheme>
+		<font_size_max><!-- INTEGER: maximum font size in pt --></font_size_max>
+		<font_size_min><!-- INTEGER: minimum font size in pt --></font_size_min>
+		<font_size_std><!-- INTEGER: standard font size in pt --></font_size_std>
+		<indexer_thread_count><!-- INTEGER: number of threads indexing the source code --></indexer_thread_count>
+		<window_base_width><!-- INTEGER: initial width of an overlay window --></window_base_width>
+		<window_base_height><!-- INTEGER: initial height of an overlay window --></window_base_height>
 	</application>
 
 	<code>

bin/test/data/TestSettings_template.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- INTEGER: int e.g 123 -->
-<!-- DECIMAL: float e.g 123.456 -->
-<!-- STRING: string e.g hello -->
-<!-- COLOR: int int int int - rgba e.g. 125 125 125 255 -->
-
-<config>
-	<source>
-		<HeaderSearchPaths>
-			<HeaderSearchPath><!-- STRING: header search path for each path a HeaderSearchPaht element--></HeaderSearchPath>
-		</HeaderSearchPaths>
-	</source>
-</config>

bin/test/data/log/test_log.txt

@@ -1,22 +1,3 @@
-ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:1:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:1:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:1:11
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:1:13
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:7:15
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:5:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:48
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:7:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:3:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
 Token.cpp ERROR: Location Id was not referenced by this Token.
 Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class
 Edge.cpp ERROR: Nodes are not plain copies.
@@ -66,101 +47,11 @@ NetworkProtocolHelper.cpp ERROR: Failed to parse message, invalid type token
 NetworkProtocolHelper.cpp ERROR: Failed to parse setActiveToken message, invalid token count
 Settings.cpp WARNING: File for Settings not found: data/SettingsTestSuite/wrong_settings.xml
 Settings.cpp WARNING: File for Settings not found: data/SettingsTestSuite/wrong_settings.xml
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: typedef: type <file.cpp 1:1 1:1>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: class: Class <file.cpp 1:1 1:1>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: struct: Struct <file.cpp 1:1 1:1>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: global: Global <file.cpp 1:42 1:42>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: field: m_field <file.cpp 1:3 1:3>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: field: Struct::m_field <file.cpp 1:11 1:11>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: function: bool isTrue(char) <file.cpp 1:14 1:14>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: method: void isMethod(bool) <file.cpp 1:9 1:9>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: method: void Class::isMethod(bool) <file.cpp 1:1 1:1>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: namespace: utility <file.cpp 1:1 1:1>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: enum: Category <file.cpp 1:17 1:17>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: enum: Class::Category <file.cpp 1:1 1:1>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: enum constant: VALUE <file.cpp 1:1 1:1>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: class: ClassA <file.cpp 1:0 1:0>
- INFO: class: ClassB <file.cpp 1:0 1:0>
- INFO: inheritance: ClassB : ClassA <file.cpp 1:5 1:5>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: struct: StructA <file.cpp 1:0 1:0>
- INFO: struct: StructB <file.cpp 1:0 1:0>
- INFO: inheritance: StructB : StructA <file.cpp 1:5 1:5>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: method: void A::isMethod(bool) <file.cpp 1:9 1:9>
- INFO: method: void B::isMethod(bool) <file.cpp 1:7 1:7>
- INFO: override: void A::isMethod(bool) -> void B::isMethod(bool) <file.cpp 1:4 1:4>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: function: bool isTrue(char) <file.cpp 1:0 1:0>
- INFO: function: void func(bool) <file.cpp 1:0 1:0>
- INFO: call: bool isTrue(char) -> void func(bool) <file.cpp 1:9 1:9>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: global: global <file.cpp 1:0 1:0>
- INFO: function: bool isTrue(char) <file.cpp 1:0 1:0>
- INFO: call: global -> bool isTrue(char) <file.cpp 1:7 1:7>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: function: bool isTrue(char) <file.cpp 1:0 1:0>
- INFO: field: Foo::m_field <file.cpp 1:0 1:0>
- INFO: field usage: bool isTrue(char) -> Foo::m_field <file.cpp 1:7 1:7>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: function: bool isTrue(char) <file.cpp 1:0 1:0>
- INFO: global: global <file.cpp 1:0 1:0>
- INFO: global usage: bool isTrue(char) -> global <file.cpp 1:7 1:7>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: function: Struct isTrue(char) <file.cpp 1:0 1:0>
- INFO: struct: Struct <file.cpp 1:0 1:0>
- INFO: type usage: Struct isTrue(char) -> Struct <file.cpp 1:7 1:7>
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: file: file.h < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.h
- INFO: file: file.cpp < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.cpp
- INFO: file: file.h < 0:0 0:0>
-TextAccess.cpp ERROR: Could not open file file.h
- INFO: file: file.cpp < 0:0 0:0>
- INFO: include: file.h <file.cpp 1:7 1:7>
- INFO: file: file.cpp < 0:0 0:0>
- INFO: file: file.h < 0:0 0:0>
+TextAccess.cpp ERROR: Could not open file path/to/test.h
 TextAccess.cpp WARNING: Index 'firstLine' has to be lower or equal index 'lastLine', is 3 > 2
 TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
 TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
 TextAccess.cpp WARNING: Line numbers start with one, is 0
 TextAccess.cpp WARNING: Line numbers start with one, is 0
-TokenLocationCollection.cpp ERROR: Can't create TokenLocation with wrong boundaries.
-TokenLocationCollection.cpp ERROR: Can't create TokenLocation with wrong boundaries.
+TokenLocationCollection.cpp ERROR: TokenLocation has wrong boundaries: file.c 2:3 2:1
+TokenLocationCollection.cpp ERROR: TokenLocation has wrong boundaries: file.c 4:1 1:10

cmake/LinuxPackage.cmake

@@ -13,13 +13,31 @@
 	#-d ${CMAKE_SOURCE_DIR}/bin/app/data/projects/tutorial/tutorial.coatiproject)"
 #)
 
+function(InstallQtModule module qtversion componentName)
+	get_filename_component(realpath ${EXTERNAL_BUILD}/qt/lib/libQt5${module}.so.${qtversion} REALPATH)
+	INSTALL(FILES
+		${realpath}
+		DESTINATION lib
+		COMPONENT ${componentName}
+		RENAME libQt5${module}.so.${qtversion}
+	)
+endfunction(InstallQtModule)
+
+function(InstallQt qtversion componentName)
+	InstallQtModule(Gui ${qtversion} ${componentName})
+	InstallQtModule(Core ${qtversion} ${componentName})
+	InstallQtModule(Network ${qtversion} ${componentName})
+	InstallQtModule(XcbQpa ${qtversion} ${componentName})
+	InstallQtModule(Widgets ${qtversion} ${componentName})
+	InstallQtModule(DBus ${qtversion} ${componentName})
+endfunction(InstallQt)
+
 function(AddSharedToComponent componentName)
 	INSTALL(DIRECTORY
 		${CMAKE_SOURCE_DIR}/bin/app/data
 		DESTINATION .
 		COMPONENT ${componentName}
 		PATTERN "log/*" EXCLUDE
-		PATTERN "projects/ignored" EXCLUDE
 		PATTERN "data/src" EXCLUDE
 		PATTERN "data/gui/installer" EXCLUDE
 		PATTERN "data/install" EXCLUDE
@@ -41,30 +59,12 @@ function(AddSharedToComponent componentName)
 		DESTINATION .
 	)
 
-	INSTALL(FILES
-		#Qt libs
-		# FIXME need a better solution for that
-		${EXTERNAL_BUILD}/qt/lib/libQt5Gui.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Gui.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Gui.so.5.5.1
-		${EXTERNAL_BUILD}/qt/lib/libQt5Core.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Core.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Core.so.5.5.1
-		${EXTERNAL_BUILD}/qt/lib/libQt5Network.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Network.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Network.so.5.5.1
-		${EXTERNAL_BUILD}/qt/lib/libQt5XcbQpa.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5XcbQpa.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5XcbQpa.so.5.5.1
-		${EXTERNAL_BUILD}/qt/lib/libQt5Widgets.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Widgets.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Widgets.so.5.5.1
-		${EXTERNAL_BUILD}/qt/lib/libQt5DBus.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5DBus.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5DBus.so.5.5.1
+	InstallQt(5 ${componentName})
 
+	get_filename_component(realpath ${LIBSTDCPP} REALPATH)
+	INSTALL(FILES
 		#C++
-		${LIBSTDCPP}
+		${realpath}
 		DESTINATION lib
 		COMPONENT ${componentName}
 	)
@@ -75,12 +75,6 @@ function(AddSharedToComponent componentName)
 		COMPONENT ${componentName}
 	)
 
-	INSTALL(DIRECTORY
-		${CMAKE_SOURCE_DIR}/bin/app/data/projects
-		DESTINATION user
-		COMPONENT ${componentName}
-	)
-
 	INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/user
 		DESTINATION .
 		COMPONENT ${componentName}
@@ -88,7 +82,13 @@ function(AddSharedToComponent componentName)
 		PATTERN "ApplicationSettings_for_package.xml" EXCLUDE
 		PATTERN "ProjectSettings_template.xml" EXCLUDE
 		PATTERN "ApplicationSettings_template.xml" EXCLUDE
-		PATTERN "window_settings.ini_for_package" EXCLUDE
+		PATTERN "window_settings_for_package.ini" EXCLUDE
+	)
+
+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/user/window_settings_for_package.ini
+		DESTINATION user
+		COMPONENT ${componentName}
+		RENAME window_settings.ini
 	)
 endfunction(AddSharedToComponent)
 
@@ -98,51 +98,86 @@ execute_process(
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 # Add shared files to full and trial version
-AddSharedToComponent(FULLVERSION)
-AddSharedToComponent(TRIALVERSION)
+AddSharedToComponent(FULL)
+AddSharedToComponent(TRIAL)
 
 INSTALL(DIRECTORY
 	${CMAKE_SOURCE_DIR}/ide_plugins/sublime_text
-    DESTINATION plugin
-	COMPONENT FULLVERSION
+	DESTINATION plugin
+	COMPONENT FULL
+)
+
+INSTALL(DIRECTORY
+	${CMAKE_SOURCE_DIR}/ide_plugins/vim
+	DESTINATION plugin
+	COMPONENT FULL
+)
+
+INSTALL(DIRECTORY
+		${CMAKE_SOURCE_DIR}/bin/app/data/projects
+		DESTINATION user
+		COMPONENT FULL
+		PATTERN "*.coatidb" EXCLUDE
+)
+
+INSTALL(DIRECTORY
+		${CMAKE_SOURCE_DIR}/bin/app/data/projects
+		DESTINATION user
+		COMPONENT TRIAL
 )
 
 INSTALL(FILES
-    ${CMAKE_SOURCE_DIR}/setup/Linux/coati.desktop
-    ${CMAKE_SOURCE_DIR}/setup/Linux/application-x-coati.xml
-    DESTINATION setup
-	COMPONENT FULLVERSION
-)
-
+	${CMAKE_SOURCE_DIR}/setup/Linux/coati.desktop
+	${CMAKE_SOURCE_DIR}/setup/Linux/coati-mime.xml
+	DESTINATION setup
+	COMPONENT FULL
+	)
 INSTALL(PROGRAMS
 	${CMAKE_SOURCE_DIR}/setup/Linux/install.sh
 	${CMAKE_SOURCE_DIR}/setup/Linux/deinstall.sh
 	${CMAKE_SOURCE_DIR}/setup/Linux/removeConfigs.sh
-	${CMAKE_SOURCE_DIR}/setup/Linux/Coati_trial.sh
-    DESTINATION .
-	COMPONENT TRIALVERSION
-)
+	DESTINATION setup
+	COMPONENT FULL
+	)
 
 INSTALL(PROGRAMS
-    ${CMAKE_SOURCE_DIR}/setup/Linux/Coati.sh
-    DESTINATION .
-	COMPONENT FULLVERSION
+	${CMAKE_SOURCE_DIR}/setup/Linux/Coati_trial.sh
+	DESTINATION .
+	COMPONENT TRIAL
+	)
+
+INSTALL(PROGRAMS
+	${CMAKE_SOURCE_DIR}/setup/Linux/Coati.sh
+	DESTINATION .
+	COMPONENT FULL
 )
 
 INSTALL(PROGRAMS
 	${CMAKE_SOURCE_DIR}/bin/app/Release/Coati_upx
 	DESTINATION .
-	COMPONENT FULLVERSION
+	COMPONENT FULL
 	RENAME Coati
 )
 
 INSTALL(PROGRAMS
 	${CMAKE_SOURCE_DIR}/bin/app/Release/Coati_trial_upx
 	DESTINATION .
-	COMPONENT TRIALVERSION
+	COMPONENT TRIAL
 	RENAME Coati_trial
 )
 
+#INSTALL(TARGETS
+	#${APP_PROJECT_NAME}
+	#DESTINATION .
+	#COMPONENT FULL
+#)
+
+#INSTALL(TARGETS
+	#${TRIAL_PROJECT_NAME}
+	#DESTINATION .
+	#COMPONENT TRIAL
+#)
+
 # SET(CPACK_GENERATOR "DEB;TGZ")
 SET(CPACK_GENERATOR "TGZ")
 SET(CPACK_ARCHIVE_COMPONENT_INSTALL "ON")
@@ -150,17 +185,28 @@ SET(CPACK_ARCHIVE_COMPONENT_INSTALL "ON")
 string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GIT_VERSION_NUMBER}")
 string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GIT_VERSION_NUMBER}")
 string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GIT_VERSION_NUMBER}")
-set(VERSION_NUMBER "${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}")
+if(${GIT_VERSION_NUMBER} STREQUAL ${VERSION_PATCH})
+	SET(VERSIONA_PATCH 0)
+endif()
+string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+-([0-9]+).*" "\\1" VERSION_COMMIT "${GIT_VERSION_NUMBER}")
+if(${GIT_VERSION_NUMBER} STREQUAL ${VERSION_COMMIT})
+	set(VERSION_NUMBER "${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}")
+else()
+	set(VERSION_NUMBER "${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}_${VERSION_COMMIT}")
+endif()
 
 SET(CPACK_PACKAGE_NAME "Coati")
 SET(CPACK_PACKAGING_INSTALL_PREFIX "")
+SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
 SET(CPACK_PACKAGING_INSTALL_DIRECTORY "Coati")
 SET(CPACK_PACKAGE_VERSION ${VERSION_NUMBER})
 SET(CPACK_PACKAGE_VENDOR "Coati Software")
 SET(CPACK_INSTALL_SCRIPT "${CMAKE_SOURCE_DIR}/cmake/pre_install_linux.cmake")
 SET(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}")
+SET(CPACK_PACKAGE_FILE_NAME "Coati_${VERSION_NUMBER}_${CPACK_SYSTEM_NAME}")
 #SET(CPACK_PACKAGE_EXECUTABLES "Coati")
 SET(CPACK_STRIP_FILES "coati/Coati")
 SET(CPACK_PACKAGE_CONTACT "astallinger@coati.io")
 
 INCLUDE(CPack)
+

cmake/add_files.cmake

@@ -11,19 +11,19 @@
 #		)
 #
 macro(add_files var_name)
-    file (RELATIVE_PATH _relPath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+	file (RELATIVE_PATH _relPath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
 
-    foreach (_src ${ARGN})
-        if (_relPath)
-            list (APPEND ${var_name} "${_relPath}/${_src}")
-        else()
-            list (APPEND ${var_name} "${_src}")
-        endif()
-    endforeach()
+	foreach (_src ${ARGN})
+		if (_relPath)
+			list (APPEND ${var_name} "${_relPath}/${_src}")
+		else()
+			list (APPEND ${var_name} "${_src}")
+		endif()
+	endforeach()
 
-    if (_relPath)
-        set(${var_name} ${${var_name}} PARENT_SCOPE)
-    else()
-        set(${var_name} ${${var_name}})
-    endif()
+	if (_relPath)
+		set(${var_name} ${${var_name}} PARENT_SCOPE)
+	else()
+		set(${var_name} ${${var_name}})
+	endif()
 endmacro()

cmake/external.cmake

@@ -2,12 +2,16 @@
 find_package(PythonInterp REQUIRED)
 
 execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/script/getSystemString.py"
-    OUTPUT_VARIABLE SYSSTRING
-    OUTPUT_STRIP_TRAILING_WHITESPACE
+	COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/script/getSystemString.py"
+	OUTPUT_VARIABLE SYSSTRING
+	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
 set(EXTERNAL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../Coati_External")
 set(EXTERNAL_SRC "${EXTERNAL_ROOT}/src")
-set(EXTERNAL_BUILD "${EXTERNAL_ROOT}/${SYSSTRING}/${CMAKE_BUILD_TYPE}")
+if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+	set(EXTERNAL_BUILD "${EXTERNAL_ROOT}/${SYSSTRING}/Debug")
+else()
+	set(EXTERNAL_BUILD "${EXTERNAL_ROOT}/${SYSSTRING}/Release")
+endif()
 

cmake/pre_install_linux.cmake

@@ -1,11 +1,34 @@
 
 # upx
+set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release)
+
+message(STATUS "upx the app")
 execute_process(
-	COMMAND upx --brute ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati -o ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati_upx
+	COMMAND rm ${upxPath}/Coati_upx
+	COMMAND upx --brute ${upxPath}/Coati -o ${upxPath}/Coati_upx
+)
+
+message(STATUS "upx the trial")
+execute_process(
+	COMMAND rm ${upxPath}/Coati_trial_upx
+	COMMAND upx --brute ${upxPath}/Coati_trial -o ${upxPath}/Coati_trial_upx
 )
 
 execute_process(
-	COMMAND upx --brute ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati_trial -o
-	${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati_trial_upx
+	COMMAND ${upxPath}/Coati -z /home/vagrant/dev/license.txt
 )
 
+execute_process(
+	COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/tictactoe/tictactoe.coatiproject
+)
+
+execute_process(
+	COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/tutorial/tutorial.coatiproject
+)
+
+#add_custom_command(
+	#OUTPUT Coati_upx
+	#COMMAND upx --brute ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati -o ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati_upx
+
+	#)
+