logic: Fulltextsearch

* fulltextsearch enabled in sqlite * fulltextsearch start search with @ * codeview performance improved * strip sRGB profile from png files to get rid of libpng warning at runtime
ui: fix codeview scrollbar and search crash
2016-05-10 11:10:13 +02:00 · 2016-05-04 18:38:53 +02:00 · 2016-05-03 15:59:59 +02:00 · 2016-04-27 15:14:48 +02:00 · 2016-04-27 14:58:57 +02:00 · 2016-04-27 12:15:03 +02:00
350 changed files with 9907 additions and 5738 deletions
@@ -40,7 +40,10 @@
 .clang_complete
 .ycm_extra_conf.py
 .ycm_extra_conf.pyc
+coati.coatiproject
 compile_commands.json
+Makefile
+/__pycache__/

 /deployment/windows/CoatiAppSetup/CoatiSetup/Debug
 /deployment/windows/CoatiAppSetup/CoatiSetup/Release
@@ -2,7 +2,7 @@ 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)
+	cmake_policy(SET CMP0043 OLD)
 endif()

 include(cmake/add_files.cmake)
@@ -13,7 +13,6 @@ include(cmake/licenses.cmake)

 # set Standerd build type to Release
 set(CMAKE_BUILD_TYPE_INIT "Release")
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

 # Variables --------------------------------------------------------------------

@@ -37,23 +36,30 @@ 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})

 #RPATH
 if(UNIX AND NOT APPLE)
 	set(CMAKE_SKIP_BUILD_RPATH FALSE)
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 	set(CMAKE_INSTALL_RPATH "$ORIGIN/lib/:$$ORIGIN/lib/")
-    include(cmake/external.cmake)
+	include(cmake/external.cmake)
 endif()

+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+# Settings ---------------------------------------------------------------------
+
+if (UNIX)
+	add_definitions(-std=c++11 -Wno-unknown-warning-option -fcolor-diagnostics -DQT_COMPILING_QSTRING_COMPAT_CPP )
+endif ()
+
+# enable fts4 module for sqlite
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS4_PARENTHESIS")
+
 # Clang ------------------------------------------------------------------------

 if (UNIX AND APPLE)
@@ -63,7 +69,7 @@ if (UNIX AND APPLE)
 		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake" NO_DEFAULT_PATH)
 	endif()
 elseif(UNIX)
-    find_package(LLVM REQUIRED PATHS "${EXTERNAL_BUILD}/llvm/share/llvm/cmake" NO_DEFAULT_PATH)
+	find_package(LLVM REQUIRED PATHS "${EXTERNAL_BUILD}/llvm/share/llvm/cmake" NO_DEFAULT_PATH)
 else()
 	find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build/share/llvm/cmake")
 endif()
@@ -75,9 +81,9 @@ add_definitions(${CLANG_DEFINITIONS})
 # Boost ------------------------------------------------------------------------

 if(UNIX AND NOT APPLE)
-    set(BOOST_ROOT ${EXTERNAL_BUILD}/boost)
+	set(BOOST_ROOT ${EXTERNAL_BUILD}/boost)
 else()
