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

.gitignore

@@ -32,8 +32,8 @@
 .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
@@ -49,26 +49,9 @@ 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/
+/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

.gitlab-ci.yml

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

CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
+#set (CMAKE_VERBOSE_MAKEFILE ON)
+
 include(cmake/add_files.cmake)
 include(cmake/create_source_groups.cmake)
 include(cmake/version.cmake)
@@ -12,10 +14,10 @@ include(cmake/licenses.cmake)
 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")
@@ -39,7 +41,6 @@ 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)
@@ -54,10 +55,10 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -fcolor-diagnostics")
 endif()
 
-if (UNIX)
-	#add_definitions(-std=c++11 -Wno-unknown-warning-option -fcolor-diagnostics -DQT_COMPILING_QSTRING_COMPAT_CPP )
-	add_definitions(-fno-omit-frame-pointer  -DQT_COMPILING_QSTRING_COMPAT_CPP )
-endif ()
+# For debugging the release build on linux
+#if (UNIX AND "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+	#add_definitions(-fno-omit-frame-pointer)
+#endif ()
 
 # Clang ------------------------------------------------------------------------
 
@@ -68,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()
@@ -80,55 +81,53 @@ 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_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)
+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_D botan "$ENV{BOTAN_DIR}/debug")
 endif()
+message(STATUS "botanversion: ${BOTAN}")
+
 if(${BOTAN} STREQUAL "BOTAN-NOTFOUND")
 	message(FATAL_ERROR "Botan not found")
 else()
 	message(STATUS "Botan found")
 endif()
+
 if(UNIX AND NOT APPLE)
-	set(BOTAN_INCLUDE_DIR "${EXTERNAL_BUILD}/botan")
+	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 License -------------------------------------------------------------------
+if(NOT BOTAN_INCLUDE_DIR)
+	message(FATAL_ERROR "Botan include dir not found")
+endif()
 
-#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
-#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
+
+# Lib License -------------------------------------------------------------------
 
 add_subdirectory(src/lib_license)
 
@@ -142,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}
 )
 
-# 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()
@@ -169,13 +157,9 @@ else()
 	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} optimized ${BOTAN})
 endif()
 
+
 # Lib --------------------------------------------------------------------------
 
-#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
-#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
-
-find_package(JNI)
-
 add_subdirectory(src/lib)
 add_subdirectory(src/external)
 
@@ -188,77 +172,89 @@ create_source_groups(${LIB_FILES})
 create_source_groups(${EXTERNAL_FILES})
 create_source_groups(${EXTERNAL_C_FILES})
 
-set_target_properties(
-	${LIB_PROJECT_NAME}
-	PROPERTIES
-		DEBUG_OUTPUT_NAME ${PROJECT_NAME}_d
-		RELEASE_OUTPUT_NAME ${PROJECT_NAME}
-)
-
 set_property(
 	TARGET ${LIB_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/lib"
+		"${CMAKE_SOURCE_DIR}/src/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 ${LLVM_INCLUDE_DIRS}
-	${CLANG_INCLUDE_DIRS}
-	${Boost_INCLUDE_DIRS}
-	${EIGEN_ROOT}
-	${JNI_INCLUDE_DIRS}
+	PUBLIC ${Boost_INCLUDE_DIR}
 	"${CMAKE_SOURCE_DIR}/src/external"
 )
 
 target_link_libraries(${LIB_PROJECT_NAME} ${Boost_LIBRARIES} ${LIB_LICENSE_PROJECT_NAME})
 
 
-# Lib Parser -------------------------------------------------------------------
+# Lib Cxx -------------------------------------------------------------------
 
-#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)
+add_subdirectory(src/lib_cxx)
 
 set_source_files_properties(${CLANG_FILES} PROPERTIES COMPILE_FLAGS "-fno-rtti")
 
-add_library(${LIB_PARSER_PROJECT_NAME} ${CLANG_FILES})
+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_PARSER_PROJECT_NAME}
+	TARGET ${LIB_CXX_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
-		"${CMAKE_SOURCE_DIR}/src/lib_parser"
+		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 		"${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
+target_include_directories(${LIB_CXX_PROJECT_NAME} SYSTEM
 	PUBLIC ${LLVM_INCLUDE_DIRS}
 	${CLANG_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS}
-	${JNI_INCLUDE_DIRS}
 )
 
 link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
 llvm_map_components_to_libnames(REQ_LLVM_LIBS support core libdriver)
 
-target_link_libraries(${LIB_PARSER_PROJECT_NAME} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBS})
+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 ----------------------------------------------------------------------
 
