build: deploy changes

* moved sample projects from data to user folder * added fallback files for app and window settings * implemented copying app and window settings to user folder when not found on app startup * fixed upgrading for windows installer
build: windows installer update
2016-12-14 13:33:17 +01:00 · 2016-12-13 16:51:44 +01:00 · 2016-12-13 12:41:10 +01:00 · 2016-12-13 12:29:42 +01:00 · 2016-12-13 12:25:12 +01:00 · 2016-12-13 11:28:34 +01:00
1449 changed files with 129075 additions and 30410 deletions
@@ -5,6 +5,7 @@
 /bin/app/Debug/
 /bin/app/Release/
 /bin/app/data/projects/ignored/
+/bin/app/data/java/
 /bin/app/user/log/
 /bin/app/user/ApplicationSettings.xml
 /bin/app/user/window_settings.ini
@@ -23,13 +24,16 @@
 /bin/test/data/temp.xml
 /bin/test/data/TestSettings.xml

-/setup/Linux/lib/*
+/java_indexer/bin/
+/java_indexer/lib/
+
+/setup/Linux/lib/

 .DS_Store
 .idea

-/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/bin
-/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/obj
+/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/bin
+/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/obj

 *.coatidb
 *.suo
@@ -40,27 +44,14 @@
 .clang_complete
 .ycm_extra_conf.py
 .ycm_extra_conf.pyc
+coati.coatiproject
 compile_commands.json
+Makefile
+/__pycache__/

-/deployment/windows/CoatiAppSetup/CoatiSetup/Debug
-/deployment/windows/CoatiAppSetup/CoatiSetup/Release
-/deployment/windows/CoatiAppSetup/SetupApplicationSettingsLib/bin/
-/deployment/windows/CoatiAppSetup/SetupApplicationSettingsLib/obj/
-/deployment/windows/CoatiAppSetup/SetupCreateDesktopShortcutLib/bin/
-/deployment/windows/CoatiAppSetup/SetupCreateDesktopShortcutLib/obj/
-/deployment/windows/CoatiAppSetup/SetupCreateStartMenuShortcutLib/bin/
-/deployment/windows/CoatiAppSetup/SetupCreateStartMenuShortcutLib/obj/
-/deployment/windows/CoatiAppSetup/SetupRemoveCacheFiles/bin/
-/deployment/windows/CoatiAppSetup/SetupRemoveCacheFiles/obj/
-
-/deployment/windows/CoatiTrialSetup/CoatiSetup/Debug
-/deployment/windows/CoatiTrialSetup/CoatiSetup/Release
-/deployment/windows/CoatiTrialSetup/SetupApplicationSettingsLib/bin/
-/deployment/windows/CoatiTrialSetup/SetupApplicationSettingsLib/obj/
-/deployment/windows/CoatiTrialSetup/SetupCreateDesktopShortcutLib/bin/
-/deployment/windows/CoatiTrialSetup/SetupCreateDesktopShortcutLib/obj/
-/deployment/windows/CoatiTrialSetup/SetupCreateStartMenuShortcutLib/bin/
-/deployment/windows/CoatiTrialSetup/SetupCreateStartMenuShortcutLib/obj/
-/deployment/windows/CoatiTrialSetup/SetupRemoveCacheFiles/bin/
-/deployment/windows/CoatiTrialSetup/SetupRemoveCacheFiles/obj/
-
+/deployment/windows/wixSetup/bin
+/deployment/windows/wixSetup/build
+/deployment/windows/wixSetup/CustomActions/SetupAppSettings/obj/x86/Release
+/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/obj/x86/Release
+/deployment/windows/wixSetup/Setup/build/Setup/Release
+/deployment/windows/wixSetup/Setup/build/Setup.VC.db
@@ -0,0 +1,31 @@
+Linux64:
+    image: st4ll1/coati_linux_64
+    stage: deploy
+    only:
+        - master
+    script:
+        - ./script/setup.sh
+        - ./script/buildonly.sh all
+        - ./script/buildonly.sh package
+    artifacts:
+        paths:
+            - distr
+        expire_in: 3 days
+
+Linux32:
+    image: st4ll1/coati_linux_32
+    stage: deploy
+    only:
+        - master
+    script:
+        - ./script/setup.sh
+        - ./script/buildonly.sh all
+        - ./bin/app/Release/Coati --licenseFile ./setup/license.txt
+        - cd ./bin/test
+        - ./Release/Coati_test
+        - cd ../..
+        - ./script/buildonly.sh package
+    artifacts:
+        paths:
+            - distr/Coati*.tar.gz
+        expire_in: 3 days
@@ -1,9 +1,6 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.1)

-# 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()
+#set (CMAKE_VERBOSE_MAKEFILE ON)

 include(cmake/add_files.cmake)
 include(cmake/create_source_groups.cmake)
@@ -11,18 +8,16 @@ 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 --------------------------------------------------------------------

 set(PROJECT_NAME Coati)

 set(APP_PROJECT_NAME "${PROJECT_NAME}")
-set(TRIAL_PROJECT_NAME "${PROJECT_NAME}_trial")
 set(LIB_LICENSE_PROJECT_NAME "${PROJECT_NAME}_lib_license")
 set(LIB_GUI_PROJECT_NAME "${PROJECT_NAME}_lib_gui")
-set(LIB_PARSER_PROJECT_NAME "${PROJECT_NAME}_lib_parser")
+set(LIB_CXX_PROJECT_NAME "${PROJECT_NAME}_lib_cxx")
+set(LIB_JAVA_PROJECT_NAME "${PROJECT_NAME}_lib_java")
 set(LIB_PROJECT_NAME "${PROJECT_NAME}_lib")
 set(LICENSE_GENERATOR_PROJECT_NAME "${PROJECT_NAME}_license_generator")
 set(TEST_PROJECT_NAME "${PROJECT_NAME}_test")
@@ -36,26 +31,34 @@ 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 Standard build type to Release
+set(CMAKE_BUILD_TYPE_INIT "Release")
+
 #RPATH
 if(UNIX AND NOT APPLE)
 	set(CMAKE_SKIP_BUILD_RPATH FALSE)
-	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 	set(CMAKE_INSTALL_RPATH "$ORIGIN/lib/:$$ORIGIN/lib/")
-    include(cmake/external.cmake)
+	include(cmake/external.cmake)
 endif()

 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_C_STANDARD 99)
+
+# Settings ---------------------------------------------------------------------
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -fcolor-diagnostics")
+endif()
+
+# For debugging the release build on linux
+#if (UNIX AND "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+	#add_definitions(-fno-omit-frame-pointer)
+#endif ()

 # Clang ------------------------------------------------------------------------

@@ -66,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 "$ENV{LLVM_DIR}/lib/cmake" )
 else()
 	find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build/share/llvm/cmake")
 endif()
@@ -78,135 +81,54 @@ add_definitions(${CLANG_DEFINITIONS})
 # Boost ------------------------------------------------------------------------

 if(UNIX AND NOT APPLE)
-    set(BOOST_ROOT ${EXTERNAL_BUILD}/boost)
+	set(BOOST_ROOT $ENV{BOOST_DIR})
 else()
-    set(BOOST_ROOT $ENV{BOOST_159_DIR})
+	set(BOOST_ROOT $ENV{BOOST_159_DIR})
+	set(Boost_NO_SYSTEM_PATHS ON)
 endif()
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-Set(Boost_NO_SYSTEM_PATHS ON)
 set(BOOST_LIBRARYDIR $ENV{BOOST_159_DIR})

 find_package(Boost 1.59 COMPONENTS system program_options filesystem date_time REQUIRED)

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

 set(BOTAN_VERSION "botan-1.11")

-if(UNIX AND APPLE)
-    find_library(BOTAN ${BOTAN_VERSION} $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
-    find_library(BOTAN_D ${BOTAN_VERSION} $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
+if(APPLE)
+	find_library(BOTAN ${BOTAN_VERSION} $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
+	find_library(BOTAN_D ${BOTAN_VERSION} $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
 elseif(UNIX)
-    find_library(BOTAN ${BOTAN_VERSION} "${EXTERNAL_BUILD}/botan" NO_DEFAULT_PATH)
+	find_library(BOTAN ${BOTAN_VERSION} "${BOTAN_DIR}")
 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()
+message(STATUS "botanversion: ${BOTAN}")
+
 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_BUILD}/botan")
+	find_path(BOTAN_INCLUDE_DIR NAMES botan/botan.h
+		PATH_SUFFIXES ${BOTAN_VERSION}
+		DOC "The Botan include directory")
 else()
-    set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}")
+	set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}/build/include")
 endif()

-# Lib --------------------------------------------------------------------------
+if(NOT BOTAN_INCLUDE_DIR)
+	message(FATAL_ERROR "Botan include dir not found")
+endif()

-#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)
-#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})
@@ -219,23 +141,12 @@ set_property(
 		"${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}
+	${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()
@@ -246,10 +157,103 @@ else()
 	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} optimized ${BOTAN})
 endif()

-# Lib Gui ----------------------------------------------------------------------

-#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
-#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
+# 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_property(
+	TARGET ${LIB_PROJECT_NAME}
+	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib"
+		"${CMAKE_SOURCE_DIR}/src/external"
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
+		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
+		"${CMAKE_SOURCE_DIR}/src/lib_java"
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
+)
+
+target_include_directories(${LIB_PROJECT_NAME} SYSTEM
+	PUBLIC ${Boost_INCLUDE_DIR}
+	"${CMAKE_SOURCE_DIR}/src/external"
+)
+
+target_link_libraries(${LIB_PROJECT_NAME} ${Boost_LIBRARIES} ${LIB_LICENSE_PROJECT_NAME})
+
+
+# Lib Cxx -------------------------------------------------------------------
+
+add_subdirectory(src/lib_cxx)
+
+set_source_files_properties(${CLANG_FILES} PROPERTIES COMPILE_FLAGS "-fno-rtti")
+
+add_library(${LIB_CXX_PROJECT_NAME} ${CLANG_FILES} ${LIB_CXX_FILES})
+
+create_source_groups(${CLANG_FILES})
+create_source_groups(${LIB_CXX_FILES})
+
+set_property(
+	TARGET ${LIB_CXX_PROJECT_NAME}
+	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
+		"${CMAKE_SOURCE_DIR}/src/lib"
+)
+
+target_include_directories(${LIB_CXX_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_CXX_PROJECT_NAME} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBS})
+
+
+# Lib Java -------------------------------------------------------------------
+
+find_package(JNI)
+
+add_subdirectory(src/lib_java)
+
+add_library(${LIB_JAVA_PROJECT_NAME} ${LIB_JAVA_FILES})
+
+create_source_groups(${LIB_JAVA_FILES})
+
+set_property(
+	TARGET ${LIB_JAVA_PROJECT_NAME}
+	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib_java"
+		"${CMAKE_SOURCE_DIR}/src/lib"
+)
+
+target_include_directories(${LIB_JAVA_PROJECT_NAME} SYSTEM
+	PUBLIC ${JNI_INCLUDE_DIRS}
+	${Boost_INCLUDE_DIRS}
+)
+
+link_directories(${Boost_LIBRARY_DIRS})
+
+add_custom_command(
+	TARGET ${LIB_JAVA_PROJECT_NAME}
+	PRE_BUILD
+	COMMAND ${PROJECT_SOURCE_DIR}/script/update_java_indexer.sh
+	COMMENT "updating java indexer jars"
+)
+
+
+# Lib Gui ----------------------------------------------------------------------

 add_subdirectory(src/lib_gui)

@@ -259,15 +263,11 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)

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

 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)
@@ -275,11 +275,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
@@ -297,7 +297,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)
@@ -307,23 +307,17 @@ create_source_groups(${LIB_GUI_FILES})
 set_property(
 	TARGET ${LIB_GUI_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/src/lib"
-		"${CMAKE_SOURCE_DIR}/src/lib_gui"
+		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
-)
-
-set_target_properties(
-	${LIB_GUI_PROJECT_NAME}
-	PROPERTIES
-		DEBUG_OUTPUT_NAME ${LIB_GUI_PROJECT_NAME}_d
-		RELEASE_OUTPUT_NAME ${LIB_GUI_PROJECT_NAME}
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
 )

 # include external header without warnings
 target_include_directories(${LIB_GUI_PROJECT_NAME} SYSTEM
 		PUBLIC "${CMAKE_SOURCE_DIR}/src/external"
-		PUBLIC ${BOTAN_INCLUDE_DIR}
 		PUBLIC ${Boost_INCLUDE_DIRS}
 )

@@ -339,8 +333,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
@@ -368,7 +362,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} ${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,12 +372,12 @@ 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})
 endif ()

 create_source_groups(${APP_FILES})

-target_link_libraries(${APP_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})
+target_link_libraries(${APP_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_CXX_PROJECT_NAME} ${LIB_JAVA_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})

 set_property(
 	TARGET ${APP_PROJECT_NAME}
@@ -392,9 +386,11 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
-		"${CMAKE_SOURCE_DIR}/src/lib_parser"
+		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
+		"${CMAKE_SOURCE_DIR}/src/lib_java"
 		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
-		"${CMAKE_SOURCE_DIR}/build/src/app"
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
+		#"${CMAKE_SOURCE_DIR}/build/src/app"
 )

 target_include_directories(${APP_PROJECT_NAME} SYSTEM
@@ -412,70 +408,6 @@ if (APPLE)
 	target_link_libraries(${APP_PROJECT_NAME} ${CORE_FOUNDATION})
 endif ()

-# Trial ---------------------------------------------------------------------
-
-if (UNIX)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/${CMAKE_BUILD_TYPE})
-else ()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/)
-endif ()
-
-add_subdirectory(src/trial)
-
-# Find includes in corresponding build directories
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-if (WIN32)
-	file(WRITE ${CMAKE_SOURCE_DIR}/build/Coati.rc
-		"// Icon with lowest ID value placed first to ensure application icon\n"
-		"// remains consistent on all systems.\n"
-		"IDI_ICON1               ICON                    \"${CMAKE_SOURCE_DIR}/build/coati.ico\"\n"
-	)
-	add_executable(${TRIAL_PROJECT_NAME} ${TRIAL_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc)
-
-	# hide the console when running a release build.
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE")
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "_CONSOLE")
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE "/ENTRY:\"mainCRTStartup\" /SUBSYSTEM:WINDOWS")
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
-
-else ()
-	add_executable(${TRIAL_PROJECT_NAME} ${TRIAL_FILES} ${GEN_FILES})
-endif ()
-
-create_source_groups(${TRIAL_FILES})
-
-target_link_libraries(${TRIAL_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} )
-
-if(UNIX AND NOT APPLE)
-	target_link_libraries(${TRIAL_PROJECT_NAME} pthread dl rt)
-endif()
-
-set_property(
-	TARGET ${TRIAL_PROJECT_NAME}
-	PROPERTY INCLUDE_DIRECTORIES
-		"${CMAKE_SOURCE_DIR}/src/trial"
-		"${CMAKE_SOURCE_DIR}/src/lib"
-		"${CMAKE_SOURCE_DIR}/src/lib_gui"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
-)
-
-target_include_directories(${TRIAL_PROJECT_NAME} SYSTEM
-		PUBLIC "${CMAKE_SOURCE_DIR}/src/external"
-		PUBLIC ${Boost_INCLUDE_DIRS}
-)
-
-# Use the Widgets module from Qt 5.
-qt5_use_modules(${TRIAL_PROJECT_NAME} Widgets)
-qt5_use_modules(${TRIAL_PROJECT_NAME} Network)
-
-# add platform specific libraries
-if (APPLE)
-	find_library(CORE_FOUNDATION CoreFoundation)
-	target_link_libraries(${TRIAL_PROJECT_NAME} ${CORE_FOUNDATION})
-endif ()

 # MacOSX Bundle ----------------------------------------------------------------

@@ -519,12 +451,6 @@ if (APPLE)
 		@ONLY
 	)

-	configure_file(
-		${PROJECT_SOURCE_DIR}/setup/MacOSX/Info_trial.plist.in
-		${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bundle_info_trial.plist
-		@ONLY
-	)
-
 endif ()

 # License Generator  --------------------------------------------------------
@@ -567,11 +493,7 @@ endif ()

 add_subdirectory(src/test)

-if(UNIX AND NOT APPLE)
-    set(CXXTEST_INCLUDE_DIR ${EXTERNAL_SRC}/cxxtest)
-else()
-    set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
-endif()
+set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
 set(CXXTEST_PYTHON_TESTGEN_EXECUTABLE ${CXXTEST_INCLUDE_DIR}/bin/cxxtestgen)
 set(TESTGEN_FILE ${CMAKE_CURRENT_BINARY_DIR}/test_main.cpp)

@@ -581,7 +503,7 @@ add_executable (${TEST_PROJECT_NAME} ${TESTGEN_FILE} ${TEST_FILES} )

 create_source_groups(${TEST_FILES})

-target_link_libraries(${TEST_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})
+target_link_libraries(${TEST_PROJECT_NAME} ${LIB_CXX_PROJECT_NAME} ${LIB_JAVA_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})

 find_package(CxxTest)
 if (CXXTEST_FOUND)
@@ -590,10 +512,11 @@ if (CXXTEST_FOUND)
 		PROPERTY INCLUDE_DIRECTORIES
 			"${CXXTEST_INCLUDE_DIR}"
 			"${CMAKE_SOURCE_DIR}/src/lib"
-			"${CMAKE_SOURCE_DIR}/src/lib_parser"
+			"${CMAKE_SOURCE_DIR}/src/lib_cxx"
+			"${CMAKE_SOURCE_DIR}/src/lib_java"
 			"${CMAKE_SOURCE_DIR}/src/external"
 			"${CMAKE_SOURCE_DIR}/src/lib_license"
-			${Boost_INCLUDE_DIRS}
+			"${Boost_INCLUDE_DIRS}"
 	)
 endif (CXXTEST_FOUND)

@@ -618,6 +541,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,68 +1,74 @@
-### Masterproject
+## Coati

-#### Setup
+### Setup

-##### External Software
+#### External Software

-* QT 5.5
+* JDK 1.8
+* 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
+* Botan 1.11.34

-##### Environment Variables
+also something about java, but who knows...

-* QT_DIR - ...\Qt\Qt5.2.1\5.2.1\<IDE>\
-* CXX_TEST_DIR - .../cxxtest-4.3/
-* CLANG_DIR - .../clang-llvm/
+#### Environment Variables
+
+* 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
+* BOTAN_DIR - .../Botan-1.11.34

 For Win32:
 * VLD_DIR - .../Visual Leak Detector
-* path - apped path to git.exe
+* path
+	- apped path to git.exe
+	- apped path to jdk/bin

-###### Botan setup
+##### Botan setup

 Build release lib in ${BOTAN_DIR}/release
 Build debug lib in ${BOTAN_DIR}/debug

 for Windows release build:
-$ python configure.py --cc=msvc --cpu=x86_32 --via-amalgamation --disable-shared
+$ python configure.py --cc=msvc --cpu=x86_32 --disable-shared

 for Windows debug build:
-python configure.py --cc=msvc --cpu=x86_32 --via-amalgamation --disable-shared --no-optimizations --with-debug-info
+python configure.py --cc=msvc --cpu=x86_32 --disable-shared --no-optimizations --with-debug-info

-for other:
-$ python configure.py --via-amalgamation --disable-shared
+for Mac:
+$ python configure.py --disable-shared --disable-modules=darwin_secrandom

-##### Settings
+for Linux:
+$ python configure.py --disable-shared
+
+#### Settings

 Run setup script:
 $ ./script/setup.sh

-#### Release
+### Release

-##### App
+#### App
 * create release build
 * make sure it uses the Coati icon
 * obfuscate the executable using upx

-##### Data folder
+#### Data folder
 * put data folder in working directory
 * add empty log folder
 * add working tictactoe.xml project to /projects/tictactoe with sources in /projects/tictactoe/src
 * add empty app settings with one recent project tictactoe.xml
 * leave window_settings.ini with correct Coati start layout

-##### Package
+#### Package
 * add app
 * add web/coati_manual.pdf to package

-##### Updating Clang on UNIX
+#### Updating Clang on UNIX

 $ cd .../clang_llvm

@@ -83,130 +89,368 @@ $ 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
+### Loader gif creation from png sequence

-##### 0.3.0
+// from png sequence
+convert -delay 3 -loop 0 coati_*.png coati.gif

-* 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
+// less colors
+gifsicle --colors 255 coati.gif > color.gif

-##### 0.4.0
+// crop size
+gifsicle --crop 0,5+0x-5 color.gif > crop.gif

-* 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
+// add transparency
+gifsicle --unoptimize --disposal=previous --transparent="#FFFFFF" crop.gif > trans.gif

-##### 0.5.0.4
+// resize
+gifsicle --resize-height 18 trans.gif > loader.gif

-* 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
+### Changelog

-##### 0.5.1.21
+#### 0.9.22
+released 2016-10-27
+
+* Windows: Added logging and exception handling to VS plugin
+* Windows: Added VC++ runtime dlls for windows installer
+* Windows: Added missing VC++ runtime dlls (issue #231)
+* Added setting for default graph zoom on mouse wheel to preferences (issue #237)
+* Scroll errors table to newest error during indexing
+* Fixed best scoring for search autocompletions skipped some combinations
+* Fixed flickering of errors table when indexing
+* Don't show error snippets in overview screen anymore
+* Fixed crash when Project Paths contain files and lazy include search in enabled (issue #201)
+* Fixed edge cases that caused deadlocks in indexing
+* Added language specific project icons to start screen
+* Fixed application couldn't be quit when start screen was showing (issue #227)
+* Graph: Fixed missing image file ending when exporting graph for Linux
+* Log Coati version when logging gets enabled
+* Fixed non-indexed errors filter in errors table
+
+#### 0.9.0
+released 2016-10-14
+
+* Extended Visual Studio Plugin to export clang Compilation Databases
+* Implemented new installer for Windows
+* Run System Header Include Paths and Java Path detection when starting application
+* Added Log Window with Errors tab showing a table of all errors
+* Added filters to bottom of error table to define which errors are displayed
+* Removed ring logging and use one log file again instead
+* Smaller indexing progress dialog with bar in the middle instead of golden ratio
+* Code: Set default code snippet expand range to 3 lines for more context
+* Graph: Fixed undoing of aggregation edge activation caused crash
+* Graph: Move aggregation and inheritance edges to front when hovered or active
+* Graph: Push parent nodes of active nodes to back to make all incoming and outgoing edges visible
+* Properly quit application when window is closed while confirm box is open
+* Properly quit application when window is closed while indexing (issue #121)
+* Graph: Count only top level nodes in bundle nodes of graph
+* Search: Improved scoring of autocompletion matches to use best score for match
+* App will go into trial mode without valid license
+* Java: Auto detect java root source directories
+* Fixed refresh crash (issue #220)
+* Java: improved indexer reliability a lot
+* Java: Changed name of generic type to use name of declaration
+* Fixed project refresh does not recognize removed source paths
+* Java: Define maximum allocated jvm memory in preferences
+* Follow symbolic directory links within source paths (issue #205)
+* Use white size grip in blue dialogs
+* Graph: Use type node colors for undefined nodes
+* Java: Show import not found as error
+* Code: Select and copy source code in code view with SHIFT + mouse drag (issue #7)
+* Code: Added markers next to line numbers in code view showing active locations and scopes
+* Merged app and trial to one build
+
+#### 0.8.21
+released 2016-09-16
+
+* Added options for checking multiple paths in Indexed Header Paths dialog during project setup from Compilation Database #190
+* Added all C/C++ standards supported by clang
+* Fixed C language setting in empty project setup not propagated to indexer #177
+* Added Sublime plugin to Sublime Text Package Control
+* Improved indexer parallelization for faster indexing
+* Changed all font-sizes to px for similar look on all platforms
+* Added font face dropdown to Preferences showing all available monospace fonts #172
+* Smoother font rendering on Windows by setting font engine to FreeType via qt.conf file #137
+* Interrupt indexing while AST visiting for C/C++ for shorter waiting time
+* Save graph as PNG image via context menu in graph view #180
+* Added base folder to Linux package #181
+* Use inverted golden ratio in indexing progress dialog
+
+#### 0.8.0
+released 2016-09-01
+
+* Improved titles and help texts in project setup UI
+* Fixed error locations not saved with absolute file paths in Compilation Database projects
+* Added missing source files extensions setting to the Edit Project dialog #132
+* Changed default text colors to black in project setup UI #140
+* Added plugin ports settings to Preferences #145
+* Improved project state handling on refreshing
+* Added Java sample project JavaParser: http://javaparser.org/
+* Fixed regex for system includes used wrongly in syntax highlighter
+* Added setting to disable file and console logging, default is off #157
+* Added migrations between different ApplicationSettings versions
+* Added auto detection for Java library to Preferences
+* Removed auto refresh option from Search view
+* Added progress dialogs for indexing and block UI #143
+* Hide name qualifiers for graph nodes in Java projects
+* Added handling when java library not found
+* Added plain text editing dialog to path list boxes
+* Use language dependent symbol name delimiter in UI
+* Added scroll speed setting to preferences #112
+* Added Java project setup UI
+* Record start and end locations of scopes in Java
+* Display unresolved types names in Java as 'unresolved-type'
+* Cache stats for overview to speed up display
+* Fixed graph nodes to restore their expand state when going back #118
+* Added shortcuts for navigating to next and previous reference in code view
+* Pressing Tab in search completes up to next ::, Delete erases to last :: #133
+* Bundle anonymous namespaces separately in graph overview #126
+* Added 'Show Data Folder' and 'Show Log Folder' items to Help menu
+* Added new status bar loader gif with higher resolution
+* Record type aliases in C++
+* Added Java indexer
+* Changed public icon in graph and added default icon
+* Scroll to file location when finding no symbol at specified location from plugin message
+* Added shortcut for Preferences on Windows/Linux
+* Leave code view at original line when expanding scopes
+* Pan graph view to center on name of active symbol after activation
+* Moved color scheme selection to Preferences
+* Moved Preferences menu item to Edit menu on Windows/Linux #113
+* Added setting for hiding non-fatal errors in unindexed files to preferences, turned on by default
+* Fixed file out-of-date asterisk disappearing when showing snippets after minimize state
+* Implemented Atom plugin: https://github.com/CoatiSoftware/atom-coati
+* Implemented CLion/IntelliJ plugin: https://github.com/CoatiSoftware/idea-coati
+* Implemented Eclipse plugin: https://github.com/CoatiSoftware/eCoati
+* Implemented emacs plugin: https://github.com/CoatiSoftware/emacs-coati
+* Improved code view rendering times
+* Don't show implicit nodes in search auto completion list
+
+
+#### 0.7.0.22
+released 2016-07-07
+
+* Fixed detected global header search paths lost correct order and caused problems with #include_next directives
+* Fixed MaxOSX build crashed on launch due to unknown command line option passed
+* Removed 'Save Project' and 'Save Project As' actions from menu
+* Fixed indexer getting stuck at 'building caches' when indexing is interrupted
+* Fixed database not properly closed when errors appeared during indexing
+* Fixed autocompletions popup flickering while typing
+* Added resize grip to bottom right corner of every dialog window
+* Fixed 'paths don't exist' dialog window getting too big with lots of paths shown
+* Added context menu with 'back' and 'forward' actions available in all views
+* Removed Clang compiler warnings from console output
+* Added handling of project specific VS macros to VS solution parser
+
+#### 0.7.0.0
+released 2016-06-15
+
+* Updated to clang 3.8
+* Fixed crash in search autocompletion retrieval due to edge case in sorting
+* Fixed size policies in code view to avoid global scrollbar
+* Added full text search via search field: ?<query> for case-insensitive search, ??<query> for case-sensitive search
+* Made initialization for full text search lazy: done on first full text search
+* Defined full text search color in all color schemes
+* Increased code view performance by caching file IDs and paths
+* Added multithreaded indexing. Number of threads can be set in the Preferences UI, default is 4
+* Reworked graph node bundling to only distinguish defined and undefined nodes in each bucket
+* Made graph node sorting alphabetical and put bundles at end
+* Changed code view snippet sorting to always show definition on top
+* Fixed local symbols were not available within lambdas
+* Added settings for font family, font size and tab with to Preferences UI
+* Fixed VS solution parser issue with internal macros
+* Removed header extensions, all included files within the project paths are now analyzed
+* Fixed crash in sqlite when symbol name has special characters
+* Improved code view performance by reducing amount of initially open code files
+* Improved graph view performance through faster data retrieval and smarter structures
+* Increased aggregation click speed with faster edge id retrieval
+* Fixed png color profiles to avoid console warning: "libpng warning: iCCP: known incorrect sRGB profile"
+* Fixed graph edge drawn wrong when leaving from child node of smaller node
+* Fixed Sublime Text Plugin issue with wrong encoding
+* Randomized source file order for multithreaded analysis to increase performance
+* Show name of removed symbol when going back after refreshing
+* Fixed macro definition not connected to file
+* Fixed macro use not found in #ifdef, #ifndef, defined() and some expand cases
+* Removed back and forward steps for some graph and code view manipulations
+* Fixed code view style broken on Mac due to change of working directory when analyzing compilation database
+* Added database optimization step after indexing to reduce database size by ~25%
+* Fixed artifacts after graph view change by clearing view
+* Fixed autocompletion list highlights at wrong location for long names
+* Allow files and directories to be excluded from analysis in advanced settings for project setup
+* Added Qt gif plugin to Mac Release so that loader gif in status bar is visible
+* Added link to download page to start screen to remind users of updating once in a while
+* Check if compilation database still exists before refreshing
+* Added separate step for defining project name, project location and compiliation database to project setup
+* Explain that the project stays up-to-date with the compilation databes on refresh in project setup UI
+* Disregard source extensions when loading from compilation database
+* Removed error logs in name resolver
+* Added plugin for VIM: https://github.com/CoatiSoftware/vim-coati
+
+#### 0.6.0.0
+released 2016-04-27
+
+* Smoother graph panning and zooming on keyboard using update loop
+* Differentiate between explicit and implicit nodes and only show implicit nodes in the graph view when connected
+* Improved file clearing performance on project refresh
+* Show deleted projects on the start screen and show messagebox to delete them
+* Show analysis duration in hh:mm:ss
+* Added suppport for temporary test licenses and show error message when it expired
+* Increased graph performance by reducing to fixed number of requests
+* Add vs-clang compatibility flags when creating project from Visual Studio solution
+* Increased graph edge drawing performance
+* Added auto detection for system header paths to project wizard and preferences when using gcc, clang or vs compilers
+* Added bug tracker to help menu
+* Increased search autocompletion performance to stay mostly below 100ms
+* Changed style of aggregation edge to cleaner look
+* Allow certain edge types to enter and leave at top and bottom of nodes as well e.g. inheritance
+* Increased project load performance
+* Increased graph creation performance for overview screen
+* Changed namespace activation to show the namespace name in the search bar and the namespace definitions in the code view
+* Updated to Qt 5.6
+* Added analysis for local symbols and allow selecting them in the code view
+* Improved error display performance by not expanding all of them at once
+* Added home button next to search field for showing the project overview
+* Added shortcut and menu item to show project overview
+* Fixed Path boxes not sized correctly when switching back and forth in the project wizard
+* Allow support for environment variables in project setup with syntax ${VARIABLE_NAME}
+* Show quit button on license enter screen when no valid license was entered yet
+* Allow color schemes to define text colors for code view highlights
+* Added support for function pointers to analysis
+* Added Windows system dlls to installer on Windows so users don't not need to install the redistributable package
+* Changed style of out-of-date files to be followed by *
+* Set Qt flag for high DPI scaling
+* Check analyzed paths for existence in project wizard
+* Inform the user about project changes and ask before reparsing the project
+* Removed "simple setup" step in project wizard and added "lazy include search"-checkbox
+* Edit the project settings by clicking the project name in the overview stats
+* Added welcome message to Coati trial
+* Defined new highlight colors for code view in all color schemes
+
+#### 0.5.1.21
+released 2016-03-16

-* 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
@@ -7,6 +7,8 @@
 <!-- COLOR: int int int int - rgba e.g. 125 125 125 255 -->

 <config>
+	<version><!-- INTEGER: Version number --></version>
+
 	<info>
 		<description><!-- STRING: optional description shown in overview. Symbols can be linked with syntax [main] --></description>
 	</info>
@@ -35,12 +37,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>
@@ -173,11 +173,14 @@

 			<!-- OPTIONAL: type specific node colors can be overriden by using the TEMPLATE within a type tag below -->
 			<type></type>
+			<builtin_type></builtin_type>
 			<class></class>
+			<interface></interface>
 			<struct></struct>
 			<enum></enum>
 			<typedef></typedef>
 			<template_parameter_type></template_parameter_type>
+			<type_parameter></type_parameter>

 			<function></function>
 			<method></method>
@@ -188,6 +191,7 @@

 			<undefined></undefined>
 			<namespace></namespace>
+			<package></package>

 			<file></file>
 			<macro></macro>
@@ -13,31 +13,60 @@
 		</button>

 		<field>
-			<text>#3D3D3D</text>
+			<text>#FFFFFF</text>
 			<background>#808080</background>
 			<highlight>#B1B1B1</highlight>
 		</field>

 		<popup>
 			<text>#3D3D3D</text>
-			<by_text>#A0A0A0</by_text>
+			<by_text>#808080</by_text>
 			<background>#CCCCCC</background>
 			<highlight>#FFFFFF</highlight>
+			<line>#B1B1B1</line>
 		</popup>

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

@@ -72,7 +101,9 @@

 			<line_number>
 				<text>#C4C4C4</text>
+				<inactive_text>#A0A0A0</inactive_text>
 				<background>#494949</background>
+				<marker>#C4C4C4</marker>
 			</line_number>

 			<syntax>
@@ -87,49 +118,68 @@
 			</syntax>

 			<selection>
-				<location>
+				<text>black</text>
+				<background>#CCCCCC</background>
+			</selection>
+
+			<annotation>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#EDEDED</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#4A4A4A</fill>
+						<border>#EDEDED</border>
+						<fill>#EDEDED</fill>
+						<text>#262626</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#9BDAFF</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
-					<focus>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</active>
 				</scope>
 				<error>
 					<normal>
 						<border>transparent</border>
 						<fill>#A0FF0000</fill>
+						<text>#000000</text>
 					</normal>
 					<focus>
-						<border>transparent</border>
 						<fill>#FFFF0000</fill>
 					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>#FFFF0000</fill>
-					</active>
 				</error>
-			</selection>
+				<fulltext>
+					<normal>
+						<fill>#C2AFEF</fill>
+						<text>#3D3D3D</text>
+					</normal>
+					<focus>
+						<fill>#987CEA</fill>
+					</focus>
+				</fulltext>
+			</annotation>
 		</snippet>
 	</code>

@@ -167,9 +217,15 @@
 					<normal>#FFFFFF</normal>
 				</icon>
 			</type>
+			<builtin_type>
+				<like>type</like>
+			</builtin_type>
 			<class>
 				<like>type</like>
 			</class>
+			<interface>
+				<like>type</like>
+			</interface>
 			<struct>
 				<like>type</like>
 			</struct>
@@ -182,6 +238,9 @@
 			<template_parameter_type>
 				<like>type</like>
 			</template_parameter_type>
+			<type_parameter>
+				<like>type</like>
+			</type_parameter>

 			<function>
 				<fill>
@@ -221,18 +280,26 @@
 			</enum_constant>

 			<undefined>
+				<like>type</like>
+			</undefined>
+			<namespace>
 				<fill>
-					<normal>#EE7326</normal>
-					<focus>#EE8A4C</focus>
+					<normal>#873E3E</normal>
 				</fill>
 				<border>
 					<normal>#80FFFFFF</normal>
 					<focus>#FFFFFF</focus>
 				</border>
-			</undefined>
-			<namespace>
-				<like>undefined</like>
+				<text>
+					<normal>#FFFFFF</normal>
+				</text>
+				<icon>
+					<normal>#FFFFFF</normal>
+				</icon>
 			</namespace>
+			<package>
+				<like>namespace</like>
+			</package>

 			<file>
 				<fill>
@@ -243,6 +310,12 @@
 					<normal>#20FFFFFF</normal>
 					<focus>#FFFFFF</focus>
 				</border>
+				<text>
+					<normal>#FFFFFF</normal>
+				</text>
+				<icon>
+					<normal>#FFFFFF</normal>
+				</icon>
 			</file>
 			<macro>
 				<like>file</like>
@@ -279,6 +352,17 @@
 					<normal>#CCCCCC</normal>
 				</text>
 			</count_number>
+			<qualifier>
+				<fill>
+					<normal>#873E3E</normal>
+				</fill>
+				<border>
+					<normal>#FFFFFF</normal>
+				</border>
+				<text>
+					<normal>#FFFFFF</normal>
+				</text>
+			</qualifier>
 		</node>
 		<edge>
 			<default>
@@ -297,18 +381,21 @@
 				<normal>#2A6484</normal>
 			</use>

-			<template_parameter>
-				<normal>#C1305D</normal>
-			</template_parameter>
 			<template_argument>
 				<normal>#C1305D</normal>
 			</template_argument>
+			<type_argument>
+				<like>template_argument</like>
+			</type_argument>
 			<template_default_argument>
-				<normal>#C1305D</normal>
+				<like>template_argument</like>
 			</template_default_argument>
 			<template_specialization>
-				<normal>#C1305D</normal>
+				<like>template_argument</like>
 			</template_specialization>
+			<template_member_specialization>
+				<like>template_argument</like>
+			</template_member_specialization>

 			<include>
 				<normal>#4E82F6</normal>
@@ -323,4 +410,26 @@
 			</aggregation>
 		</edge>
 	</graph>
+	<table>
+		<background>#494949</background>
+		<table>#C4C4C4</table>
+		<text>
+			<normal>#C4C4C4</normal>
+			<active>black</active>
+		</text>
+		<table_line_1>
+			<normal>#494949</normal>
+			<active>#7B7B7B</active>
+		</table_line_1>
+		<table_line_2>
+			<normal>#383838</normal>
+			<active>#7B7B7B</active>
+		</table_line_2>
+	</table>
+	<tab>
+		<background>#494949</background>
+		<active>#C4C4C4</active>
+		<hover>#878787</hover>
+		<text>#878787</text>
+	</tab>
 </config>
@@ -20,24 +20,53 @@

 		<popup>
 			<text>black</text>
-			<by_text>#A0A0A0</by_text>
+			<by_text>#626262</by_text>
 			<background>white</background>
-			<highlight>#B2B2B2</highlight>
+			<highlight>#D0D0D0</highlight>
+			<line>#E0E0E0</line>
 		</popup>

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

@@ -72,7 +101,9 @@

 			<line_number>
 				<text>black</text>
+				<inactive_text>#A0A0A0</inactive_text>
 				<background>white</background>
+				<marker>#A0A0A0</marker>
 			</line_number>

 			<syntax>
@@ -87,49 +118,66 @@
 			</syntax>

 			<selection>
-				<location>
+				<text>black</text>
+				<background>#E0E0E0</background>
+			</selection>
+
+			<annotation>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#8E8E8E</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#EDEDED</fill>
+						<border>#A0A0A0</border>
+						<fill>#A0A0A0</fill>
+						<text>#FFFFFF</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#AAE0FF</border>
+						<fill>#C6EAFF</fill>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#C6EAFF</fill>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
-					<focus>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</active>
 				</scope>
 				<error>
 					<normal>
 						<border>transparent</border>
 						<fill>#80FF0000</fill>
+						<text>#000000</text>
 					</normal>
 					<focus>
-						<border>transparent</border>
 						<fill>#FFFF0000</fill>
 					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>#FFFF0000</fill>
-					</active>
 				</error>
-			</selection>
+				<fulltext>
+					<normal>
+						<fill>#C7C7E2</fill>
+						<text>#000000</text>
+					</normal>
+					<focus>
+						<fill>#ABABDD</fill>
+					</focus>
+				</fulltext>
+			</annotation>
 		</snippet>
 	</code>

@@ -161,9 +209,15 @@
 					<focus>#3C3C3C</focus>
 				</border>
 			</type>
+			<builtin_type>
+				<like>type</like>
+			</builtin_type>
 			<class>
 				<like>type</like>
 			</class>
+			<interface>
+				<like>type</like>
+			</interface>
 			<struct>
 				<like>type</like>
 			</struct>
@@ -176,6 +230,9 @@
 			<template_parameter_type>
 				<like>type</like>
 			</template_parameter_type>
+			<type_parameter>
+				<like>type</like>
+			</type_parameter>

 			<function>
 				<fill>
@@ -209,17 +266,23 @@
 			</enum_constant>

 			<undefined>
-				<fill>
-					<normal>#CC8D91</normal>
-				</fill>
-				<border>
-					<normal>#803C3C3C</normal>
-					<focus>#3C3C3C</focus>
-				</border>
+				<like>type</like>
 			</undefined>
 			<namespace>
-				<like>undefined</like>
+				<fill>
+					<normal>#EFC5C5</normal>
+				</fill>
+				<border>
+					<normal>#3D3D3D</normal>
+					<focus>black</focus>
+				</border>
+				<icon>
+					<normal>#3D3D3D</normal>
+				</icon>
 			</namespace>
+			<package>
+				<like>namespace</like>
+			</package>

 			<file>
 				<fill>
@@ -260,6 +323,17 @@
 					<normal>#5C5C5C</normal>
 				</text>
 			</count_number>
+			<qualifier>
+				<fill>
+					<normal>#EFC5C5</normal>
+				</fill>
+				<border>
+					<normal>#3D3D3D</normal>
+				</border>
+				<text>
+					<normal>black</normal>
+				</text>
+			</qualifier>
 		</node>
 		<edge>
 			<default>
@@ -278,26 +352,51 @@
 				<normal>#3190BA</normal>
 			</use>

-			<template_parameter>
-				<normal>#C1305D</normal>
-			</template_parameter>
 			<template_argument>
-				<like>template_parameter</like>
+				<normal>#C1305D</normal>
 			</template_argument>
+			<type_argument>
+				<like>template_argument</like>
+			</type_argument>
 			<template_default_argument>
-				<like>template_parameter</like>
+				<like>template_argument</like>
 			</template_default_argument>
 			<template_specialization>
-				<like>template_parameter</like>
+				<like>template_argument</like>
 			</template_specialization>
 			<template_member_specialization>
-				<like>template_parameter</like>
+				<like>template_argument</like>
 			</template_member_specialization>

 			<aggregation>
-				<normal>#EEE</normal>
-				<focus>#DDD</focus>
+				<normal>#DDD</normal>
+				<focus>#CCC</focus>
 			</aggregation>
 		</edge>
 	</graph>
+	<error>
+		<background>white</background>
+	</error>
+	<tab>
+		<background>white</background>
+		<active>black</active>
+		<hover>#878787</hover>
+		<text>#878787</text>
+	</tab>
+	<table>
+		<background>white</background>
+		<table>#aaa</table>
+		<text>
+			<normal>black</normal>
+			<active>white</active>
+		</text>
+		<table_line_1>
+			<normal>white</normal>
+			<active>grey</active>
+		</table_line_1>
+		<table_line_2>
+			<normal>#F1F1F1</normal>
+			<active>grey</active>
+		</table_line_2>
+	</table>
 </config>
@@ -22,22 +22,51 @@
 			<text>#F7F7F7</text>
 			<by_text>#A0A0A0</by_text>
 			<background>#272728</background>
-			<highlight>#555555</highlight>
+			<highlight>#333333</highlight>
+			<line>#444444</line>
 		</popup>

 		<query>
 			<none>
-				<normal>#2F2F2F</normal>
-				<hover>black</hover>
+				<normal>
+					<fill>#2F2F2F</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>black</fill>
+					<text>#F7F7F7</text>
+				</hover>
 			</none>
 			<command>
-				<normal>#406D4D</normal>
-				<hover>#4E855E</hover>
+				<normal>
+					<fill>#406D4D</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>#4E855E</fill>
+					<text>#F7F7F7</text>
+				</hover>
 			</command>
 			<operator>
-				<normal>#7D2724</normal>
-				<hover>#8C2B29</hover>
+				<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>

@@ -72,7 +101,9 @@

 			<line_number>
 				<text>#F7F7F7</text>
+				<inactive_text>#A0A0A0</inactive_text>
 				<background>#272728</background>
+				<marker>#969696</marker>
 			</line_number>

 			<syntax>
@@ -87,49 +118,69 @@
 			</syntax>

 			<selection>
-				<location>
+				<text>white</text>
+				<background>#777777</background>
+			</selection>
+
+			<annotation>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#F7F7F7</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#4A4A4A</fill>
+						<border>transparent</border>
+						<fill>#F7F7F7</fill>
+						<text>#272728</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#A0A0A0</border>
+						<fill>#969696</fill>
+						<text>#191919</text>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#969696</fill>
+						<text>#272728</text>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
-					<focus>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</active>
 				</scope>
 				<error>
 					<normal>
 						<border>transparent</border>
 						<fill>#A0FF0000</fill>
+						<text>#000000</text>
 					</normal>
 					<focus>
-						<border>transparent</border>
 						<fill>#FFFF0000</fill>
 					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>#FFFF0000</fill>
-					</active>
 				</error>
-			</selection>
+				<fulltext>
+					<normal>
+						<fill>#207EA8</fill>
+						<text>#F7F7F7</text>
+					</normal>
+					<focus>
+						<border>#006D93</border>
+						<fill>#134B63</fill>
+					</focus>
+				</fulltext>
+			</annotation>
 		</snippet>
 	</code>

@@ -161,36 +212,30 @@
 					<focus>#C3C3C3</focus>
 				</border>
 			</type>
+			<builtin_type>
+				<like>type</like>
+			</builtin_type>
 			<class>
-				<border>
-					<normal>#20C3C3C3</normal>
-					<focus>#C3C3C3</focus>
-				</border>
+				<like>type</like>
 			</class>
+			<interface>
+				<like>type</like>
+			</interface>
 			<struct>
-				<border>
-					<normal>#20C3C3C3</normal>
-					<focus>#C3C3C3</focus>
-				</border>
+				<like>type</like>
 			</struct>
 			<enum>
-				<border>
-					<normal>#20C3C3C3</normal>
-					<focus>#C3C3C3</focus>
-				</border>
+				<like>type</like>
 			</enum>
 			<typedef>
-				<border>
-					<normal>#20C3C3C3</normal>
-					<focus>#C3C3C3</focus>
-				</border>
+				<like>type</like>
 			</typedef>
 			<template_parameter_type>
-				<border>
-					<normal>#20C3C3C3</normal>
-					<focus>#C3C3C3</focus>
-				</border>
+				<like>type</like>
 			</template_parameter_type>
+			<type_parameter>
+				<like>type</like>
+			</type_parameter>

 			<function>
 				<fill>
@@ -224,6 +269,9 @@
 			</enum_constant>

 			<undefined>
+				<like>type</like>
+			</undefined>
+			<namespace>
 				<fill>
 					<normal>#78282D</normal>
 				</fill>
@@ -231,10 +279,13 @@
 					<normal>#80C3C3C3</normal>
 					<focus>#C3C3C3</focus>
 				</border>
-			</undefined>
-			<namespace>
-				<like>undefined</like>
+				<icon>
+					<normal>#C3C3C3</normal>
+				</icon>
 			</namespace>
+			<package>
+				<like>namespace</like>
+			</package>

 			<file>
 				<fill>
@@ -275,6 +326,17 @@
 					<normal>#F7F7F7</normal>
 				</text>
 			</count_number>
+			<qualifier>
+				<fill>
+					<normal>#78282D</normal>
+				</fill>
+				<border>
+					<normal>#C3C3C3</normal>
+				</border>
+				<text>
+					<normal>#F7F7F7</normal>
+				</text>
+			</qualifier>
 		</node>
 		<edge>
 			<default>
@@ -293,20 +355,20 @@
 				<normal>#2A6484</normal>
 			</use>

-			<template_parameter>
-				<normal>#C1305D</normal>
-			</template_parameter>
 			<template_argument>
 				<normal>#C1305D</normal>
 			</template_argument>
+			<type_argument>
+				<like>template_argument</like>
+			</type_argument>
 			<template_default_argument>
-				<normal>#C1305D</normal>
+				<like>template_argument</like>
 			</template_default_argument>
 			<template_specialization>
-				<normal>#C1305D</normal>
+				<like>template_argument</like>
 			</template_specialization>
 			<template_member_specialization>
-				<normal>#C1305D</normal>
+				<like>template_argument</like>
 			</template_member_specialization>

 			<include>
@@ -317,9 +379,31 @@
 			</macro_use>

 			<aggregation>
-				<normal>#5D5D5D</normal>
-				<focus>#6D6D6D</focus>
+				<normal>#3D3D3D</normal>
+				<focus>#4D4D4D</focus>
 			</aggregation>
 		</edge>
 	</graph>
+	<table>
+		<background>#272728</background>
+		<table>white</table>
+		<text>
+			<normal>white</normal>
+			<active>black</active>
+		</text>
+		<table_line_1>
+			<normal>darkgrey</normal>
+			<active>#969696</active>
+		</table_line_1>
+		<table_line_2>
+			<normal>#343434</normal>
+			<active>#969696</active>
+		</table_line_2>
+	</table>
+	<tab>
+		<background>#272728</background>
+		<active>white</active>
+		<hover>#878787</hover>
+		<text>#878787</text>
+	</tab>
 </config>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<config>
+  <application>
+		<window_base_width>500</window_base_width>
+		<window_base_height>500</window_base_height>
+	</application>
+  <indexing>
+    <indexer_thread_count>4</indexer_thread_count>
+  </indexing>
+	<user>
+		<recent_projects>
+			<recent_project>./projects/tutorial/tutorial.coatiproject</recent_project>
+			<recent_project>./projects/tictactoe/tictactoe.coatiproject</recent_project>
+			<recent_project>./projects/javaparser/javaparser.coatiproject</recent_project>
+		</recent_projects>
+	</user>
+    <version>1</version>
+</config>
@@ -0,0 +1,8 @@
+[General]
+DOCK_LOCATIONS=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\x2\0\0\a\x80\0\0\x3\xcd\xfc\x1\0\0\0\x2\xfc\0\0\0\0\0\0\x4\x90\0\0\0\0\0\xff\xff\xff\xfc\x2\0\0\0\x1\xfb\0\0\0\xe\0\x44\0o\0\x63\0k\0L\0o\0g\0\0\0\x2\xc6\0\0\0\xc1\0\0\0\0\0\0\0\0\xfc\0\0\0\0\0\0\a\x80\0\0\x1\xf5\0\xff\xff\xff\xfc\x2\0\0\0\x2\xfc\0\0\0\x16\0\0\x2\xfe\0\0\0\xa5\0\xff\xff\xff\xfc\x1\0\0\0\x2\xfc\0\0\0\0\0\0\x3\xd6\0\0\x1\"\0\xff\xff\xff\xfc\x2\0\0\0\x2\xfb\0\0\0\x14\0\x44\0o\0\x63\0k\0S\0\x65\0\x61\0r\0\x63\0h\x1\0\0\0\x16\0\0\0\x44\0\0\0\x44\0\xff\xff\xff\xfb\0\0\0\x12\0\x44\0o\0\x63\0k\0G\0r\0\x61\0p\0h\x1\0\0\0^\0\0\x2\xb6\0\0\0]\0\xff\xff\xff\xfb\0\0\0\x10\0\x44\0o\0\x63\0k\0\x43\0o\0\x64\0\x65\x1\0\0\x3\xda\0\0\x3\xa6\0\0\0P\0\xff\xff\xff\xfb\0\0\0\x14\0\x44\0o\0\x63\0k\0S\0t\0\x61\0t\0u\0s\x1\0\0\x3\x18\0\0\0\xcb\0\0\0\xcb\0\xff\xff\xff\0\0\a\x80\0\0\0\0\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
+
+[MainWindow]
+maximized=true
+size=@Size(1287 811)
+position=@Point(259 117)
+showTitleBars=true
@@ -8,7 +8,7 @@
 	background: transparent;
 	border: none;
 	color: white;
-	font-size: 14pt;
+	font-size: 14px;
 	height: 24px;
 	width: 24px;
 }
@@ -1,17 +1,14 @@
-#code_file_list_base, #code_file_list {
+#code_container, #code_file_list {
 	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>px;
 	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>px;
 	padding-right: 5px;
 }

@@ -27,6 +25,7 @@
 	border: none;
 	border-radius: 3px;
 	color: <color:code/file/title/text>;
+	font-size: <setting:font_size>px;
 	padding: 2px 4px;
 	margin: 1px 8px 3px;
 }
@@ -44,7 +43,7 @@
 	border: none;
 	border-radius: 10px;
 	color: <color:code/file/ref_count/text>;
-	font-size: <setting:font_size-2>pt;
+	font-size: <setting:font_size-2>px;
 	padding: 0px 3px;
 	margin: 4px 0px 4px;
 }
@@ -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>px;
 }

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

 #code_file #code_snippet #scope_name:hover {
@@ -75,7 +73,7 @@

 #code_file #code_snippet #dots {
 	background-color: <color:code/snippet/line_number/background>;
-	padding-right: 13px;
+	padding-right: 16px;
 	text-align: right;
 }

@@ -88,11 +86,17 @@
 	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>px;
 }

 #code_area {
 	background-color: transparent;
 	color: <color:code/snippet/syntax/normal>;
+	font-family: "<setting:font_name>";
+	font-size: <setting:font_size>px;
+	selection-color: <color:code/snippet/selection/text>;
+	selection-background-color: <color:code/snippet/selection/background>;
 }

 #code_file #maximize_button, #code_file #snippet_button, #code_file #minimize_button {
@@ -0,0 +1,57 @@
+QLabel, QCheckBox {
+	color: white;
+}
+
+#topHalf {
+	background: #007AC2;
+	border-top-left-radius: 15px;
+	border-top-right-radius: 15px;
+}
+
+#title {
+	color: white;
+	font-size: 22px;
+	font-weight: bold;
+}
+
+#percent {
+	font-size: 22px;
+	font-weight: bold;
+}
+
+#message {
+	font-size: 14px;
+	font-weight: bold;
+}
+
+#filePath {
+	font-size: 11px;
+}
+
+#errorCount {
+	border: none;
+	background: transparent;
+	color: white;
+	font-size: 14px;
+}
+
+#windowButton {
+	background: transparent;
+	border: 1px solid white;
+	color: white;
+}
+
+#windowButton:hover {
+	background: transparent;
+	border: 1px solid white;
+	color: white;
+}
+
+#windowButton:hover {
+	color: #2E3C86;
+	background: white;
+}
+
+#windowButton:default {
+	border: 2px solid white;
+}
@@ -1,10 +1,11 @@
 QLabel {
-	font-size: 12pt;
+	font-size: 12px;
+	color: black;
 }

 #licenseField {
 	font-family: "<setting:font_name>";
-	font-size: 10pt;
+	font-size: 11px;
 	height: 200px;
 	padding: 5px;
 	width: 470px;
@@ -1,9 +1,6 @@
 QToolTip {
 	background-color: #E0E0E0;
 	color: black;
-	font-size: <setting:font_size>pt;
+	font-size: <setting:font_size>px;
 }

-* {
-	font-family: "Roboto";
-}
@@ -22,12 +22,7 @@ QPushButton:pressed {
 }

 #refresh_button {
-	border-bottom-left-radius: 12px;
-	border-top-left-radius: 12px;
-	margin-right: 2px;
-}
-
-#auto_refresh_button {
-	border-bottom-right-radius: 12px;
-	border-top-right-radius: 12px;
+	/*border-bottom-left-radius: 12px;*/
+	/*border-top-left-radius: 12px;*/
+	border-radius: 12px;
 }