-    set(BOOST_ROOT $ENV{BOOST_159_DIR})
+	set(BOOST_ROOT $ENV{BOOST_159_DIR})
 endif()
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS ON)
@@ -91,31 +97,77 @@ find_package(Boost 1.59 COMPONENTS system program_options filesystem date_time R

 add_definitions(-DEIGEN_MPL2_ONLY)
 if(UNIX AND NOT APPLE)
-    set(EIGEN_ROOT ${EXTERNAL_SRC}/eigen)
+	set(EIGEN_ROOT ${EXTERNAL_SRC}/eigen)
 else()
-    set(EIGEN_ROOT $ENV{EIGEN_DIR})
+	set(EIGEN_ROOT $ENV{EIGEN_DIR})
 endif()

 # Botan -------------------------------------------------------------------------

+set(BOTAN_VERSION "botan-1.11")
+
 if(UNIX AND APPLE)
-    find_library(BOTAN botan-1.11 $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
-    find_library(BOTAN_D botan-1.11 $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
+	find_library(BOTAN ${BOTAN_VERSION} $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
+	find_library(BOTAN_D ${BOTAN_VERSION} $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
 elseif(UNIX)
-    find_library(BOTAN botan-1.11 "${EXTERNAL_BUILD}/botan/lib" NO_DEFAULT_PATH)
+	find_library(BOTAN ${BOTAN_VERSION} "${EXTERNAL_BUILD}/botan" NO_DEFAULT_PATH)
 else()
-    find_library(BOTAN botan "$ENV{BOTAN_DIR}/release")
+	find_library(BOTAN botan "$ENV{BOTAN_DIR}/release")
 	find_library(BOTAN_D botan "$ENV{BOTAN_DIR}/debug")
 endif()
 if(${BOTAN} STREQUAL "BOTAN-NOTFOUND")
-    message(FATAL_ERROR "Botan not found")
+	message(FATAL_ERROR "Botan not found")
 else()
-    message(STATUS "Botan found")
+	message(STATUS "Botan found")
 endif()
 if(UNIX AND NOT APPLE)
-    set(BOTAN_INCLUDE_DIR "${EXTERNAL_SRC}/botan")
+	set(BOTAN_INCLUDE_DIR "${EXTERNAL_BUILD}/botan")
 else()
-    set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}")
+	set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}")
+endif()
+
+# Lib License -------------------------------------------------------------------
+
+#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
+#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
+
+add_subdirectory(src/lib_license)
+
+add_library(${LIB_LICENSE_PROJECT_NAME} ${LIB_LICENSE_FILES})
+
+create_source_groups(${LIB_LICENSE_FILES})
+
+set_property(
+		TARGET ${LIB_LICENSE_PROJECT_NAME}
+		PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
+)
+
+set_target_properties(
+	${LIB_LICENSE_PROJECT_NAME}
+	PROPERTIES
+		DEBUG_OUTPUT_NAME ${LIB_LICENSE_PROJECT_NAME}_d
+		RELEASE_OUTPUT_NAME ${LIB_LICENSE_PROJECT_NAME}
+)
+
+target_include_directories(${LIB_LICENSE_PROJECT_NAME} SYSTEM
+	PUBLIC
+	${Boost_INCLUDE_DIRS}
+	${LIB_LICENSE_PROJECT_NAME}
+	${BOTAN_INCLUDE_DIR}
+)
+
+# target_include_directories(${LIB_LICENSE_PROJECT_NAME} optimized "$ENV{BOTAN_DIR}/release")
+# target_include_directories(${LIB_LICENSE_PROJECT_NAME} debug "$ENV{BOTAN_DIR}/debug")
+
+if(UNIX)
+	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} ${BOTAN})
+else()
+	link_directories(optimized "$ENV{BOTAN_DIR}/release")
+	link_directories(debug "$ENV{BOTAN_DIR}/debug")
+
+	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} debug ${BOTAN_D})
+	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} optimized ${BOTAN})
 endif()

 # Lib --------------------------------------------------------------------------