-#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
-#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
-
 add_subdirectory(src/lib_gui)
 
 # Find includes in corresponding build directories
@@ -267,11 +263,7 @@ 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/")
@@ -315,24 +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"
 		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
 )
 
-set_target_properties(
-	${LIB_GUI_PROJECT_NAME}
-	PROPERTIES
-		DEBUG_OUTPUT_NAME ${LIB_GUI_PROJECT_NAME}_d
-		RELEASE_OUTPUT_NAME ${LIB_GUI_PROJECT_NAME}
-)
-
 # include external header without warnings
 target_include_directories(${LIB_GUI_PROJECT_NAME} SYSTEM
 		PUBLIC "${CMAKE_SOURCE_DIR}/src/external"
-		PUBLIC ${BOTAN_INCLUDE_DIR}
 		PUBLIC ${Boost_INCLUDE_DIRS}
 )
 
@@ -377,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)
+	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")
@@ -387,13 +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})
+	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}
@@ -402,10 +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/lib_license"
-		"${CMAKE_SOURCE_DIR}/build/src/app"
+		#"${CMAKE_SOURCE_DIR}/build/src/app"
 )
 
 target_include_directories(${APP_PROJECT_NAME} SYSTEM
@@ -423,72 +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"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
-)
-
-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 ----------------------------------------------------------------
 
@@ -532,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  --------------------------------------------------------
@@ -580,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)
 
@@ -594,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)
@@ -603,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)
 

README.md

@@ -4,13 +4,15 @@
 
 #### External Software
 
+* JDK 1.8
 * QT 5.6
 * CxxTest 4.3
 * Valgrind 3.9.0 (linux)
 * 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
+
+also something about java, but who knows...
 
 #### Environment Variables
 
@@ -18,12 +20,13 @@
 * 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
 
@@ -31,13 +34,16 @@ 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
+
+for Linux:
+$ python configure.py --disable-shared
 
 #### Settings
 
@@ -111,6 +117,73 @@ gifsicle --resize-height 18 trans.gif > loader.gif
 
 ### Changelog
 
+#### 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

bin/app/data/ProjectSettings_template.xml

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

bin/app/data/color_schemes/bad_rainbow.xml

@@ -20,9 +20,10 @@
 
 		<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>
@@ -100,7 +101,9 @@
 
 			<line_number>
 				<text>#C4C4C4</text>
+				<inactive_text>#A0A0A0</inactive_text>
 				<background>#494949</background>
+				<marker>#C4C4C4</marker>
 			</line_number>
 
 			<syntax>
@@ -115,6 +118,11 @@
 			</syntax>
 
 			<selection>
+				<text>black</text>
+				<background>#CCCCCC</background>
+			</selection>
+
+			<annotation>
 				<token>
 					<normal>
 						<border>transparent</border>
@@ -171,7 +179,7 @@
 						<fill>#987CEA</fill>
 					</focus>
 				</fulltext>
-			</selection>
+			</annotation>
 		</snippet>
 	</code>
 
@@ -272,20 +280,25 @@
 			</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>undefined</like>
+				<like>namespace</like>
 			</package>
 
 			<file>
@@ -339,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>
@@ -386,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>

bin/app/data/color_schemes/bright.xml

@@ -20,9 +20,10 @@
 
 		<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>
@@ -100,7 +101,9 @@
 
 			<line_number>
 				<text>black</text>