@@ -1,10 +1,10 @@
 * {
-	font-size: <setting:font_size>pt;
+	font-size: <setting:font_size>px;
 }

 #search_box, #search_box * {
 	font-family: "<setting:font_name>";
-	font-size: <setting:font_size+2>pt;
+	font-size: <setting:font_size+2>px;
 }

 #search_bar {
@@ -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>;
 }
@@ -4,7 +4,7 @@
 	border-radius: 8px;
 	color: black;
 	padding: 3px 5px 2px;
-	font-size: 14pt;
+	font-size: 14px;
 	min-width: 6em;
 }

@@ -13,20 +13,41 @@
 	background: #2D3F85;
 }

-#recentButton {
+#recentButton, #recentButtonMissing {
 	background: none;
 	border: none;
 	color: black;
-	font-size: 12pt;
+	font-size: 12px;
 }

-#recentButton:hover {
+#recentButtonMissing {
+	color: grey;
+}
+
+#recentButton:hover, #recentButtonMissing:hover {
 	background-color: #CFD2E0;
 	border-radius: 10px;
 }

 #recentLabel {
 	color: black;
-	font-size: 16pt;
+	font-size: 16px;
+	font-weight: bold;
+	margin-left: 6px;
+}
+
+#versionLabel {
+	color: black;
+	font-size: 12px;
 	font-weight: bold;
 }