@@ -146,6 +198,8 @@ set_property(
 	TARGET ${LIB_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/lib"
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
 )

 target_include_directories(${LIB_PROJECT_NAME} SYSTEM
@@ -153,10 +207,10 @@ target_include_directories(${LIB_PROJECT_NAME} SYSTEM
 	${CLANG_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS}
 	${EIGEN_ROOT}
-    "${CMAKE_SOURCE_DIR}/src/external"
+	"${CMAKE_SOURCE_DIR}/src/external"
 )

-target_link_libraries(${LIB_PROJECT_NAME} ${Boost_LIBRARIES})
+target_link_libraries(${LIB_PROJECT_NAME} ${Boost_LIBRARIES} ${LIB_LICENSE_PROJECT_NAME})

 # Lib Parser -------------------------------------------------------------------

@@ -172,8 +226,8 @@ add_library(${LIB_PARSER_PROJECT_NAME} ${CLANG_FILES})
 create_source_groups(${CLANG_FILES})

 set_property(
-		TARGET ${LIB_PARSER_PROJECT_NAME}
-		PROPERTY INCLUDE_DIRECTORIES
+	TARGET ${LIB_PARSER_PROJECT_NAME}
+	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/lib_parser"
 		"${CMAKE_SOURCE_DIR}/src/lib"
 )
@@ -194,53 +248,8 @@ target_include_directories(${LIB_PARSER_PROJECT_NAME} SYSTEM
 link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
 llvm_map_components_to_libnames(REQ_LLVM_LIBS support core libdriver)

-#target_link_libraries(${LIB_PARSER_PROJECT_NAME} ${CLANG_LIBRARIES} ${LLVM_AVAILABLE_LIBS})
 target_link_libraries(${LIB_PARSER_PROJECT_NAME} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBS})

-# Lib License -------------------------------------------------------------------
-
-#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
-#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
-
-add_subdirectory(src/lib_license)
-
-add_library(${LIB_LICENSE_PROJECT_NAME} ${LIB_LICENSE_FILES})
-
-create_source_groups(${LIB_LICENSE_FILES})
-
-set_property(
-		TARGET ${LIB_LICENSE_PROJECT_NAME}
-		PROPERTY INCLUDE_DIRECTORIES
-		"${CMAKE_SOURCE_DIR}/src/lib_license"
-)
-
-set_target_properties(
-	${LIB_LICENSE_PROJECT_NAME}
-	PROPERTIES
-		DEBUG_OUTPUT_NAME ${LIB_LICENSE_PROJECT_NAME}_d
-		RELEASE_OUTPUT_NAME ${LIB_LICENSE_PROJECT_NAME}
-)
-
-target_include_directories(${LIB_LICENSE_PROJECT_NAME} SYSTEM
-	PUBLIC
-	${Boost_INCLUDE_DIRS}
-	${LIB_LICENSE_PROJECT_NAME}
-    ${BOTAN_INCLUDE_DIR}
-)
-
-# target_include_directories(${LIB_LICENSE_PROJECT_NAME} optimized "$ENV{BOTAN_DIR}/release")
-# target_include_directories(${LIB_LICENSE_PROJECT_NAME} debug "$ENV{BOTAN_DIR}/debug")
-
-if(UNIX)
-	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} ${BOTAN})
-else()
-	link_directories(optimized "$ENV{BOTAN_DIR}/release")
-	link_directories(debug "$ENV{BOTAN_DIR}/debug")
-
-	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} debug ${BOTAN_D})
-	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} optimized ${BOTAN})
-endif()
-
 # Lib Gui ----------------------------------------------------------------------

 #set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
@@ -255,14 +264,14 @@ set(CMAKE_AUTOMOC ON)

 # Find the QtWidgets library
 if(UNIX AND NOT APPLE)
-    set(CMAKE_PREFIX_PATH ${EXTERNAL_BUILD}/qt)
+	set(CMAKE_PREFIX_PATH ${EXTERNAL_BUILD}/qt)
 else()
-    set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
+	set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
 endif()

 if(UNIX AND APPLE)
-    set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
-    set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
+	set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
+	set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
 endif()

 find_package(Qt5Widgets)
@@ -270,11 +279,11 @@ find_package(Qt5PrintSupport)
 find_package(Qt5Network)

 if(Qt5Widgets_FOUND)
