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

.gitignore

@@ -40,6 +40,7 @@
 .clang_complete
 .ycm_extra_conf.py
 .ycm_extra_conf.pyc
+coati.coatiproject
 compile_commands.json
 Makefile
 /__pycache__/

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,8 +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")
 
 # Variables --------------------------------------------------------------------
 
@@ -36,16 +29,13 @@ 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)
@@ -56,6 +46,18 @@ if(UNIX AND NOT APPLE)
 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 ------------------------------------------------------------------------
 
@@ -123,85 +125,6 @@ else()
 	set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}")
 endif()
 
-# 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)
-
-set_source_files_properties(${EXTERNAL_FILES} PROPERTIES COMPILE_FLAGS "-w")
-set_source_files_properties(${EXTERNAL_C_FILES} PROPERTIES COMPILE_FLAGS "-std=gnu89 -w")
-
-add_library(${LIB_PROJECT_NAME} ${LIB_FILES} ${EXTERNAL_FILES} ${EXTERNAL_C_FILES})
-
-create_source_groups(${LIB_FILES})
-create_source_groups(${EXTERNAL_FILES})
-create_source_groups(${EXTERNAL_C_FILES})
-
-set_target_properties(
-	${LIB_PROJECT_NAME}
-	PROPERTIES
-		DEBUG_OUTPUT_NAME ${PROJECT_NAME}_d
-		RELEASE_OUTPUT_NAME ${PROJECT_NAME}
-)
-
-set_property(
-	TARGET ${LIB_PROJECT_NAME}
-	PROPERTY INCLUDE_DIRECTORIES
-		"${CMAKE_SOURCE_DIR}/src/lib"
-)
-
-target_include_directories(${LIB_PROJECT_NAME} SYSTEM
-	PUBLIC ${LLVM_INCLUDE_DIRS}
-	${CLANG_INCLUDE_DIRS}
-	${Boost_INCLUDE_DIRS}
-	${EIGEN_ROOT}
-	"${CMAKE_SOURCE_DIR}/src/external"
-)
-
-target_link_libraries(${LIB_PROJECT_NAME} ${Boost_LIBRARIES})
-
-# 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)
-
-set_source_files_properties(${CLANG_FILES} PROPERTIES COMPILE_FLAGS "-fno-rtti")
-
-add_library(${LIB_PARSER_PROJECT_NAME} ${CLANG_FILES})
-
-create_source_groups(${CLANG_FILES})
-
-set_property(
-		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}
-	${Boost_INCLUDE_DIRS}
-)
-
-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)
@@ -246,6 +169,86 @@ else()
 	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)
+
+add_subdirectory(src/lib)
+add_subdirectory(src/external)
+
+set_source_files_properties(${EXTERNAL_FILES} PROPERTIES COMPILE_FLAGS "-w")
+set_source_files_properties(${EXTERNAL_C_FILES} PROPERTIES COMPILE_FLAGS "-std=gnu89 -w")
+
+add_library(${LIB_PROJECT_NAME} ${LIB_FILES} ${EXTERNAL_FILES} ${EXTERNAL_C_FILES})
+
+create_source_groups(${LIB_FILES})
+create_source_groups(${EXTERNAL_FILES})
+create_source_groups(${EXTERNAL_C_FILES})
+
+set_target_properties(
+	${LIB_PROJECT_NAME}
+	PROPERTIES
+		DEBUG_OUTPUT_NAME ${PROJECT_NAME}_d
+		RELEASE_OUTPUT_NAME ${PROJECT_NAME}
+)
+
+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
+	PUBLIC ${LLVM_INCLUDE_DIRS}
+	${CLANG_INCLUDE_DIRS}
+	${Boost_INCLUDE_DIRS}
+	${EIGEN_ROOT}
+	"${CMAKE_SOURCE_DIR}/src/external"
+)
+
+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)
+
+add_subdirectory(src/lib_parser)
+
+set_source_files_properties(${CLANG_FILES} PROPERTIES COMPILE_FLAGS "-fno-rtti")
+
+add_library(${LIB_PARSER_PROJECT_NAME} ${CLANG_FILES})
+
+create_source_groups(${CLANG_FILES})
+
+set_property(
+	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}
+	${Boost_INCLUDE_DIRS}
+)
+
+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} ${REQ_LLVM_LIBS})
+
 # Lib Gui ----------------------------------------------------------------------
 
 #set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
@@ -311,6 +314,7 @@ 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(
@@ -368,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")
@@ -378,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})
@@ -394,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"
 )
 
@@ -460,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
@@ -618,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,130 +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
 
-* 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
+* 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.5.0.4
+#### 0.6.0.0
+released 2016-04-27
 
-* Added option to hide widget window title bars to View menu
-* Added C support
-* Added shortcuts for font size resetting to View menu
-* Fixed number postions in graph
-* Improved performance of token name saving
-* Added commandline option for project file
-* Fixed cursor changing for resize and text interactions
-* Added C and C++ standard setting to project
-* Refresh project editing settings
-* Added license key window and license checker
-* Added trial target without analysis
-* Added web documentation
-* Improved code view annotation painting performance
-* Update error count while analysis
-* Improved back & forward in code view
-* Return to last scroll position when going back in code view
-* Added .coatiproject file associations with icon for Mac and Windows
-* Display scope name at bottom of code snippet
-* Improved graph view node bundeling to bundle more
-* Improved log file names to be sorted chronologically
-* Added application move protection to reenter license key
-* Show overview on project open with node bundles per type
-* Added overview and error keywords to search view
-* Added project setup wizard for step-by-step project setup
-* Added Visual Studio solution parsing via project wizard or VS plugin
-* Improved style of ui windows
-* Save user data in ~/Library/Application Support/Coati on Mac
-* Improved analysis performance to take only 66% of the time
-* Improved logging to alternate between 2 files of 1000 lines to decrease logfile sizes
-* Improved painting of icons in graph to be smoother
-* Added link to documentation to Help menu
-* Fixed preferences not saved
+* 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
+#### 0.5.1.21
+released 2016-03-16
 