+				<inactive_text>#A0A0A0</inactive_text>
 				<background>white</background>
+				<marker>#A0A0A0</marker>
 			</line_number>
 
 			<syntax>
@@ -115,6 +118,11 @@
 			</syntax>
 
 			<selection>
+				<text>black</text>
+				<background>#E0E0E0</background>
+			</selection>
+
+			<annotation>
 				<token>
 					<normal>
 						<border>transparent</border>
@@ -169,7 +177,7 @@
 						<fill>#ABABDD</fill>
 					</focus>
 				</fulltext>
-			</selection>
+			</annotation>
 		</snippet>
 	</code>
 
@@ -258,19 +266,22 @@
 			</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>undefined</like>
+				<like>namespace</like>
 			</package>
 
 			<file>
@@ -312,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>
@@ -352,4 +374,29 @@
 			</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>

bin/app/data/color_schemes/dark.xml

@@ -22,28 +22,10 @@
 			<text>#F7F7F7</text>
 			<by_text>#A0A0A0</by_text>
 			<background>#272728</background>
-			<highlight>#555555</highlight>
+			<highlight>#333333</highlight>
+			<line>#444444</line>
 		</popup>
 
-		<query>
-			<none>
-				<normal></normal>
-				<hover></hover>
-			</none>
-			<command>
-				<normal></normal>
-				<hover></hover>
-			</command>
-			<operator>
-				<normal></normal>
-				<hover></hover>
-			</operator>
-			<fulltext>
-				<normal></normal>
-				<hover></hover>
-			</fulltext>
-		</query>
-
 		<query>
 			<none>
 				<normal>
@@ -119,7 +101,9 @@
 
 			<line_number>
 				<text>#F7F7F7</text>
+				<inactive_text>#A0A0A0</inactive_text>
 				<background>#272728</background>
+				<marker>#969696</marker>
 			</line_number>
 
 			<syntax>
@@ -134,6 +118,11 @@
 			</syntax>
 
 			<selection>
+				<text>white</text>
+				<background>#777777</background>
+			</selection>
+
+			<annotation>
 				<token>
 					<normal>
 						<border>transparent</border>
@@ -191,7 +180,7 @@
 						<fill>#134B63</fill>
 					</focus>
 				</fulltext>
-			</selection>
+			</annotation>
 		</snippet>
 	</code>
 
@@ -280,6 +269,9 @@
 			</enum_constant>
 
 			<undefined>
+				<like>type</like>
+			</undefined>
+			<namespace>
 				<fill>
 					<normal>#78282D</normal>
 				</fill>
@@ -287,12 +279,12 @@
 					<normal>#80C3C3C3</normal>
 					<focus>#C3C3C3</focus>
 				</border>
-			</undefined>
-			<namespace>
-				<like>undefined</like>
+				<icon>
+					<normal>#C3C3C3</normal>
+				</icon>
 			</namespace>
 			<package>
-				<like>undefined</like>
+				<like>namespace</like>
 			</package>
 
 			<file>
@@ -334,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>
@@ -381,4 +384,26 @@
 			</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>

bin/app/data/fallback/ApplicationSettings.xml

@@ -9,9 +9,9 @@
   </indexing>
 	<user>
 		<recent_projects>
-			<recent_project>./data/projects/tutorial/tutorial.coatiproject</recent_project>
-			<recent_project>./data/projects/tictactoe/tictactoe.coatiproject</recent_project>
-			<recent_project>./data/projects/javaparser/javaparser.coatiproject</recent_project>
+			<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>

bin/app/data/fallback/window_settings.ini

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

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

@@ -8,7 +8,7 @@
 	background: transparent;
 	border: none;
 	color: white;
-	font-size: 14pt;
+	font-size: 14px;
 	height: 24px;
 	width: 24px;
 }

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

@@ -8,7 +8,7 @@
 	border-radius: 12px;
 	border-top-left-radius: 14px;
 	border-top-right-radius: 14px;