-    MESSAGE(STATUS "Found Qt ${Qt5Widgets_VERSION_STRING}")
-    # FIX: Qt was built with -reduce-relocations
-    if (Qt5_POSITION_INDEPENDENT_CODE)
-        SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-    endif()
+	MESSAGE(STATUS "Found Qt ${Qt5Widgets_VERSION_STRING}")
+	# FIX: Qt was built with -reduce-relocations
+	if (Qt5_POSITION_INDEPENDENT_CODE)
+		SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+	endif()
 endif()

 # target for running versionnumber script
@@ -292,7 +301,7 @@ add_custom_command(
 	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake
 	BYPRODUCTS ${PROJECT_SOURCE_DIR}/build/src/lib_gui/version.h
 	DEPENDS ${LIB_GUI_PROJECT_NAME}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 	COMMENT "check/update version number"
 )
 add_dependencies(${LIB_GUI_PROJECT_NAME} versionnumber)
@@ -306,6 +315,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(
@@ -334,8 +344,8 @@ configure_file(

 #configure the versioning file
 configure_file(
-  ${CMAKE_SOURCE_DIR}/cmake/version.h.in
-  ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
+	${CMAKE_SOURCE_DIR}/cmake/version.h.in
+	${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
 )

 # configure public key for the coati version
@@ -363,7 +373,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")
@@ -373,7 +383,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})
@@ -389,6 +399,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"
 )

@@ -455,6 +466,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
@@ -563,9 +575,9 @@ endif ()
 add_subdirectory(src/test)

 if(UNIX AND NOT APPLE)
-    set(CXXTEST_INCLUDE_DIR ${EXTERNAL_SRC}/cxxtest)
+	set(CXXTEST_INCLUDE_DIR ${EXTERNAL_SRC}/cxxtest)
 else()
-    set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
+	set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
 endif()
 set(CXXTEST_PYTHON_TESTGEN_EXECUTABLE ${CXXTEST_INCLUDE_DIR}/bin/cxxtestgen)
 set(TESTGEN_FILE ${CMAKE_CURRENT_BINARY_DIR}/test_main.cpp)
@@ -613,6 +625,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"
 	)
@@ -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,100 +83,174 @@ $ 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.6.0.0
+released 2016-04-27

-* 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
+* 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.4.0
+#### 0.5.1.21
+released 2016-03-16

-* 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
+* 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
+#### 0.5.0.4
+released 2016-02-25

-* 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
+* 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
@@ -87,20 +87,37 @@
 			</syntax>

 			<selection>
-				<location>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#EDEDED</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#4A4A4A</fill>
+						<border>#EDEDED</border>
+						<fill>#EDEDED</fill>
+						<text>#262626</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#9BDAFF</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
@@ -87,20 +87,35 @@
 			</syntax>

 			<selection>
-				<location>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#8E8E8E</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#EDEDED</fill>
+						<border>#A0A0A0</border>
+						<fill>#A0A0A0</fill>
+						<text>#FFFFFF</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#AAE0FF</border>
+						<fill>#C6EAFF</fill>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#C6EAFF</fill>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
@@ -119,14 +134,17 @@
 					<normal>
 						<border>transparent</border>
 						<fill>#80FF0000</fill>
+						<text>#000000</text>
 					</normal>
 					<focus>
 						<border>transparent</border>
 						<fill>#FFFF0000</fill>
+						<text>#000000</text>
 					</focus>
 					<active>
 						<border>transparent</border>
 						<fill>#FFFF0000</fill>
+						<text>#000000</text>
 					</active>
 				</error>
 			</selection>
@@ -295,8 +313,8 @@
 			</template_member_specialization>

 			<aggregation>
-				<normal>#EEE</normal>
-				<focus>#DDD</focus>
+				<normal>#DDD</normal>
+				<focus>#CCC</focus>
 			</aggregation>
 		</edge>
 	</graph>
@@ -87,20 +87,37 @@
 			</syntax>

 			<selection>