-* Added project setup for Compilation Databases
-* Improved analysis performance for large projects (10x as fast for 1.000.000 LoC)
-* Improved project load and code view performance
-* Added graph panning with WASD
-* Added graph zooming with Shift + mouse wheel or Shift + WS
-* Added file extension UI to advanced settings in project setup summary
-* Added compiler flags UI to advanced settings in project setup summary
-* Show fatal errors in UI that stopped analysis
-* Fixed linux package creating ~/.config if not there
-* Fixed project setup window sizes to adapt to content size
-* Fixed project paths are now saved relative if defined relative
-* Fixed crash when opening newer project with older version of Coati
-* Removed high traffic log messages
-* Show loader animation when loading project
-* Fixed expanding file with errors showed all locations in red
-* Fixed children on namespace activation were bundled
-* Fixed interrupting of analysis to show message in status bar
-* Disabled config file warnings
-* Added delay for changing fontsize via mouse wheel
-* Fixed Visual Studio plugin project loading
-* Improved context detection for template parameters
-* Fixed type references in headers saved multiple times
-* Prevent network message handling without valid license
-* Added font size limits
-* Center windows on top of main window
-* Fixed crash when accessing files without read permission
 * 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
+
+* 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>
 
@@ -93,12 +121,13 @@
 						<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>
 				</token>
 				<local_symbol>
@@ -107,12 +136,14 @@
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#FF9C3C</border>
-						<fill>transparent</fill>
+						<border>#9BDAFF</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
 					</focus>
 					<active>
-						<border>#FF9C3C</border>
-						<fill>#695540</fill>
+						<border>transparent</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
 					</active>
 				</local_symbol>
 				<scope>
@@ -120,29 +151,23 @@
 						<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>
@@ -257,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>
 
@@ -93,12 +121,13 @@
 						<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>
 				</token>
 				<local_symbol>
@@ -107,12 +136,12 @@
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#FF9C3C</border>
-						<fill>transparent</fill>
+						<border>#AAE0FF</border>
+						<fill>#C6EAFF</fill>
 					</focus>
 					<active>
-						<border>#FF9C3C</border>
-						<fill>#FFDFC0</fill>
+						<border>transparent</border>
+						<fill>#C6EAFF</fill>
 					</active>
 				</local_symbol>
 				<scope>
@@ -120,29 +149,23 @@
 						<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>

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>
 
@@ -93,12 +140,13 @@
 						<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>
 				</token>
 				<local_symbol>
@@ -107,12 +155,14 @@
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#FF9C3C</border>
-						<fill>transparent</fill>
+						<border>#A0A0A0</border>
+						<fill>#969696</fill>
+						<text>#191919</text>
 					</focus>
 					<active>
-						<border>#FF9C3C</border>
-						<fill>#695540</fill>
+						<border>transparent</border>
+						<fill>#969696</fill>
+						<text>#272728</text>
 					</active>
 				</local_symbol>
 				<scope>
@@ -120,29 +170,23 @@
 						<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>

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/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/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/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;
 }
 
@@ -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{E6343DF1-6651-4487-BACE-59068B169BA0}
+%windir%\system32\msiexec.exe /I{E6E16577-C547-4A66-8202-AB30A02DDBC2}

bin/app/data/install/uninstall_trail.bat

@@ -1 +1 @@
-%windir%\system32\msiexec.exe /I{99D5E031-E895-47B2-B108-AD026571FD29}
+%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/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/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>
@@ -31,6 +29,9 @@
 		<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

@@ -53,5 +53,5 @@ 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

@@ -38,7 +38,6 @@ function(AddSharedToComponent componentName)
 		DESTINATION .
 		COMPONENT ${componentName}
 		PATTERN "log/*" EXCLUDE
-		PATTERN "projects/ignored" EXCLUDE
 		PATTERN "data/src" EXCLUDE
 		PATTERN "data/gui/installer" EXCLUDE
 		PATTERN "data/install" EXCLUDE
@@ -83,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)
 
@@ -102,6 +107,12 @@ INSTALL(DIRECTORY
 	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
@@ -141,32 +152,32 @@ INSTALL(PROGRAMS
 	COMPONENT FULL
 )
 
-#INSTALL(PROGRAMS
-	#${CMAKE_SOURCE_DIR}/bin/app/Release/Coati_upx
-	#DESTINATION .
-	#COMPONENT FULL
-	#RENAME Coati
-#)
-
-#INSTALL(PROGRAMS
-	#${CMAKE_SOURCE_DIR}/bin/app/Release/Coati_trial_upx
-	#DESTINATION .
-	#COMPONENT TRIAL
-	#RENAME Coati_trial
-#)
-
-INSTALL(TARGETS
-	${APP_PROJECT_NAME}
+INSTALL(PROGRAMS
+	${CMAKE_SOURCE_DIR}/bin/app/Release/Coati_upx
 	DESTINATION .
 	COMPONENT FULL
+	RENAME Coati
 )
 
-INSTALL(TARGETS
-	${TRIAL_PROJECT_NAME}
+INSTALL(PROGRAMS
+	${CMAKE_SOURCE_DIR}/bin/app/Release/Coati_trial_upx
 	DESTINATION .
 	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")
@@ -186,6 +197,7 @@ 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")

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,16 +1,22 @@
 
 # upx
 set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release)
+
 message(STATUS "upx the app")
 execute_process(
+	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 ${upxPath}/Coati -z /home/vagrant/dev/license.txt
+)
 
 execute_process(
 	COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/tictactoe/tictactoe.coatiproject

cmake/publicKey.cmake

@@ -4,6 +4,8 @@
 string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GIT_VERSION_NUMBER}")
 message(STATUS "Get Public Key for Coati version: ${VERSION_MAJOR}")
 
+message(STATUS "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-${VERSION_MAJOR}.pem")
+
 set(pubKeyFile "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-${VERSION_MAJOR}.pem")
 # message(STATUS "file: ${pubKeyFile}")
 
@@ -13,10 +15,10 @@ if(EXISTS ${pubKeyFile})
     STRING(REGEX REPLACE "\n" "\\\\n\"\n\t\"" KEY "${KEY}")
     # message(STATUS "key: ${KEY}")
 else()
-    message(WARNING "public keyfile for this version of Coati")
+    message(WARNING "public keyfile for this version of Coati not found")
 endif()
 
 configure_file(
   ${CMAKE_SOURCE_DIR}/cmake/PublicKey.h.in
-  ${CMAKE_SOURCE_DIR}/build/src/lib_gui/PublicKey.h
+  ${CMAKE_SOURCE_DIR}/build/src/lib_license/PublicKey.h
 )

deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj

@@ -57,6 +57,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_05E98FFFDCC84318ABFF997524A43891"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_0716215F49A34B19996FA5567EF50B41"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -69,6 +75,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_0D141FC6540C4E97B58C2BFF93CD62CF"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_0EE1E4EA6AA24123A12B7D29D9EAD5BD"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -99,6 +111,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_19CAF24FB7714BB0B5D219C2BA924900"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_1B21108076D9489FA204E5E435EAFA3F"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -207,6 +225,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_3BD623E20A62465F998A51358F807592"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_3FCDDB859BC247E0B2634CBD56E2B763"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -273,6 +297,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_52A9DE01553E44C09BD0BC4950BADD47"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_53B2F3E0711045C8929B4A3295B0E07D"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -297,6 +327,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_585F390EA94F4BFEA1084BAF08DF6ACB"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_58F7BC06461A4DC4B01E40246E9530DB"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -405,6 +441,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_78A5687D78184135A40B0308F3F74A9D"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_7ADDFE3D63114B7291316FA427083130"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -435,6 +477,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_83415CA3597C429294702315CE817597"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_8444C11B7FD0443AA8C4DFD77B898609"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -453,12 +501,24 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_8C02107F94A64029901B8B190E8C6BAC"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_8E2479A7DD6C48F88B7BCC1567A53892"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
+        "MsmKey" = "8:_90A581E7652446DB986CA107BB560979"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_917E92B16F744E96A4AFCA4E8AC2C517"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -555,6 +615,18 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_BA64DEB4819D4F0D814181BB691C027C"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BE573665444F42B49D4F02ED085298A3"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_BF1E9D828D734A568A847279AC8E6B23"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -615,6 +687,18 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_CCE8D35BB612455A9C316DA2252B1FF0"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CD77DA0B0E314841A0A3EEBF7D13127D"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_CEC5B9A68AC84CBCAE248C80FE14B372"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -699,6 +783,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_E51F5768E82548D7A576C18DB86F8562"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_E539A71312074D97840395B5F845AC87"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -765,6 +855,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_FE66B1FCDD414D61829510D189BE238C"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_3460FAB707F8431E87168499A7F51556"
         "MsmSig" = "8:_UNDEFINED"
@@ -819,16 +915,6 @@
                     "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)"
                     "ProductCode" = "8:.NETFramework,Version=v4.5"
                     }
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x64"
-                    {
-                    "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)"
-                    "ProductCode" = "8:Microsoft.Visual.C++.14.0.x64"
-                    }
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86"
-                    {
-                    "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)"
-                    "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86"
-                    }
                 }
             }
         }