-	font-size: <setting:font_size>pt;
+	font-size: <setting:font_size>px;
 	padding-bottom: 7px;
 }
 
@@ -16,7 +16,7 @@
 	background-color: <color:code/file/background>;
 	border-top-left-radius: 7px;
 	border-top-right-radius: 7px;
-	font-size: <setting:font_size>pt;
+	font-size: <setting:font_size>px;
 	padding-right: 5px;
 }
 
@@ -25,7 +25,7 @@
 	border: none;
 	border-radius: 3px;
 	color: <color:code/file/title/text>;
-	font-size: <setting:font_size>pt;
+	font-size: <setting:font_size>px;
 	padding: 2px 4px;
 	margin: 1px 8px 3px;
 }
@@ -43,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;
 }
@@ -51,7 +51,7 @@
 #code_file #code_snippet {
 	background-color: <color:code/snippet/background>;
 	border-top: 2px solid <color:code/file/background>;
-	font-size: <setting:font_size>pt;
+	font-size: <setting:font_size>px;
 }
 
 #code_file #code_snippet[isFirst=true] {
@@ -64,7 +64,7 @@
 	border: none;
 	color: <color:code/snippet/title/text>;
 	font-family: "<setting:font_name>";
-	font-size: <setting:font_size>pt;
+	font-size: <setting:font_size>px;
 }
 
 #code_file #code_snippet #scope_name:hover {
@@ -73,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;
 }
 
@@ -87,14 +87,16 @@
 	border: none;
 	color: <color:code/snippet/line_number/text>;
 	font-family: "<setting:font_name>";
-	font-size: <setting:font_size>pt;
+	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>pt;
+	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 {

bin/app/data/gui/indexing_dialog/indexing_dialog.css

@@ -1,4 +1,4 @@
-QLabel {
+QLabel, QCheckBox {
 	color: white;
 }
 
@@ -10,29 +10,29 @@ QLabel {
 
 #title {
 	color: white;
-	font-size: 22pt;
+	font-size: 22px;
 	font-weight: bold;
 }
 
 #percent {
-	font-size: 22pt;
+	font-size: 22px;
 	font-weight: bold;
 }
 
 #message {
-	font-size: 14pt;
+	font-size: 14px;
 	font-weight: bold;
 }
 
 #filePath {
-	font-size: 11pt;
+	font-size: 11px;
 }
 
 #errorCount {
 	border: none;
 	background: transparent;
 	color: white;
-	font-size: 14pt;
+	font-size: 14px;
 }
 
 #windowButton {

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

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

bin/app/data/gui/main.css

@@ -1,5 +1,6 @@
 QToolTip {
 	background-color: #E0E0E0;
 	color: black;
-	font-size: <setting:font_size>pt;
+	font-size: <setting:font_size>px;
 }
+

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

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

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

@@ -4,7 +4,7 @@
 	border-radius: 8px;
 	color: black;
 	padding: 3px 5px 2px;
-	font-size: 14pt;
+	font-size: 14px;
 	min-width: 6em;
 }
 
@@ -13,18 +13,15 @@
 	background: #2D3F85;
 }
 
-#recentButton {
+#recentButton, #recentButtonMissing {
 	background: none;
 	border: none;
 	color: black;
-	font-size: 12pt;
+	font-size: 12px;
 }
 
 #recentButtonMissing {
-	background: none;
-	border: none;
 	color: grey;
-	font-size: 12pt;
 }
 
 #recentButton:hover, #recentButtonMissing:hover {
@@ -34,23 +31,23 @@
 
 #recentLabel {
 	color: black;
-	font-size: 16pt;
+	font-size: 16px;
 	font-weight: bold;
 	margin-left: 6px;
 }
 
 #versionLabel {
 	color: black;
-	font-size: 12pt;
+	font-size: 12px;
 	font-weight: bold;
 }
 
 #updateLabel {
 	color: black;
-	font-size: 12pt;
+	font-size: 12px;
 }
 
 #welcomeLabel {
 	color: black;