+
+#updateLabel {
+	color: black;
+	font-size: 12px;
+}
+
+#welcomeLabel {
+	color: black;
+	font-size: 12px;
+}
@@ -0,0 +1,123 @@
+QTabWidget::tab-bar {
+	alignment: left;
+}
+
+QTabBar::tab {
+	background-color: <color:tab/background>;
+	color: <color:tab/text>;
+	padding: 12px 75px 5px 12px;
+	border: 0px;
+	border-bottom: 4px solid <color:tab/background>;
+	/*font-size: <setting:font_size>px;*/
+	/*font-weight: bold;*/
+}
+
+QTabBar::tab:hover {
+	border-bottom: 4px solid <color:tab/hover>;
+}
+
+QTabBar::tab:selected {
+	border-bottom: 4px solid <color:tab/active>;
+	color: <color:tab/active>;
+}
+
+QTabWidget::pane {
+	top: 0px;
+	background: <color:tab/background>;
+	color: <color:tab/text>;
+	border: 0px;
+	margin: 0px;
+	padding: 0px;
+}
+
+QTableView {
+	color: <color:table/text/normal>;
+	background-color: <color:table/table_line_1/normal>;
+	alternate-background-color: <color:table/table_line_2/normal>;
+	border-radius: 10px;
+	border: 1px solid <color:table/table>;
+	margin: 10px;
+	padding-right: 10px;
+	font-size: <setting:font_size>px;
+}
+
+QFrame {
+	background-color: <color:tab/background>;
+}
+
+QTableView::item {
+	border-left: 1px solid <color:table/table>;
+}
+
+QTableView::item:selected {
+	color: <color:table/text/active>;
+	background-color: <color:table/table_line_1/active>;
+	alternate-background-color: <color:table/table_line_2/active>;
+}
+
+QHeaderView {
+	background-color: transparent;
+}
+
+QHeaderView::section:horizontal {
+	background-color: transparent;
+	border: none;
+	border-bottom: 1px solid <color:table/table>;
+	border-left: 1px solid <color:table/table>;
+	color: <color:table/text/normal>;
+	font-size: <setting:font_size>px;
+	font-weight: bold;
+	padding: 1px 6px;
+	height: <setting:font_size+5>px;
+}
+
+QHeaderView::section:vertical {
+	background-color: transparent;
+	border: none;
+	color: <color:table/text/normal>;
+	font-size: <setting:font_size>px;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+
+
+QCheckBox {
+	color: <color:table/text/normal>;
+	border-color: <color:table/table>;
+	/*background-color: <color:table/table>;*/
+}
+
+QScrollBar:vertical {
+}
+
+QScrollBar::handle:vertical {
+	min-height: 20px;
+}
+
+QScrollBar::add-line:vertical {
+	height: 20px;
+	subcontrol-position: bottom;
+	subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:vertical {
+	height: 20px;
+	subcontrol-position: top;
+	subcontrol-origin: margin;
+}
+QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
+	width: 3px;
+	height: 3px;
+	background: white;
+}
+
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
+	background: none;
+}
+
+QTableView QTableCornerButton::section {
+	background-color: <color:table/background>;
+	border-bottom: 1px solid <color:table/table>;
+	border-top-left-radius: 10px;
+}
+
@@ -1,5 +1,5 @@
 * {
-	font-size: 12pt;
+	font-size: 12px;
 }

 QtDirectoryListBox {
@@ -15,8 +15,8 @@ QListWidget {
 }

 QListWidget::item {
-	height: 20px;
 	border-bottom: 1px solid lightgray;
+	height: 20px;
 }

 QListWidget::item:selected {
@@ -26,6 +26,7 @@ QListWidget::item:selected {
 QtListItemWidget #field {
 	background-color: transparent;
 	border: none;
+	color: black;
 	margin-top: 2px;
 	margin-left: 5px;
 }
@@ -34,7 +35,7 @@ QtListItemWidget #field {
 	border-top: 1px solid lightgray;
 }

-#plusButton, #minusButton, #dotsButton {
+#plusButton, #minusButton, #dotsButton, #editButton {
 	color: white;
 	height: 1em;
 	margin-right: 3px;
@@ -70,6 +71,15 @@ QtListItemWidget #field {
 	border-image: url(<setting:gui_path>window/dots_hover.png);
 }