@@ -861,16 +947,6 @@
                     "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)"
                     "ProductCode" = "8:.NETFramework,Version=v4.5"
                     }
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x64"
-                    {
-                    "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)"
-                    "ProductCode" = "8:Microsoft.Visual.C++.14.0.x64"
-                    }
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86"
-                    {
-                    "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)"
-                    "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86"
-                    }
                 }
             }
         }
@@ -938,7 +1014,7 @@
             "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_3BBF42F2D0554015BCF7349671B9EFFD"
             {
             "Name" = "8:Primary output from SetupCreateStartMenuShortcutLib (Active)"
-            "Condition" = "8:"
+            "Condition" = "8:CHECKBOXA2=1"
             "Object" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
             "FileType" = "3:1"
             "InstallAction" = "3:2"
@@ -1061,6 +1137,20 @@
             "InstallerClass" = "11:TRUE"
             "CustomActionData" = "8:"
             }
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_E205CE8B062C43868BDE25A72E0C223B"
+            {
+            "Name" = "8:Primary output from SetupRemoveCacheFiles (Active)"
+            "Condition" = "8:"
+            "Object" = "8:_FB29EAD658C3497D9AC46ADE92D33C83"
+            "FileType" = "3:1"
+            "InstallAction" = "3:1"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:4"
+            "Identifier" = "8:_FD51D5E1_5220_457B_A52C_BA4D30C739D9"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:"
+            }
             "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_EA511606B8E840088DBD733FF462117D"
             {
             "Name" = "8:Primary output from SetupRemoveCacheFiles (Active)"
@@ -1075,6 +1165,20 @@
             "InstallerClass" = "11:TRUE"
             "CustomActionData" = "8:"
             }
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_F154A16DF6B54CBC903712C72B4AC39F"
+            {
+            "Name" = "8:Primary output from SetupRemoveCacheFiles (Active)"
+            "Condition" = "8:"
+            "Object" = "8:_FB29EAD658C3497D9AC46ADE92D33C83"
+            "FileType" = "3:1"
+            "InstallAction" = "3:2"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:4"
+            "Identifier" = "8:_6604FE3C_63D0_4375_B8AA_B542EF55F7E7"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:"
+            }
         }
         "DefaultFeature"
         {
@@ -1238,6 +1342,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_05E98FFFDCC84318ABFF997524A43891"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-time-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-time-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0716215F49A34B19996FA5567EF50B41"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\graph_view\\images\\private.png"
@@ -1378,6 +1502,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_19CAF24FB7714BB0B5D219C2BA924900"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\search_view\\images\\home.png"
+            "TargetName" = "8:home.png"
+            "Tag" = "8:"
+            "Folder" = "8:_5D5E082821B345FB90DEA01C1FCC7A41"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1B21108076D9489FA204E5E435EAFA3F"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\window\\refresh.png"
@@ -1718,6 +1862,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3BD623E20A62465F998A51358F807592"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-runtime-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-runtime-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3FCDDB859BC247E0B2634CBD56E2B763"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\projects\\tictactoe\\src\\artificial_player.h"
@@ -1938,6 +2102,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52A9DE01553E44C09BD0BC4950BADD47"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\code_view\\images\\edit.png"
+            "TargetName" = "8:edit.png"
+            "Tag" = "8:"
+            "Folder" = "8:_EDDCF6CA437340DEAF2C0FFC4BD45E97"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_53B2F3E0711045C8929B4A3295B0E07D"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\icon\\project.ico"
@@ -2018,6 +2202,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_585F390EA94F4BFEA1084BAF08DF6ACB"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-filesystem-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-filesystem-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_58F7BC06461A4DC4B01E40246E9530DB"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\projects\\tutorial\\src\\graph_tutorial_2.h"
@@ -2378,6 +2582,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_78A5687D78184135A40B0308F3F74A9D"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-environment-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-environment-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7ADDFE3D63114B7291316FA427083130"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\window\\listbox.css"
@@ -2478,6 +2702,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_83415CA3597C429294702315CE817597"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-heap-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-heap-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8444C11B7FD0443AA8C4DFD77B898609"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\window\\dots_hover.png"
@@ -2538,6 +2782,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8C02107F94A64029901B8B190E8C6BAC"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\window\\size_grip.png"
+            "TargetName" = "8:size_grip.png"
+            "Tag" = "8:"
+            "Folder" = "8:_56A98FDB83CE48C489B793615E24C057"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8E2479A7DD6C48F88B7BCC1567A53892"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\projects\\tutorial\\src\\code_tutorial_2.h"
@@ -2558,6 +2822,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_90A581E7652446DB986CA107BB560979"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-math-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-math-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_917E92B16F744E96A4AFCA4E8AC2C517"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\code_view\\images\\maximize_active.png"
@@ -2878,6 +3162,46 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BA64DEB4819D4F0D814181BB691C027C"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-utility-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-utility-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BE573665444F42B49D4F02ED085298A3"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-locale-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-locale-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BF1E9D828D734A568A847279AC8E6B23"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\projects\\tutorial\\src\\code_tutorial_1.h"
@@ -3058,6 +3382,46 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CCE8D35BB612455A9C316DA2252B1FF0"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-stdio-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-stdio-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CD77DA0B0E314841A0A3EEBF7D13127D"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\projects\\tutorial\\src\\my_next_step.h"
+            "TargetName" = "8:my_next_step.h"
+            "Tag" = "8:"
+            "Folder" = "8:_A38746A96F3F43108F3B9C1A88E43FD0"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CEC5B9A68AC84CBCAE248C80FE14B372"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\undoredo_view\\images\\arrow_left.png"
@@ -3338,6 +3702,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E51F5768E82548D7A576C18DB86F8562"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-string-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-string-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E539A71312074D97840395B5F845AC87"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\code_view\\images\\pattern.png"
@@ -3518,6 +3902,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FE66B1FCDD414D61829510D189BE238C"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-convert-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-convert-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
         }
         "FileType"
         {
@@ -3906,15 +4310,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Coati"
-        "ProductCode" = "8:{E6343DF1-6651-4487-BACE-59068B169BA0}"
-        "PackageCode" = "8:{B8A47176-2277-4FF3-A8A8-50A77366DB07}"
+        "ProductCode" = "8:{E6E16577-C547-4A66-8202-AB30A02DDBC2}"
+        "PackageCode" = "8:{55D5307B-C6AB-4E1D-A512-239F7E164FCD}"
         "UpgradeCode" = "8:{CFF09D53-87AF-4241-960D-98C21ED9D358}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:0.5.0004"
+        "ProductVersion" = "8:0.7.0022"
         "Manufacturer" = "8:Coati Software"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:www.coati.io/support"
@@ -4305,7 +4709,7 @@
                             "ContextData" = "8:1;True=1;False=0"
                             "Attributes" = "3:0"
                             "Setting" = "3:0"
-                            "Value" = "3:0"
+                            "Value" = "3:1"
                             "DefaultValue" = "3:1"
                             "UsePlugInResources" = "11:TRUE"
                             }
