From 6d2c89b127724c0f443a1ce3a62990267a473ed2 Mon Sep 17 00:00:00 2001
From: mlangkabel <malte.langkabel@gmail.com>
Date: Tue, 18 Dec 2018 11:42:44 +0100
Subject: [PATCH] data: updated windows installer

---
 deployment/windows/wixSetup/installDir.wxs  | 22 ++++++++++++++-------
 deployment/windows/wixSetup/sourcetrail.wxs |  7 +++++--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index 6c8fbee8..a3839656 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -833,12 +833,6 @@
 							<Component Id='CodeViewMaximizeInactivePng' Guid='*' Win64="$(var.Win64)">
 								<File Id='CodeViewMaximizeInactive' Name='maximize_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/maximize_inactive.png' KeyPath='yes' />
 							</Component>
-							<Component Id='CodeViewMinimizeActivePng' Guid='*' Win64="$(var.Win64)">
-								<File Id='CodeViewMinimizeActive' Name='minimize_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/minimize_active.png' KeyPath='yes' />
-							</Component>
-							<Component Id='CodeViewMinimizeInactivePng' Guid='*' Win64="$(var.Win64)">
-								<File Id='CodeViewMinimizeInactive' Name='minimize_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/minimize_inactive.png' KeyPath='yes' />
-							</Component>
 							<Component Id='CodeViewPatternBrightPng' Guid='*' Win64="$(var.Win64)">
 								<File Id='CodeViewPatternBright' Name='pattern_bright.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/pattern_bright.png' KeyPath='yes' />
 							</Component>
@@ -851,6 +845,12 @@
 							<Component Id='CodeViewSnippetActivePng' Guid='*' Win64="$(var.Win64)">
 								<File Id='CodeViewSnippetActive' Name='snippet_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_active.png' KeyPath='yes' />
 							</Component>
+							<Component Id='CodeViewSnippetArrowDownPng' Guid='*' Win64="$(var.Win64)">
+								<File Id='CodeViewSnippetArrowDown' Name='snippet_arrow_down.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_arrow_down.png' KeyPath='yes' />
+							</Component>
+							<Component Id='CodeViewSnippetArrowRightPng' Guid='*' Win64="$(var.Win64)">
+								<File Id='CodeViewSnippetArrowRight' Name='snippet_arrow_right.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_arrow_right.png' KeyPath='yes' />
+							</Component>
 							<Component Id='CodeViewSnippetInactivePng' Guid='*' Win64="$(var.Win64)">
 								<File Id='CodeViewSnippetInactive' Name='snippet_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_inactive.png' KeyPath='yes' />
 							</Component>
@@ -1313,7 +1313,15 @@
 						</Component>
 					</Directory>
 				</Directory>
-
+				
+				<Directory Id='DataSyntaxHighlightingRules' Name='syntax_highlighting_rules'>
+					<Component Id='SyntaxHighlightingRulesCppRules' Guid='*' Win64="$(var.Win64)">
+						<File Id='SyntaxHighlightingRulesCpp' Name='cpp.rules' DiskId='1' Source='./../../../bin/app/data/syntax_highlighting_rules/cpp.rules' KeyPath='yes' />
+					</Component>
+					<Component Id='SyntaxHighlightingRulesJavaRules' Guid='*' Win64="$(var.Win64)">
+						<File Id='SyntaxHighlightingRulesJava' Name='java.rules' DiskId='1' Source='./../../../bin/app/data/syntax_highlighting_rules/java.rules' KeyPath='yes' />
+					</Component>
+				</Directory>
 			</Directory>
 
 <?if $(sys.BUILDARCH) = x64 ?>
diff --git a/deployment/windows/wixSetup/sourcetrail.wxs b/deployment/windows/wixSetup/sourcetrail.wxs
index 656e0e4a..70200975 100644
--- a/deployment/windows/wixSetup/sourcetrail.wxs
+++ b/deployment/windows/wixSetup/sourcetrail.wxs
@@ -415,12 +415,12 @@
 				<ComponentRef Id='CodeViewListPng'/>
 				<ComponentRef Id='CodeViewMaximizeActivePng'/>
 				<ComponentRef Id='CodeViewMaximizeInactivePng'/>
-				<ComponentRef Id='CodeViewMinimizeActivePng'/>
-				<ComponentRef Id='CodeViewMinimizeInactivePng'/>
 				<ComponentRef Id='CodeViewPatternBrightPng'/>
 				<ComponentRef Id='CodeViewPatternDarkPng'/>
 				<ComponentRef Id='CodeViewPatternGreyPng'/>
 				<ComponentRef Id='CodeViewSnippetActivePng'/>
+				<ComponentRef Id='CodeViewSnippetArrowDownPng'/>
+				<ComponentRef Id='CodeViewSnippetArrowRightPng'/>
 				<ComponentRef Id='CodeViewSnippetInactivePng'/>
 
 				<ComponentRef Id='GraphViewCss'/>
@@ -562,6 +562,9 @@
 				<ComponentRef Id='Slf4jApiJar'/>
 				<ComponentRef Id='Slf4jSimpleJar'/>
 				
+				<ComponentRef Id='SyntaxHighlightingRulesCppRules'/>
+				<ComponentRef Id='SyntaxHighlightingRulesJavaRules'/>
+				
 				<ComponentRef Id='UninstallBat'/>
 
 				<!-- AppData Folder Stuff -->