+#editButton {
+	border-image: url(<setting:gui_path>code_view/images/edit.png);
+	margin-left: 6px;
+}
+
+#editButton:hover {
+	background-color: #EEE;
+}
+
 #dropInfo {
 	color: #999;
 }
@@ -1,16 +1,18 @@
 * {
-	font-size: 12pt;
+	font-size: 12px;
+}
+
+QLabel, QCheckBox {
+	color: black;
 }

 #title {
-	color: black;
-	font-size: 16pt;
+	font-size: 16px;
 	font-weight: bold;
 }

-#section, #projectTitle {
-	color: black;
-	font-size: 14pt;
+#projectTitle {
+	font-size: 14px;
 	font-weight: bold;
 }

@@ -21,28 +23,38 @@
 }

 #projectDescription {
-	font-size: 12pt;
+	font-size: 12px;
 	margin-left: 20px;
 }

+#description {
+	font-size: 12px;
+}
+
 #label {
+	font-size: 12px;
+	font-weight: bold;
+}
+
+#titleLabel {
+	font-size: 14px;
 	font-weight: bold;
 }

 #formArea {
-	background: white;
+	background: transparent;
 	border: none;
 }

 #scrollArea {
-	background: white;
+	background: transparent;
 	border: none;
 	border-top: 1px solid lightgrey;
 	border-bottom: 1px solid lightgrey;
 }

 #form {