-				<location>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#F7F7F7</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#4A4A4A</fill>
+						<border>transparent</border>
+						<fill>#F7F7F7</fill>
+						<text>#272728</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#A0A0A0</border>
+						<fill>#969696</fill>
+						<text>#191919</text>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#969696</fill>
+						<text>#272728</text>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
@@ -317,8 +334,8 @@
 			</macro_use>

 			<aggregation>
-				<normal>#5D5D5D</normal>
-				<focus>#6D6D6D</focus>
+				<normal>#3D3D3D</normal>
+				<focus>#4D4D4D</focus>
 			</aggregation>
 		</edge>
 	</graph>
@@ -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>;
 }
@@ -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;
 }
@@ -30,3 +37,8 @@
 	font-size: 16pt;
 	font-weight: bold;
 }
+
+#welcomeLabel {
+	color: black;
+	font-size: 12pt;
+}
@@ -112,7 +112,6 @@
 	border-top-right-radius: 0px;
 	font-size: 15pt;
 	margin-right: 0px;
-	margin-bottom: 7px;
 	height: 25px;
 	width: 90px;
 }
@@ -1 +1 @@
-%windir%\system32\msiexec.exe /I{E6343DF1-6651-4487-BACE-59068B169BA0}
+%windir%\system32\msiexec.exe /I{A54890F6-A227-4BEC-8086-DF08B9B4D0D1}
@@ -1 +1 @@
-%windir%\system32\msiexec.exe /I{99D5E031-E895-47B2-B108-AD026571FD29}
+%windir%\system32\msiexec.exe /I{8732C041-A948-4D7F-BE08-FBCEF8BF4586}
@@ -14,7 +14,7 @@
            <source_extensions>.c</source_extensions>
        </extensions>
        <source_paths>
-            <source_path>/Users/ebsi/Documents/Coati/bin/app/data/projects/tictactoe/src</source_path>
+            <source_path>./src</source_path>
        </source_paths>
        <use_source_paths_for_header_search>0</use_source_paths_for_header_search>
    </source>
@@ -55,6 +55,7 @@ void function_with_snippets()
 	the_central_hub();


+
 	unrelated_but_very_important();
 };

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


@@ -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
+
@@ -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.
 //
 //------------------------------------------------------------------------------
@@ -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
@@ -14,7 +14,7 @@
 			LET'S GET STARTED!\n
 			\tTo keep things simple just click the "main" symbol below to start the tour.\n
 			\n
-			[main](); // &lt;- start here\n\n
+			[main\tint\r()](); // &lt;- start here\n\n
 		</description>
 	</info>
 	<source>
@@ -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>
@@ -1,21 +1,3 @@
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:1:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:1:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:1:11
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:1:13
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:7:15
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:5:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:48
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:7:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:3:20
-CxxDeclNameResolver.cpp ERROR: could not resolve name of decl at: input.cc:4:20
 Token.cpp ERROR: Location Id was not referenced by this Token.
 Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class
 Edge.cpp ERROR: Nodes are not plain copies.
@@ -65,11 +47,3 @@ NetworkProtocolHelper.cpp ERROR: Failed to parse message, invalid type token
 NetworkProtocolHelper.cpp ERROR: Failed to parse setActiveToken message, invalid token count
 Settings.cpp WARNING: File for Settings not found: data/SettingsTestSuite/wrong_settings.xml
 Settings.cpp WARNING: File for Settings not found: data/SettingsTestSuite/wrong_settings.xml
-TextAccess.cpp ERROR: Could not open file path/to/test.h
-TextAccess.cpp WARNING: Index 'firstLine' has to be lower or equal index 'lastLine', is 3 > 2
-TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
-TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
-TextAccess.cpp WARNING: Line numbers start with one, is 0
-TextAccess.cpp WARNING: Line numbers start with one, is 0
-TokenLocationCollection.cpp ERROR: Can't create TokenLocation with wrong boundaries.
-TokenLocationCollection.cpp ERROR: Can't create TokenLocation with wrong boundaries.
@@ -13,13 +13,31 @@
 	#-d ${CMAKE_SOURCE_DIR}/bin/app/data/projects/tutorial/tutorial.coatiproject)"
 #)