@@ -4856,12 +5260,26 @@
         }
         "MergeModule"
         {
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_0D141FC6540C4E97B58C2BFF93CD62CF"
+            {
+            "UseDynamicProperties" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge Modules\\Microsoft_VC140_CRT_x86.msm"
+                "Properties"
+                {
+                }
+            "LanguageId" = "3:0"
+            "Exclude" = "11:FALSE"
+            "Folder" = "8:"
+            "Feature" = "8:"
+            "IsolateTo" = "8:"
+            }
         }
         "ProjectOutput"
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3460FAB707F8431E87168499A7F51556"
             {
-            "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Release\\SetupApplicationSettingsLib.dll"
+            "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Debug\\SetupApplicationSettingsLib.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"
@@ -4889,7 +5307,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
             {
-            "SourcePath" = "8:..\\SetupCreateStartMenuShortcutLib\\obj\\Release\\SetupCreateStartMenuShortcutLib.dll"
+            "SourcePath" = "8:..\\SetupCreateStartMenuShortcutLib\\obj\\Debug\\SetupCreateStartMenuShortcutLib.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"
@@ -4917,7 +5335,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F81B906E39E44A5DAC37B3D70BC8A8CE"
             {
-            "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Release\\SetupCreateDesktopShortcutLib.dll"
+            "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Debug\\SetupCreateDesktopShortcutLib.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"
@@ -4945,7 +5363,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FB29EAD658C3497D9AC46ADE92D33C83"
             {
-            "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Release\\SetupRemoveCacheFiles.dll"
+            "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Debug\\SetupRemoveCacheFiles.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"

deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj

@@ -75,6 +75,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_0FB4451715D047189E40DDDBBF1AC9B6"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_145FB67AF1774D029CD2047D9D3B3F26"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -129,6 +135,18 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_29A62614B88E4B2A95FE66E9955C2A3D"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2A5A42294FC940B98B786C6CB3B32ED4"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_2DA06C4E301647A58D13904DAE5A1010"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -195,6 +213,18 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_4171C92F0B4A42D8A3F28B65510CC090"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_41D7E42E67AA4615BEC19409547F70A2"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_4400372852214CC588823F7A1A9F5F5D"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -243,6 +273,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_558913303CB64445B9D182707BF7F4C0"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_55993726A36649E5A7357B132039C206"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -315,6 +351,24 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_6D88AADBCCFC4136A684D8D001001F8B"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_6ED826F7D1F14633B1A22B7AA28DE1F0"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_71BA266FA3B14FEC857F7FC8BA10C08B"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_72682FB1EB5042B8BA59A2EB76A9F847"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -345,6 +399,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_763A8819E84543E6BB4A90AC640E8018"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_769A9804482F45D7A708E444AAEE9DE3"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -429,6 +489,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_916B59949F5C458DB6C2E8D1BE5B369A"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_927AA2450359400398EC6015571C4680"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -489,6 +555,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_A65099A63E6941CCA76E63A99B7E24A1"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_A66E166B06CE4949B037BA2DDEAA3152"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -573,6 +645,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_C46E79A56942414695D2FE4E9635796B"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_C7DCC9D78B694068956DADD44C79E64B"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -663,6 +741,18 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_D8C8080ABBEC45C997AF9648209FE3BB"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_DB845CEA6CC94997884C3644A1B44717"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_DBCBA153A5EF4B869CF8A9003DFB5C35"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -723,6 +813,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_E95B1DE8FF5A4768841FCC0985DAEAAE"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_EA117E55109E4929AD27B2D3FDF6AE2A"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -784,7 +880,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
+        "OwnerKey" = "8:_FB29EAD658C3497D9AC46ADE92D33C83"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -796,7 +892,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_FB29EAD658C3497D9AC46ADE92D33C83"
+        "OwnerKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -831,16 +927,6 @@
                     "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)"
                     "ProductCode" = "8:.NETFramework,Version=v4.5"
                     }
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x64"
-                    {
-                    "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)"
-                    "ProductCode" = "8:Microsoft.Visual.C++.14.0.x64"
-                    }
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86"
-                    {
-                    "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)"
-                    "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86"
-                    }
                 }
             }
         }
