submodules update; icon change

flexxxxer · Jul 16, 2020 · 6735812 · 6735812
1 parent e6acdf2
commit 6735812
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 4 deletions.
diff --git a/FrameTimeHandler/Assets/avalonia-logo.ico b/FrameTimeHandler/Assets/avalonia-logo.ico
diff --git a/FrameTimeHandler/Assets/fth-logo.ico b/FrameTimeHandler/Assets/fth-logo.ico
diff --git a/FrameTimeHandler/FrameTimeHandler.csproj b/FrameTimeHandler/FrameTimeHandler.csproj
@@ -3,6 +3,11 @@
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>netcoreapp3.1</TargetFramework>
 		<InvariantGlobalization>true</InvariantGlobalization>
+		<ApplicationIcon>Assets\fth-logo.ico</ApplicationIcon>
+		<Version>0.1</Version>
+		<Description>frame time graph creation tool</Description>
+		<PackageProjectUrl>https://github.com/FlexxxerAlex/frametime-handler</PackageProjectUrl>
+		<PackageIcon>fth-logo.ico</PackageIcon>
 	</PropertyGroup>
 	<ItemGroup>
 		<AvaloniaResource Include="Assets\**" />
@@ -18,6 +23,12 @@
 	<ItemGroup>
 		<ProjectReference Include="..\PythonInterop\PythonInterop\PythonInterop.csproj" />
 	</ItemGroup>
+	<ItemGroup>
+	  <None Include="Assets\fth-logo.ico">
+	    <Pack>True</Pack>
+	    <PackagePath></PackagePath>
+	  </None>
+	</ItemGroup>
 	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
 	  <Exec Command="if $(ConfigurationName) == Debug (&#xD;&#xA;     cd $(SolutionDir)&#xD;&#xA;&#xD;&#xA;     Xcopy ftanlzer $(TargetDir)ftanlzer\ /K /D /H /Y /s /e&#xD;&#xA;)" />
 	</Target>

diff --git a/FrameTimeHandler/ViewModels/MainWindowViewModel.cs b/FrameTimeHandler/ViewModels/MainWindowViewModel.cs
@@ -301,11 +301,15 @@ public MainWindowViewModel()
                 var fileDialog = new OpenFileDialog()
                 {
                     AllowMultiple = false,
-                    Directory = Directory.GetCurrentDirectory()
                 };
 
                 string[] results = await fileDialog.ShowAsync((Application.Current.ApplicationLifetime as ClassicDesktopStyleApplicationLifetime)?.MainWindow);
 
+                if (results is null)
+                {
+                    return;
+                }
+
                 string selectedFile = results.FirstOrDefault(r => string.IsNullOrEmpty(r) is false);
 
                 if (!string.IsNullOrEmpty(selectedFile))

diff --git a/FrameTimeHandler/Views/MainWindow.axaml b/FrameTimeHandler/Views/MainWindow.axaml
@@ -12,7 +12,7 @@
         TextBlock.FontSize="{DynamicResource FontSizeNormal}"
 
         x:Class="FrameTimeHandler.Views.MainWindow"
-        Icon="/Assets/avalonia-logo.ico"
+        Icon="/Assets/fth-logo.ico"
         Title="FrameTime Handler"
 		WindowStartupLocation="Manual"
 		mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="300"

diff --git a/PythonInterop b/PythonInterop
diff --git a/ftanlzer b/ftanlzer