New program icons added.

textadventures · Jan 14, 2018 · fbdebf0 · fbdebf0
1 parent 274d202
commit fbdebf0
Show file tree

Hide file tree

Showing 25 changed files with 1,862 additions and 328 deletions.
diff --git a/Editor/My Project/AssemblyInfo.vb b/Editor/My Project/AssemblyInfo.vb
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("")> 
 <Assembly: AssemblyProduct("Editor")>
-<Assembly: AssemblyCopyright("Copyright © 2017 Andy Joel - full copyright and license information at https://github.com/textadventures/quest/blob/master/LICENSE. Icons by https://de.icons8.com/ is licensed under CC BY-ND 3.0")>
+<Assembly: AssemblyCopyright("Copyright © 2017/2018 Andy Joel - full copyright and license information at https://github.com/textadventures/quest/blob/master/LICENSE. All Icons by https://de.icons8.com/ are licensed under CC BY-ND 3.0.")>
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>
@@ -30,4 +30,4 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("5.7.*")>
+<Assembly: AssemblyVersion("5.8.*")>
diff --git a/EditorControls/EditorControls.csproj b/EditorControls/EditorControls.csproj
@@ -34,7 +34,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>q2_48x48c.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.AvalonEdit, Version=5.0.1.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
@@ -544,9 +545,6 @@
     <Resource Include="Images\PasteHS.png" />
     <Resource Include="Images\Up.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="q2_48x48c.ico" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\FindHS.png" />
   </ItemGroup>
@@ -661,6 +659,9 @@
   <ItemGroup>
     <None Include="Resources\s_paste.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\questicon16.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>if exist "$(TargetPath).locked" del "$(TargetPath).locked"

diff --git a/EditorControls/FilePopUp.xaml b/EditorControls/FilePopUp.xaml
@@ -4,7 +4,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Name="ImageSelectionWindow"
         Title="Choose an image" SizeToContent="WidthAndHeight" MinWidth="280" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
-        Icon="/EditorControls;component/q2_48x48c.ico" Initialized="ImageSelectionWindow_Initialized">
+        Icon="Resources/questicon16.ico" Initialized="ImageSelectionWindow_Initialized">
     <Grid>
         <StackPanel>
             <EditorControls:FileDropDown x:Name="fileDropDown" HorizontalAlignment="Stretch" Margin="10" />

diff --git a/EditorControls/PopOut.xaml b/EditorControls/PopOut.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="TextAdventures.Quest.EditorControls.PopOut"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Script Editor" Height="600" Width="700" ShowInTaskbar="False" WindowStartupLocation="CenterScreen" Icon="/EditorControls;component/q2_48x48c.ico">
+        Title="Script Editor" Height="600" Width="700" ShowInTaskbar="False" WindowStartupLocation="CenterScreen" Icon="Resources/questicon16.ico">
     <Grid TextOptions.TextFormattingMode="Display" x:Name="grid">
     </Grid>
 </Window>
diff --git a/EditorControls/Resources/questicon16.ico b/EditorControls/Resources/questicon16.ico
diff --git a/EditorControls/ScriptAdderPopOut.xaml b/EditorControls/ScriptAdderPopOut.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Name="ScriptAdderWindow"
-        Title="Add Script Command" Height="600" Width="450" ShowInTaskbar="False" WindowStartupLocation="CenterScreen" Icon="/EditorControls;component/q2_48x48c.ico" Initialized="ScriptAdderWindow_Initialized">
+        Title="Add Script Command" Height="600" Width="450" ShowInTaskbar="False" WindowStartupLocation="CenterScreen" Icon="Resources/questicon16.ico" Initialized="ScriptAdderWindow_Initialized">
     <Grid TextOptions.TextFormattingMode="Display">
         <my:ScriptAdder x:Name="ctlScriptAdder" Background="White" />
     </Grid>

diff --git a/EditorControls/ScriptEditorPopOut.xaml b/EditorControls/ScriptEditorPopOut.xaml
@@ -1,7 +1,7 @@
 <Window xmlns:my="clr-namespace:TextAdventures.Quest.EditorControls"  x:Class="TextAdventures.Quest.EditorControls.ScriptEditorPopOut"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Script Editor" Height="600" Width="700" ShowInTaskbar="False" WindowStartupLocation="CenterScreen" Icon="/EditorControls;component/q2_48x48c.ico">
+        Title="Script Editor" Height="600" Width="700" ShowInTaskbar="False" WindowStartupLocation="CenterScreen" Icon="Resources/questicon16.ico">
     <Grid TextOptions.TextFormattingMode="Display">
         <my:ScriptEditorControl x:Name="ctlScriptEditor" />
     </Grid>

diff --git a/EditorControls/q2_48x48c.ico b/EditorControls/q2_48x48c.ico
diff --git a/GameBrowser/My Project/AssemblyInfo.vb b/GameBrowser/My Project/AssemblyInfo.vb
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Textadventures.co.uk")>
 <Assembly: AssemblyProduct("Quest")>
-<Assembly: AssemblyCopyright("Copyright © 2017 Andy Joel - full copyright and license information at https://github.com/textadventures/quest/blob/master/LICENSE")>
+<Assembly: AssemblyCopyright("Copyright © 2017/2018 Andy Joel - full copyright and license information at https://github.com/textadventures/quest/blob/master/LICENSE. All Icons by https://de.icons8.com/ are licensed under CC BY-ND 3.0.")>
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>
@@ -30,4 +30,4 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("5.7.*")>
+<Assembly: AssemblyVersion("5.8.*")>
diff --git a/Legacy/AssemblyInfo.vb b/Legacy/AssemblyInfo.vb
@@ -28,7 +28,7 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("5.7.*")>
+<Assembly: AssemblyVersion("5.8.*")>
 
 
 

diff --git a/Menus/My Project/AssemblyInfo.vb b/Menus/My Project/AssemblyInfo.vb
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("Alex Warren")> 
 <Assembly: AssemblyProduct("Quest")>
-<Assembly: AssemblyCopyright("Copyright © 2017 Andy Joel - full copyright and license information at https://github.com/textadventures/quest/blob/master/LICENSE")>
+<Assembly: AssemblyCopyright("Copyright © 2017/2018 Andy Joel - full copyright and license information at https://github.com/textadventures/quest/blob/master/LICENSE. All Icons by https://de.icons8.com/ are licensed under CC BY-ND 3.0.")>
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>
@@ -30,4 +30,4 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("5.7.*")>
+<Assembly: AssemblyVersion("5.8.*")>
diff --git a/Player/My Project/AssemblyInfo.vb b/Player/My Project/AssemblyInfo.vb
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Textadventures.co.uk")>
 <Assembly: AssemblyProduct("Quest")>
-<Assembly: AssemblyCopyright("Copyright © 2017 Andy Joel - full copyright and license information at https://github.com/textadventures/quest/blob/master/LICENSE")>
+<Assembly: AssemblyCopyright("Copyright © 2017/2018 Andy Joel - full copyright and license information at https://github.com/textadventures/quest/blob/master/LICENSE. All Icons by https://de.icons8.com/ are licensed under CC BY-ND 3.0.")>
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(True)> 
@@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("5.7.*")>
+<Assembly: AssemblyVersion("5.8.*")>
diff --git a/Quest/Constants.vb b/Quest/Constants.vb
@@ -1,6 +1,6 @@
 Public Class Constants
 
-    Public Const QuestVersion As String = "5.7.1"
+    Public Const QuestVersion As String = "5.8.0"
     Public Const MaxASLVersion As Integer = 550
 
 End Class
diff --git a/Quest/Main.Designer.vb b/Quest/Main.Designer.vb