Added an Icon

And fixed some minor issues
AndyFilter · Mar 4, 2021 · 11f3883 · 11f3883
1 parent 0f2487e
commit 11f3883
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/DialogueMaker.sln b/DialogueMaker.sln
@@ -3,18 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31019.35
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DialogueMaker", "DialogueMaker\DialogueMaker.csproj", "{22055CDA-3FA8-45E1-86F6-15C933BDB7A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DialogueMaker", "DialogueMaker\DialogueMaker.csproj", "{22055CDA-3FA8-45E1-86F6-15C933BDB7A6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{22055CDA-3FA8-45E1-86F6-15C933BDB7A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{22055CDA-3FA8-45E1-86F6-15C933BDB7A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22055CDA-3FA8-45E1-86F6-15C933BDB7A6}.Debug|x64.ActiveCfg = Debug|x64
+		{22055CDA-3FA8-45E1-86F6-15C933BDB7A6}.Debug|x64.Build.0 = Debug|x64
 		{22055CDA-3FA8-45E1-86F6-15C933BDB7A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{22055CDA-3FA8-45E1-86F6-15C933BDB7A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22055CDA-3FA8-45E1-86F6-15C933BDB7A6}.Release|x64.ActiveCfg = Release|x64
+		{22055CDA-3FA8-45E1-86F6-15C933BDB7A6}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/DialogueMaker/DialogueMaker.csproj b/DialogueMaker/DialogueMaker.csproj
@@ -1,12 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
+    <ApplicationIcon>media\dialoguemaker.ico</ApplicationIcon>
+    <Platforms>AnyCPU;x64</Platforms>
+    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="media\dialoguemaker.ico" />
+    <None Remove="media\DialogueMaker.png" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="WinCopies.WindowsAPICodePack.Shell" Version="2.1.1" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="media\dialoguemaker.ico" />
+  </ItemGroup>
 </Project>
diff --git a/DialogueMaker/MainWindow.xaml b/DialogueMaker/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:DialogueMaker"
         mc:Ignorable="d"
-        Title="MainWindow" Height="500" Width="800" MinWidth="750" MinHeight="450">
+        Title="Dialogue Maker" Height="500" Width="800" MinWidth="750" MinHeight="450" Icon="/media/DialogueMaker.ico">
     <Grid>
         <TabControl x:Name="TabCrl">
             <TabItem Header="Project">

diff --git a/DialogueMaker/MainWindow.xaml.cs b/DialogueMaker/MainWindow.xaml.cs
@@ -760,8 +760,8 @@ private void SaveClicked(object sender, RoutedEventArgs e)
         {
             if (CurrentProject == null)
             {
-                return;
                 CreateNotification("Please create/select a project first");
+                return;
             }
 
             File.WriteAllText(Utils.GetProjectPath(CurrentProject.Name), JsonSerializer.Serialize(GetCurrentProject()));

diff --git a/DialogueMaker/media/DialogueMaker.ico b/DialogueMaker/media/DialogueMaker.ico
-Original file line number
+Diff line change
@@ Expand Up / @@ -760,8 +760,8 @@ private void SaveClicked(object sender, RoutedEventArgs e) @@
             {
                 if (CurrentProject == null)
                 {
-                    return;
                     CreateNotification("Please create/select a project first");
+                    return;
                 }
                 File.WriteAllText(Utils.GetProjectPath(CurrentProject.Name), JsonSerializer.Serialize(GetCurrentProject()));
@@ Expand Down @@