-	background: white;
+	background: transparent;
 }

 #helpButton, #dotsButton, #refreshButton {
@@ -77,8 +89,10 @@
 }

 #name, #picker {
+	background: white;
 	border-radius: 10px;
 	border: 1px solid lightgrey;
+	color: black;
 	padding: 2px 5px 0px;
 }

@@ -86,6 +100,7 @@
 	background: white;
 	border: none;
 	border-radius: 5px;
+	color: black;
 	margin-left: 5px;
 	margin-top: 2px;
 }
@@ -100,7 +115,7 @@
 	border-radius: 8px;
 	color: black;
 	padding: 3px 5px 2px;
-	font-size: 14pt;
+	font-size: 14px;
 	min-width: 5em;
 }

@@ -110,16 +125,20 @@
 	border-radius: 8px;
 	border-bottom-right-radius: 0px;
 	border-top-right-radius: 0px;
-	font-size: 15pt;
+	color: black;
+	font-size: 15px;
 	margin-right: 0px;
-	margin-bottom: 7px;
 	height: 25px;
 	width: 90px;
 }

 #windowButton:hover {
 	color: white;
-	background: #2D3F85;
+	background: #2D3C86;
+}
+
+#windowButton:default {
+	border: 2px solid lightgray;
 }

 #menuButton:hover, #menuButton:checked {