+function(InstallQtModule module qtversion componentName)
+	get_filename_component(realpath ${EXTERNAL_BUILD}/qt/lib/libQt5${module}.so.${qtversion} REALPATH)
+	INSTALL(FILES
+		${realpath}
+		DESTINATION lib
+		COMPONENT ${componentName}
+		RENAME libQt5${module}.so.${qtversion}
+	)
+endfunction(InstallQtModule)
+
+function(InstallQt qtversion componentName)
+	InstallQtModule(Gui ${qtversion} ${componentName})
+	InstallQtModule(Core ${qtversion} ${componentName})
+	InstallQtModule(Network ${qtversion} ${componentName})
+	InstallQtModule(XcbQpa ${qtversion} ${componentName})
+	InstallQtModule(Widgets ${qtversion} ${componentName})
+	InstallQtModule(DBus ${qtversion} ${componentName})
+endfunction(InstallQt)
+
 function(AddSharedToComponent componentName)
 	INSTALL(DIRECTORY
 		${CMAKE_SOURCE_DIR}/bin/app/data
 		DESTINATION .
 		COMPONENT ${componentName}
 		PATTERN "log/*" EXCLUDE
-		PATTERN "projects/ignored" EXCLUDE
 		PATTERN "data/src" EXCLUDE
 		PATTERN "data/gui/installer" EXCLUDE
 		PATTERN "data/install" EXCLUDE
@@ -41,30 +59,12 @@ function(AddSharedToComponent componentName)
 		DESTINATION .
 	)

-	INSTALL(FILES
-		#Qt libs
-		# FIXME need a better solution for that
-		${EXTERNAL_BUILD}/qt/lib/libQt5Gui.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Gui.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Gui.so.5.5.1
-		${EXTERNAL_BUILD}/qt/lib/libQt5Core.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Core.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Core.so.5.5.1
-		${EXTERNAL_BUILD}/qt/lib/libQt5Network.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Network.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Network.so.5.5.1
-		${EXTERNAL_BUILD}/qt/lib/libQt5XcbQpa.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5XcbQpa.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5XcbQpa.so.5.5.1
-		${EXTERNAL_BUILD}/qt/lib/libQt5Widgets.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Widgets.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5Widgets.so.5.5.1
-		${EXTERNAL_BUILD}/qt/lib/libQt5DBus.so.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5DBus.so.5.5
-		${EXTERNAL_BUILD}/qt/lib/libQt5DBus.so.5.5.1
+	InstallQt(5 ${componentName})

+	get_filename_component(realpath ${LIBSTDCPP} REALPATH)
+	INSTALL(FILES
 		#C++
-		${LIBSTDCPP}
+		${realpath}
 		DESTINATION lib
 		COMPONENT ${componentName}
 	)
@@ -75,12 +75,6 @@ function(AddSharedToComponent componentName)
 		COMPONENT ${componentName}
 	)

-	INSTALL(DIRECTORY
-		${CMAKE_SOURCE_DIR}/bin/app/data/projects
-		DESTINATION user
-		COMPONENT ${componentName}
-	)
-
 	INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/user
 		DESTINATION .
 		COMPONENT ${componentName}
@@ -88,7 +82,13 @@ function(AddSharedToComponent componentName)
 		PATTERN "ApplicationSettings_for_package.xml" EXCLUDE
 		PATTERN "ProjectSettings_template.xml" EXCLUDE
 		PATTERN "ApplicationSettings_template.xml" EXCLUDE
-		PATTERN "window_settings.ini_for_package" EXCLUDE
+		PATTERN "window_settings_for_package.ini" EXCLUDE
+	)
+
+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/user/window_settings_for_package.ini
+		DESTINATION user
+		COMPONENT ${componentName}
+		RENAME window_settings.ini
 	)
 endfunction(AddSharedToComponent)