@@ -873,16 +959,6 @@
                     "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)"
                     "ProductCode" = "8:.NETFramework,Version=v4.5"
                     }
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x64"
-                    {
-                    "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)"
-                    "ProductCode" = "8:Microsoft.Visual.C++.14.0.x64"
-                    }
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86"
-                    {
-                    "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)"
-                    "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86"
-                    }
                 }
             }
         }
@@ -950,7 +1026,7 @@
             "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_3BBF42F2D0554015BCF7349671B9EFFD"
             {
             "Name" = "8:Primary output from SetupCreateStartMenuShortcutLib (Active)"
-            "Condition" = "8:"
+            "Condition" = "8:CHECKBOXA2=1"
             "Object" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
             "FileType" = "3:1"
             "InstallAction" = "3:2"
@@ -1017,6 +1093,20 @@
             "InstallerClass" = "11:TRUE"
             "CustomActionData" = "8:"
             }
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_7D15ADF3B4AD4AA4931FF2E1856055F3"
+            {
+            "Name" = "8:Primary output from SetupRemoveCacheFiles (Active)"
+            "Condition" = "8:"
+            "Object" = "8:_FB29EAD658C3497D9AC46ADE92D33C83"
+            "FileType" = "3:1"
+            "InstallAction" = "3:1"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:4"
+            "Identifier" = "8:_0C236A7F_F717_4461_861E_85327DF9014E"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:"
+            }
             "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_B1A592F73CCB404297211C5D3D86AB5F"
             {
             "Name" = "8:Primary output from SetupApplicationSettingsLib (Active)"
@@ -1073,6 +1163,20 @@
             "InstallerClass" = "11:TRUE"
             "CustomActionData" = "8:"
             }
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_E2A07A15A0E64CDDB5DC9AFC2B45D5DA"
+            {
+            "Name" = "8:Primary output from SetupRemoveCacheFiles (Active)"
+            "Condition" = "8:"
+            "Object" = "8:_FB29EAD658C3497D9AC46ADE92D33C83"
+            "FileType" = "3:1"
+            "InstallAction" = "3:2"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:4"
+            "Identifier" = "8:_188D7632_09B7_4A7A_8AEA_892522E64DA0"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:"
+            }
             "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_EA511606B8E840088DBD733FF462117D"
             {
             "Name" = "8:Primary output from SetupRemoveCacheFiles (Active)"
@@ -1310,6 +1414,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0FB4451715D047189E40DDDBBF1AC9B6"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-environment-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-environment-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_145FB67AF1774D029CD2047D9D3B3F26"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\installer\\EULA.rtf"
@@ -1490,6 +1614,46 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29A62614B88E4B2A95FE66E9955C2A3D"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\code_view\\images\\edit.png"
+            "TargetName" = "8:edit.png"
+            "Tag" = "8:"
+            "Folder" = "8:_6F23DECDC0B546EAACE918CC5C17F653"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2A5A42294FC940B98B786C6CB3B32ED4"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-heap-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-heap-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2DA06C4E301647A58D13904DAE5A1010"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\fonts\\FiraSans-Regular.otf"
@@ -1690,6 +1854,46 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4171C92F0B4A42D8A3F28B65510CC090"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-utility-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-utility-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_41D7E42E67AA4615BEC19409547F70A2"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\window\\size_grip.png"
+            "TargetName" = "8:size_grip.png"
+            "Tag" = "8:"
+            "Folder" = "8:_991DBD2EDC144CE79F23005FB99BF9AF"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4400372852214CC588823F7A1A9F5F5D"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\Qt5Gui.dll"
@@ -1850,6 +2054,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_558913303CB64445B9D182707BF7F4C0"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-string-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-string-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_55993726A36649E5A7357B132039C206"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\fonts\\FiraSans-SemiBold.otf"
@@ -2090,6 +2314,66 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6D88AADBCCFC4136A684D8D001001F8B"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\projects\\tutorial\\src\\my_next_step.h"
+            "TargetName" = "8:my_next_step.h"
+            "Tag" = "8:"
+            "Folder" = "8:_A38746A96F3F43108F3B9C1A88E43FD0"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6ED826F7D1F14633B1A22B7AA28DE1F0"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-time-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-time-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_71BA266FA3B14FEC857F7FC8BA10C08B"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-math-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-math-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_72682FB1EB5042B8BA59A2EB76A9F847"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\undoredo_view\\undoredo_view.css"
@@ -2190,6 +2474,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_763A8819E84543E6BB4A90AC640E8018"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-locale-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-locale-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_769A9804482F45D7A708E444AAEE9DE3"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\undoredo_view\\images\\arrow_left.png"
@@ -2670,6 +2974,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A65099A63E6941CCA76E63A99B7E24A1"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\search_view\\images\\home.png"
+            "TargetName" = "8:home.png"
+            "Tag" = "8:"
+            "Folder" = "8:_3AD40865D1D747AE81EBCEB665944B1F"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A66E166B06CE4949B037BA2DDEAA3152"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\Qt5Widgets.dll"
@@ -2950,6 +3274,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C46E79A56942414695D2FE4E9635796B"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-stdio-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-stdio-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C7DCC9D78B694068956DADD44C79E64B"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\undoredo_view\\images\\arrow_right.png"
@@ -3230,6 +3574,46 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D8C8080ABBEC45C997AF9648209FE3BB"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-convert-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-convert-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DB845CEA6CC94997884C3644A1B44717"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-runtime-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-runtime-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DBCBA153A5EF4B869CF8A9003DFB5C35"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\Qt5Core.dll"
@@ -3430,6 +3814,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E95B1DE8FF5A4768841FCC0985DAEAAE"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\api-ms-win-crt-filesystem-l1-1-0.dll"
+            "TargetName" = "8:api-ms-win-crt-filesystem-l1-1-0.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_972788CBF3404779967EA0B73B72BF18"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EA117E55109E4929AD27B2D3FDF6AE2A"
             {
             "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\projects\\tictactoe\\src\\io.h"
@@ -3935,15 +4339,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Coati Trial"
-        "ProductCode" = "8:{99D5E031-E895-47B2-B108-AD026571FD29}"
-        "PackageCode" = "8:{7C41DFA9-3814-4C1B-A50F-F7442697A957}"
+        "ProductCode" = "8:{225E11DF-20A0-4AE0-AD5C-00944A9E3D71}"
+        "PackageCode" = "8:{AFEFFBA8-DE40-4FD1-84A9-ACE53FE97555}"
         "UpgradeCode" = "8:{00D35BB8-F11C-4179-9962-47B3D55E412C}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:0.5.0004"
+        "ProductVersion" = "8:0.7.0022"
         "Manufacturer" = "8:Coati Software"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:www.coati.io/support"
@@ -4334,7 +4738,7 @@
                             "ContextData" = "8:1;True=1;False=0"
                             "Attributes" = "3:0"
                             "Setting" = "3:0"
-                            "Value" = "3:0"
+                            "Value" = "3:1"
                             "DefaultValue" = "3:1"
                             "UsePlugInResources" = "11:TRUE"
                             }
@@ -4885,12 +5289,26 @@
         }
         "MergeModule"
         {
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_916B59949F5C458DB6C2E8D1BE5B369A"
+            {
+            "UseDynamicProperties" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge Modules\\Microsoft_VC140_CRT_x86.msm"
+                "Properties"
+                {
+                }
+            "LanguageId" = "3:0"
+            "Exclude" = "11:FALSE"
+            "Folder" = "8:"
+            "Feature" = "8:"
+            "IsolateTo" = "8:"
+            }
         }
         "ProjectOutput"
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3460FAB707F8431E87168499A7F51556"
             {
-            "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Release\\SetupApplicationSettingsLib.dll"
+            "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Debug\\SetupApplicationSettingsLib.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"
@@ -4918,7 +5336,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
             {
-            "SourcePath" = "8:..\\SetupCreateStartMenuShortcutLib\\obj\\Release\\SetupCreateStartMenuShortcutLib.dll"
+            "SourcePath" = "8:..\\SetupCreateStartMenuShortcutLib\\obj\\Debug\\SetupCreateStartMenuShortcutLib.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"
@@ -4946,7 +5364,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F81B906E39E44A5DAC37B3D70BC8A8CE"
             {
-            "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Release\\SetupCreateDesktopShortcutLib.dll"
+            "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Debug\\SetupCreateDesktopShortcutLib.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"
@@ -4974,7 +5392,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FB29EAD658C3497D9AC46ADE92D33C83"
             {
-            "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Release\\SetupRemoveCacheFiles.dll"
+            "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Debug\\SetupRemoveCacheFiles.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56"

ide_plugins/sublime_text/CoatiPlugin/CoatiPlugin.py

@@ -3,6 +3,7 @@ import sublime_plugin
 import threading
 import socket
 import os.path
+import encodings.idna
 
 try:						# use this for Sublime Text 2
 	import SocketServer

ide_plugins/vim/README.md

@@ -0,0 +1,5 @@
+#vim-coati
+
+The vim plugin is hosted at Github.
+
+Link to the repository: [vim-coati](https://github.com/CoatiSoftware/vim-coati).

ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj

@@ -20,7 +20,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CoatiSoftware.CoatiPlugin</RootNamespace>
-    <AssemblyName>CoatiPlugin</AssemblyName>
+    <AssemblyName>coati_plugin_vs</AssemblyName>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="acf15780-03b5-440e-a41e-db79b7043fc2" Version="0.5.2" Language="en-US" Publisher="Coati Software OG" />
+    <Identity Id="acf15780-03b5-440e-a41e-db79b7043fc2" Version="0.6" Language="en-US" Publisher="Coati Software OG" />
     <DisplayName>CoatiPlugin</DisplayName>
-    <Description xml:space="preserve">This package allows Coati to communicate with Visual Studio and vice versa.
-More infos at www.coati.io</Description>
+    <Description xml:space="preserve">This package allows Coati to communicate with Visual Studio and vice versa.</Description>
+    <MoreInfo>https://www.coati.io/</MoreInfo>
     <Icon>coati.ico</Icon>
   </Metadata>
   <Installation InstalledByMsi="false">

script/clean.sh

@@ -12,17 +12,27 @@ elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then
 	PLATFORM='Windows'
 fi
 
-# Enter masterproject directory
-MY_PATH=`dirname "$0"`
-cd $MY_PATH/..
 
 if [ $PLATFORM == "Windows" ]; then
-    # Remove symbolic links
-    cmd //c 'rmdir '.$MY_PATH.'\..\bin\app\Debug\data' &
-    cmd //c 'rmdir '.$MY_PATH.'\..\bin\app\Debug\user' &
-    cmd //c 'rmdir '.$MY_PATH.'\..\bin\app\Release\data' &
-    cmd //c 'rmdir '.$MY_PATH.'\..\bin\app\Release\user' &
+	ORIGINAL_PATH_TO_SCRIPT="${0}"
+	CLEANED_PATH_TO_SCRIPT="${ORIGINAL_PATH_TO_SCRIPT//\\//}"
+	ROOT_DIR=`dirname "$CLEANED_PATH_TO_SCRIPT"`
+else
+	ROOT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+fi
 
+ROOT_DIR=$ROOT_DIR/..
+
+# Enter masterproject directory
+cd $ROOT_DIR/
+
+if [ $PLATFORM == "Windows" ]; then
+	BACKSLASHED_ROOT_DIR="${ROOT_DIR//\//\\}"
+    # Remove symbolic links
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\data' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\user' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Release\data' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Release\user' &
 fi
 
 # Remove folders and contents

script/deploy_windows.sh

@@ -32,17 +32,23 @@ read -p "Press [Enter] key to continue"
 echo -e "$INFO Did you change the Product-IDs in the uninstall scripts?"
 read -p "Press [Enter] key to continue"
 
-echo -e "$INFO Did you set the correct version number for the Visual Studio plugins?"
+echo -e "$INFO Did you set the correct version number for the Visual Studio plugin?"
 read -p "Press [Enter] key to continue"
 
-echo -e "$INFO Are the Visual Studio plugins up to date?"
+echo -e "$INFO Is the Visual Studio plugin up to date?"
 read -p "Press [Enter] key to continue"
 
+
 # SETTING THE DEPLOY FLAG
 rm -rf src/lib_gui/platform_includes/deploy.h
 echo "#define DEPLOY" >src/lib_gui/platform_includes/deploy.h
 
 
+### TODO: RUN CMAKE!
+
+### TODO: add HKEY_CURRENT_USER\Software\Microsoft\VisualStudio\12.0_Config\MSBuild\EnableOutOfProcBuild
+
+
 # CLEANING THE PROJECT
 if [ $REBUILD = true ]; then
 	echo -e "$INFO cleaning the project"
@@ -66,11 +72,15 @@ rm bin/app/data/projects/tutorial/tutorial.coatidb
 rm -rf temp
 mkdir -p temp
 cd temp
-echo -e "$INFO Please wait until Coati created the database for tictactoe. Close Coati to continue"
-../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tictactoe/tictactoe.coatiproject
 
-echo -e "$INFO Please wait until Coati created the database for tutorial. Close Coati to continue"
-../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tutorial/tutorial.coatiproject
+echo -e "$INFO saving license key"
+../bin/app/Release/Coati.exe -z ../script/license.txt
+
+echo -e "$INFO creating database for tictactie"
+../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tictactoe/tictactoe.coatiproject -d
+
+echo -e "$INFO creating database for tutorial"
+../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tutorial/tutorial.coatiproject -d
 
 cd ..
 rm -rf temp
@@ -91,10 +101,10 @@ fi
 
 # BUILDING THE INSTALLERS
 echo -e "$INFO building the installer (app)"
-"D:/programme/Microsoft Visual Studio 12/Common7/IDE/devenv.com" deployment/windows/CoatiAppSetup/CoatiAppSetup.sln //build Release //project deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj
+"D:/programme/Microsoft Visual Studio14/Common7/IDE/devenv.com" deployment/windows/CoatiAppSetup/CoatiAppSetup.sln //build Release //project deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj
 
 echo -e "$INFO building the installer (trail)"
-"D:/programme/Microsoft Visual Studio 12/Common7/IDE/devenv.com" deployment/windows/CoatiTrialSetup/CoatiTrialSetup.sln //build Release //project deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj
+"D:/programme/Microsoft Visual Studio14/Common7/IDE/devenv.com" deployment/windows/CoatiTrialSetup/CoatiTrialSetup.sln //build Release //project deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj
 
 
 # EDIT THE INSTALLERS
@@ -119,12 +129,12 @@ mkdir -p $APP_PACKAGE_DIR
 cp -u -r deployment/windows/CoatiAppSetup/CoatiSetup/Release/Coati.msi $APP_PACKAGE_DIR/
 cp -u -r deployment/windows/CoatiAppSetup/CoatiSetup/Release/setup.exe $APP_PACKAGE_DIR/
 
-mkdir -p $APP_PACKAGE_DIR/plugins/visual_studio/
-cp -u -r ide_plugins/vs/coati_plugin_vs_2012.vsix $APP_PACKAGE_DIR/plugins/visual_studio/
-cp -u -r ide_plugins/vs/coati_plugin_vs_2013.vsix $APP_PACKAGE_DIR/plugins/visual_studio/
-cp -u -r ide_plugins/vs/coati_plugin_vs_2015.vsix $APP_PACKAGE_DIR/plugins/visual_studio/
 mkdir -p $APP_PACKAGE_DIR/plugins/sublime_text/
 cp -u -r ide_plugins/sublime_text/* $APP_PACKAGE_DIR/plugins/sublime_text/
+mkdir -p $APP_PACKAGE_DIR/plugins/vim/
+cp -u -r ide_plugins/vim/* $APP_PACKAGE_DIR/plugins/vim/
+mkdir -p $APP_PACKAGE_DIR/plugins/visual_studio/
+cp -u -r ide_plugins/vs/coati_plugin_vs.vsix $APP_PACKAGE_DIR/plugins/visual_studio/
 
 
 # PACKAGING COATI (APP)
@@ -152,9 +162,7 @@ cp -u -r deployment/windows/CoatiTrialSetup/CoatiSetup/Release/CoatiTrial.msi $T
 cp -u -r deployment/windows/CoatiTrialSetup/CoatiSetup/Release/setup.exe $TRIAL_PACKAGE_DIR/
 
 mkdir -p $TRIAL_PACKAGE_DIR/plugins/visual_studio/
-cp -u -r ide_plugins/vs/coati_plugin_vs_2012.vsix $TRIAL_PACKAGE_DIR/plugins/visual_studio/
-cp -u -r ide_plugins/vs/coati_plugin_vs_2013.vsix $TRIAL_PACKAGE_DIR/plugins/visual_studio/
-cp -u -r ide_plugins/vs/coati_plugin_vs_2015.vsix $TRIAL_PACKAGE_DIR/plugins/visual_studio/
+cp -u -r ide_plugins/vs/coati_plugin_vs.vsix $TRIAL_PACKAGE_DIR/plugins/visual_studio/
 mkdir -p $TRIAL_PACKAGE_DIR/plugins/sublime_text/
 cp -u -r ide_plugins/sublime_text/* $TRIAL_PACKAGE_DIR/plugins/sublime_text/
 

script/license.txt

@@ -0,0 +1,13 @@
+-----BEGIN LICENSE-----
+Malte Langkabel
+Private/Academic Single User License
+Coati 0
+$9$AQAKVgXEpRqHfGMwWj/TA5YWrVmWWJrk5PmADbFYkewV7Ddvq+JV
+nT+lDlImNpfRQDY4YTJDYc0B/IW5n8ccn21HqLkRvR5t8T5/GvUzRNZ
+PnZfA/sE0tVBpS1IMEhUd5JIztHKXHFDdwcvIS7Z+y6vxn0knD0/VF4
+RjvvgicxikAnfF9cNxTb3IYAaUSREFTPejX6JABSai0jJhZLR4P9upK
+rj6OYFerGI2/+6D2UyBJhaAc2P3zcd2ivd01IRjJNeXlGA3r5mCcl5y
+SuPtreW3Yyq/uafyP1rV6uASIb+3oV6Y+jTo1kFYqEh8tjmrxOHbJLu
+3+wHyJgMu5fLhJFWAKyxPjVbY5A0nvQAb0F+ROSZZ5IiKKCYIcofcxt
+HrBYDDdP0rJw==
+-----END LICENSE-----

script/setup.sh

@@ -14,9 +14,18 @@ elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then
 	PLATFORM='Windows'
 fi
 
+if [ $PLATFORM == "Windows" ]; then
+	ORIGINAL_PATH_TO_SCRIPT="${0}"
+	CLEANED_PATH_TO_SCRIPT="${ORIGINAL_PATH_TO_SCRIPT//\\//}"
+	ROOT_DIR=`dirname "$CLEANED_PATH_TO_SCRIPT"`
+else
+	ROOT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+fi
+
+ROOT_DIR=$ROOT_DIR/..
+
 # Enter masterproject directory
-MY_PATH=`dirname "$0"`
-cd $MY_PATH/..
+cd $ROOT_DIR
 
 # git settings
 echo -e $INFO "install git settings"
@@ -49,17 +58,19 @@ if [ $PLATFORM == "Windows" ]; then
 	echo -e $INFO "creating program icon"
 	sh script/create_windows_icon.sh
 
-	cmd //c 'mklink /d /j '.$MY_PATH.'\..\bin\app\Debug\data '.$MY_PATH.'\..\bin\app\data' &
-	cmd //c 'mklink /d /j '.$MY_PATH.'\..\bin\app\Debug\user '.$MY_PATH.'\..\bin\app\user' &
-	cmd //c 'mklink /d /j '.$MY_PATH.'\..\bin\app\Release\data '.$MY_PATH.'\..\bin\app\data' &
-	cmd //c 'mklink /d /j '.$MY_PATH.'\..\bin\app\Release\user '.$MY_PATH.'\..\bin\app\user' &
+	BACKSLASHED_ROOT_DIR="${ROOT_DIR//\//\\}"
+
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Release\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Release\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' &
 elif [ $PLATFORM == "Linux" ]; then
 	echo -e $INFO "create symbolic links for data"
-	cd bin/app/Release
-	ln -s ../data data
-	cd ../Debug
-	ln -s ../data data
-	cd ../../..
+	cd $ROOT_DIR/bin/app/Release
+	ln -s ../data
+	cd $ROOT_DIR/bin/app/Debug
+	ln -s ../data
+	cd $ROOT_DIR
 fi
 
 # Setup both Debug and Release configuration

setup/Linux/Coati.sh

@@ -3,20 +3,21 @@
 # get the current directory
 SOURCE="${0}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-  SOURCE="$(readlink "$SOURCE")"
-  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+	DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+	SOURCE="$(readlink "$SOURCE")"
+	[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
 done
 COATI_PATH="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 #setup data folder
 if [ ! -d "${HOME}/.config/coati" ]; then
-  # Control will enter here if $DIRECTORY doesn't exist.
-  mkdir -p ${HOME}/.config/coati
-  cp $COATI_PATH/user/* ${HOME}/.config/coati/
-  echo "First start of Coati from this user, copy default configfiles to ~/.config/coati"
+	# Control will enter here if $DIRECTORY doesn't exist.
+	mkdir -p ${HOME}/.config/coati
+	echo "First start of Coati from this user, copy default configfiles to ~/.config/coati"
 fi
 
+cp -rn $COATI_PATH/user/* ${HOME}/.config/coati/
+
 export LD_LIBRARY_PATH="$COATI_PATH/lib:LD_LIBRARY_PATH"
 export QT_XKB_CONFIG_ROOT="/usr/share/X11/xkb:$QT_XKB_CONFIG_ROOT"
 export QT_QPA_FONTDIR="$COATI_PATH/data/fonts:$QT_QPA_FONTDIR"

setup/Linux/Coati_trial.sh

@@ -3,21 +3,22 @@
 # get the current directory
 SOURCE="${0}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-  SOURCE="$(readlink "$SOURCE")"
-  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+	DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+	SOURCE="$(readlink "$SOURCE")"
+	[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
 done
 COATI_PATH="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 #setup data folder
 echo $COATI_PATH
 if [ ! -d "${HOME}/.config/coatitrial" ]; then
-  # Control will enter here if $DIRECTORY doesn't exist.
-  mkdir -p ${HOME}/.config/coatitrial
-  cp $COATI_PATH/user/* ${HOME}/.config/coatitrial/
-  echo "First start of Coati from this user, copy default configfiles to ~/.config/coati"
+	# Control will enter here if $DIRECTORY doesn't exist.
+	mkdir -p ${HOME}/.config/coatitrial
+	echo "First start of Coati from this user, copy default configfiles to ~/.config/coati"
 fi
 
+cp -nr $COATI_PATH/user/* ${HOME}/.config/coatitrial/
+
 export LD_LIBRARY_PATH="$COATI_PATH/lib:LD_LIBRARY_PATH"
 export QT_XKB_CONFIG_ROOT="/usr/share/X11/xkb:$QT_XKB_CONFIG_ROOT"
 export QT_QPA_FONTDIR="$COATI_PATH/data/fonts:$QT_QPA_FONTDIR"

setup/Linux/deinstall.sh

@@ -9,7 +9,7 @@ case ${ans:=y} in [yY]*) ;; *) exit ;; esac
 
 echo "Run this script as root"
 
-rm /usr/bin/Coati
+rm /usr/bin/coati
 rm /usr/share/mime/packages/coati-mime.xml
 rm /usr/share/applications/coati.desktop
 rm /usr/share/icons/coati.png

setup/Linux/install.sh

@@ -1,6 +1,5 @@
-
-MY_PATH=`dirname "$0"`
-MY_PATH=../$MY_PATH
+SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+MY_PATH=$SCRIPT_DIR/..
 
 cat ${MY_PATH}/EULA.txt
 echo "Agree to the EULA"

setup/MacOSX/Info.plist.in

@@ -27,7 +27,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>@GIT_VERSION_NUMBER@</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

setup/MacOSX/Info_trial.plist.in

@@ -27,7 +27,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>@GIT_VERSION_NUMBER@</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>