@@ -141,7 +160,8 @@
 #projectButton {
 	background: white;
 	border-radius: 8px;
-	font-size: 12pt;
+	color: black;
+	font-size: 12px;
 	width: 7em;
 	height: 7em;
 	margin-top: 10px;
@@ -151,8 +171,10 @@
 	background: #CFD2E0;
 }

-#files {
+#textField, #pathList {
+	background: white;
 	border: 1px solid lightgray;
 	border-radius: 12px;
+	color: black;
 	padding: 6px;
 }
@@ -1 +0,0 @@
-%windir%\system32\msiexec.exe /I{E6343DF1-6651-4487-BACE-59068B169BA0}
@@ -1 +0,0 @@
-%windir%\system32\msiexec.exe /I{99D5E031-E895-47B2-B108-AD026571FD29}
@@ -0,0 +1 @@
+%windir%\system32\msiexec.exe /x {F8BA9656-DE2E-4925-9CF4-C43285A2CA6E}
@@ -1,23 +0,0 @@
-#include "io.h"
-
- #include <iostream>
- #include <sstream>
- #include <string>
-
-int io::numberIn() {
-	 std::string input;
-	 getline( std::cin, input );
-	 std::stringstream stream( input );
-
-	int number;
-	 stream >> number;
-	return number;
-}
-
-void io::numberOut(int num) {
-	 std::cout << num;
-}
-
-void io::stringOut(const char* str) {
-	 std::cout << str;
-}
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<config>
-    <user>
-        <recent_projects>
-            <recent_project>./data/projects/tutorial/tutorial.coatiproject</recent_project>
-            <recent_project>./data/projects/tictactoe/tictactoe.coatiproject</recent_project>
-        </recent_projects>
-    </user>
-</config>
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`%windir%\system32\msiexec.exe /I{E6343DF1-6651-4487-BACE-59068B169BA0}`
				`@@ -1 +0,0 @@`
				`%windir%\system32\msiexec.exe /I{99D5E031-E895-47B2-B108-AD026571FD29}`
				`@@ -0,0 +1 @@`
				`%windir%\system32\msiexec.exe /x {F8BA9656-DE2E-4925-9CF4-C43285A2CA6E}`