@@ -103,33 +103,46 @@ AddSharedToComponent(TRIAL)

 INSTALL(DIRECTORY
 	${CMAKE_SOURCE_DIR}/ide_plugins/sublime_text
-    DESTINATION plugin
+	DESTINATION plugin
 	COMPONENT FULL
 )

-INSTALL(FILES
-    ${CMAKE_SOURCE_DIR}/setup/Linux/coati.desktop
-    ${CMAKE_SOURCE_DIR}/setup/Linux/coati-mime.xml
-    DESTINATION setup
-	COMPONENT FULL
+INSTALL(DIRECTORY
+		${CMAKE_SOURCE_DIR}/bin/app/data/projects
+		DESTINATION user
+		COMPONENT FULL
+		PATTERN "*.coatidb" EXCLUDE
 )
+
+INSTALL(DIRECTORY
+		${CMAKE_SOURCE_DIR}/bin/app/data/projects
+		DESTINATION user
+		COMPONENT TRIAL
+)
+
+INSTALL(FILES
+	${CMAKE_SOURCE_DIR}/setup/Linux/coati.desktop
+	${CMAKE_SOURCE_DIR}/setup/Linux/coati-mime.xml
+	DESTINATION setup
+	COMPONENT FULL
+	)
 INSTALL(PROGRAMS
 	${CMAKE_SOURCE_DIR}/setup/Linux/install.sh
 	${CMAKE_SOURCE_DIR}/setup/Linux/deinstall.sh
 	${CMAKE_SOURCE_DIR}/setup/Linux/removeConfigs.sh
 	DESTINATION setup
 	COMPONENT FULL
-)
+	)

 INSTALL(PROGRAMS
 	${CMAKE_SOURCE_DIR}/setup/Linux/Coati_trial.sh
-    DESTINATION .
+	DESTINATION .
 	COMPONENT TRIAL
-)
+	)

 INSTALL(PROGRAMS
-    ${CMAKE_SOURCE_DIR}/setup/Linux/Coati.sh
-    DESTINATION .
+	${CMAKE_SOURCE_DIR}/setup/Linux/Coati.sh
+	DESTINATION .
 	COMPONENT FULL
 )

@@ -147,6 +160,18 @@ INSTALL(PROGRAMS
 	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")
@@ -166,6 +191,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")
@@ -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()
@@ -1,11 +1,34 @@

 # upx
+set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release)
+
+message(STATUS "upx the app")
 execute_process(
-	COMMAND upx --brute ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati -o ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati_upx
+	COMMAND rm ${upxPath}/Coati_upx
+	COMMAND upx --brute ${upxPath}/Coati -o ${upxPath}/Coati_upx
+)
+
+message(STATUS "upx the trial")
+execute_process(
+	COMMAND rm ${upxPath}/Coati_trial_upx
+	COMMAND upx --brute ${upxPath}/Coati_trial -o ${upxPath}/Coati_trial_upx
 )

 execute_process(
-	COMMAND upx --brute ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati_trial -o
-	${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati_trial_upx
+	COMMAND ${upxPath}/Coati -z /home/vagrant/dev/license.txt
 )

+execute_process(
+	COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/tictactoe/tictactoe.coatiproject
+)
+
+execute_process(
+	COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/tutorial/tutorial.coatiproject
+)
+
+#add_custom_command(
+	#OUTPUT Coati_upx
+	#COMMAND upx --brute ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati -o ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release/Coati_upx
+
+	#)
+
@@ -18,5 +18,5 @@ 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
 )
@@ -1,6 +1,8 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoatiPlugin", "CoatiPlugin\CoatiPlugin.csproj", "{A585A530-E120-4C74-934E-D57ED12A7DA9}"
 EndProject
 Global
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
  <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
  </PropertyGroup>
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
@@ -15,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>
--- a/Show More
+++ b/Show More