-	font-size: 12pt;
+	font-size: 12px;
 }

bin/app/data/gui/tabbed_view/tabbed_view.css

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

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

@@ -1,5 +1,5 @@
 * {
-	font-size: 12pt;
+	font-size: 12px;
 }
 
 QtDirectoryListBox {

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

@@ -1,5 +1,5 @@
 * {
-	font-size: 12pt;
+	font-size: 12px;
 }
 
 QLabel, QCheckBox {
@@ -7,12 +7,12 @@ QLabel, QCheckBox {
 }
 
 #title {
-	font-size: 16pt;
+	font-size: 16px;
 	font-weight: bold;
 }
 
 #projectTitle {
-	font-size: 14pt;
+	font-size: 14px;
 	font-weight: bold;
 }
 
@@ -23,21 +23,21 @@ QLabel, QCheckBox {
 }
 
 #projectDescription {
-	font-size: 12pt;
+	font-size: 12px;
 	margin-left: 20px;
 }
 
 #description {
-	font-size: 12pt;
+	font-size: 12px;
 }
 
 #label {
-	font-size: 12pt;
+	font-size: 12px;
 	font-weight: bold;
 }
 
 #titleLabel {
-	font-size: 14pt;
+	font-size: 14px;
 	font-weight: bold;
 }
 
@@ -115,7 +115,7 @@ QLabel, QCheckBox {
 	border-radius: 8px;
 	color: black;
 	padding: 3px 5px 2px;
-	font-size: 14pt;
+	font-size: 14px;
 	min-width: 5em;
 }
 
@@ -126,7 +126,7 @@ QLabel, QCheckBox {
 	border-bottom-right-radius: 0px;
 	border-top-right-radius: 0px;
 	color: black;
-	font-size: 15pt;
+	font-size: 15px;
 	margin-right: 0px;
 	height: 25px;
 	width: 90px;
@@ -161,7 +161,7 @@ QLabel, QCheckBox {
 	background: white;
 	border-radius: 8px;
 	color: black;
-	font-size: 12pt;
+	font-size: 12px;
 	width: 7em;
 	height: 7em;
 	margin-top: 10px;

bin/app/data/install/uninstall_app.bat

@@ -1 +0,0 @@
-%windir%\system32\msiexec.exe /I{560C569F-03CF-424D-9B63-92B86779ECB6}

bin/app/data/install/uninstall_trail.bat

@@ -1 +0,0 @@
-%windir%\system32\msiexec.exe /I{A977609C-DEE3-48BF-8597-302959F82D1A}

bin/app/data/install/uninstall_wix.bat

@@ -1 +1 @@
-%windir%\system32\msiexec.exe /x {596E7336-D5B9-449A-95E9-6040F354E283}
+%windir%\system32\msiexec.exe /x {F8BA9656-DE2E-4925-9CF4-C43285A2CA6E}

bin/app/data/src/tictactoe/io.cpp

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

bin/app/user/ApplicationSettings_template.xml

@@ -29,8 +29,6 @@
 	<indexing>
 		<indexer_thread_count><!-- INTEGER: number of threads indexing the source code --></indexer_thread_count>
 
-		<show_external_non_fatal_errors><!-- BOOL: show non-fatal errors in unindexed files --></show_external_non_fatal_errors>
-
 		<cxx>
 			<compiler_flags>
 				<compiler_flag><!-- STRING: compiler flag, including the dash e.g. -v --></compiler_flag>
@@ -80,5 +78,6 @@
 	<controls>
 		<mouse_back_button><!-- INTEGER: mouse button code of back button, default is 8 --></mouse_back_button>
 		<mouse_forward_button><!-- INTEGER: mouse button code of forward button, default is 16 --></mouse_forward_button>
+		<graph_zoom_on_mouse_wheel><!-- BOOL: set mouse wheel to zooming by default --></graph_zoom_on_mouse_wheel>
 	</controls>
 </config>