アプリケーションアイコンの追加

・@Nrtwd 様よりアイコン画像 (icon-app.ai / icon-app.psd) を頂きました・アプリケーションアイコン (.ico) を作成、KanColleViewer.exe に適用・メインウィンドウの左上にアプリケーションアイコンを表示
FolStone · Dec 28, 2013 · 6103531 · 6103531
1 parent 32111cb
commit 6103531
Show file tree

Hide file tree

Showing 19 changed files with 2,558 additions and 76 deletions.
diff --git a/Grabacr07.KanColleViewer/App.xaml b/Grabacr07.KanColleViewer/App.xaml
@@ -1,67 +1,54 @@
-<Application x:Class="Grabacr07.KanColleViewer.App"
-			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			 xmlns:converters="clr-namespace:Grabacr07.Desktop.Metro.Converters;assembly=Desktop.Metro"
-			 xmlns:properties="clr-namespace:Grabacr07.KanColleViewer.Properties"
-			 xmlns:controls="clr-namespace:Grabacr07.KanColleViewer.Views.Controls">
-	<Application.Resources>
-		<ResourceDictionary>
-			<ResourceDictionary.MergedDictionaries>
-				<ResourceDictionary Source="/KanColleViewer;component/Themes/Accent.Purple.xaml" />
-				<ResourceDictionary Source="/KanColleViewer;component/Themes/Mukyutter.Dark.xaml" />
-			</ResourceDictionary.MergedDictionaries>
-
-			<properties:Resources x:Key="LocalizeResourcesKey" />
-
-			<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-			<converters:UniversalBooleanToVisibilityConverter x:Key="UniversalBooleanToVisibilityConverter" />
-			<converters:StringToVisiblityConverter x:Key="StringToVisiblityConverter" />
-
-			<Style x:Key="ApplicationIconKey"
-				   TargetType="{x:Type Path}">
-				<Setter Property="Data"
-						Value="M328.49996,380.74985 C342.45233,378.36966 349.71029,379.13253 366.50014,380.50004 385.12371,383.94725 396.07434,387.44681 407.49993,392.5 423.60105,399.54721 437.15414,409.61321 448.24991,420.00001 457.67006,427.68903 466.25377,438.40612 474.25,451.25 481.91767,462.71322 486.752,474.8933 490.4999,487.25015 495.29077,504.81414 497.77725,522.84246 496.62871,542.03713 494.25803,559.98613 489.90724,577.16435 482.74974,593.25004 475.20732,608.76801 467.22481,622.62276&#xA;455.5,634.5 440.06382,649.44315 422.83698,661.39858 403.74981,670.25 386.72326,678.02825 368.31231,681.87777 348.49986,681.75 326.74287,682.20962 305.68185,678.56947 285.50007,669.75005 269.10361,663.32027 256.2071,653.72716 244.75003,643.5004 237.11635,637.03001 227.00184,626.77773 217.50001,611.50006 212.97226,605.21272 208.47784,595.76656 204,584.75006 212.2837,593.82582 216.68662,599.26216 224.00002,606.00036 224.8224,607.61603&#xA;245.06753,620.35346 245.75,620 246.49267,622.28463 274.72121,632.80687 275.5,632 287.77955,636.11028 301.16049,637.44572 315.75,635.75 329.37066,635.35548 342.28966,632.77941 354.5,628 364.40428,623.9463 374.39735,618.55114 384.5,611.5 392.76169,604.49377 400.61802,596.46827 408,587.25 419.12115,572.92254 426.67823,558.5893 430.5,544.25 433.68629,533.22156 435.51539,521.13493 436,508&#xA;436.06032,496.8092 433.86951,483.69316 429.25,468.5 427.08396,460.94953 422.96328,452.58003 417.66685,442.00015 414.0671,436.21615 409.48586,428.81391 403,421.25 395.3776,413.5802 388.26961,407.18185 380.75,403 370.09823,395.48512 360.47601,390.30453 352,387.25 z" />
-				<Setter Property="Stretch"
-						Value="Uniform" />
-				<Setter Property="Fill"
-						Value="{DynamicResource ActiveForegroundBrushKey}" />
-				<Setter Property="SnapsToDevicePixels"
-						Value="True" />
-			</Style>
-
-
-			<Style TargetType="{x:Type TextBlock}">
-				<Setter Property="FontSize"
-						Value="12" />
-				<Setter Property="Foreground"
-						Value="{DynamicResource ForegroundBrushKey}" />
-				<Setter Property="TextTrimming"
-						Value="WordEllipsis" />
-				<Setter Property="VerticalAlignment"
-						Value="Center" />
-				<Style.Triggers>
-					<Trigger Property="IsEnabled"
-							 Value="False">
-						<Setter Property="Opacity"
-								Value="0.75" />
-					</Trigger>
-				</Style.Triggers>
-			</Style>
-			<Style x:Key="PickupTextElementStyleKey"
-				   TargetType="{x:Type Run}">
-				<Setter Property="FontSize"
-						Value="15" />
-				<Setter Property="Foreground"
-						Value="{DynamicResource ActiveForegroundBrushKey}" />
-			</Style>
-
-			<Style x:Key="SeparatorRectangleStyleKey"
-				   TargetType="{x:Type Rectangle}">
-				<Setter Property="Fill"
-						Value="{DynamicResource InactiveForegroundBrushKey}" />
-				<Setter Property="Opacity"
-						Value="0.6" />
-			</Style>
-		</ResourceDictionary>
-	</Application.Resources>
+<Application x:Class="Grabacr07.KanColleViewer.App"
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:converters="clr-namespace:Grabacr07.Desktop.Metro.Converters;assembly=Desktop.Metro"
+			 xmlns:properties="clr-namespace:Grabacr07.KanColleViewer.Properties"
+			 xmlns:controls="clr-namespace:Grabacr07.KanColleViewer.Views.Controls">
+	<Application.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary Source="/KanColleViewer;component/Themes/Accent.Purple.xaml" />
+				<ResourceDictionary Source="/KanColleViewer;component/Themes/Mukyutter.Dark.xaml" />
+			</ResourceDictionary.MergedDictionaries>
+
+			<properties:Resources x:Key="LocalizeResourcesKey" />
+
+			<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+			<converters:UniversalBooleanToVisibilityConverter x:Key="UniversalBooleanToVisibilityConverter" />
+			<converters:StringToVisiblityConverter x:Key="StringToVisiblityConverter" />
+
+			<Style TargetType="{x:Type TextBlock}">
+				<Setter Property="FontSize"
+						Value="12" />
+				<Setter Property="Foreground"
+						Value="{DynamicResource ForegroundBrushKey}" />
+				<Setter Property="TextTrimming"
+						Value="WordEllipsis" />
+				<Setter Property="VerticalAlignment"
+						Value="Center" />
+				<Style.Triggers>
+					<Trigger Property="IsEnabled"
+							 Value="False">
+						<Setter Property="Opacity"
+								Value="0.75" />
+					</Trigger>
+				</Style.Triggers>
+			</Style>
+			<Style x:Key="PickupTextElementStyleKey"
+				   TargetType="{x:Type Run}">
+				<Setter Property="FontSize"
+						Value="15" />
+				<Setter Property="Foreground"
+						Value="{DynamicResource ActiveForegroundBrushKey}" />
+			</Style>
+
+			<Style x:Key="SeparatorRectangleStyleKey"
+				   TargetType="{x:Type Rectangle}">
+				<Setter Property="Fill"
+						Value="{DynamicResource InactiveForegroundBrushKey}" />
+				<Setter Property="Opacity"
+						Value="0.6" />
+			</Style>
+		</ResourceDictionary>
+	</Application.Resources>
 </Application>
diff --git a/Grabacr07.KanColleViewer/Assets/app.ico b/Grabacr07.KanColleViewer/Assets/app.ico
diff --git a/Grabacr07.KanColleViewer/KanColleViewer.csproj b/Grabacr07.KanColleViewer/KanColleViewer.csproj
@@ -47,6 +47,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Assets\app.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CoreAudioApi, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -167,6 +170,7 @@
       <DependentUpon>Quests.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\Contents\QuestViewSource.cs" />
+    <Compile Include="Views\Controls\AppIcon.cs" />
     <Compile Include="Views\Controls\BuildingDock.cs" />
     <Compile Include="Views\Controls\MuteButton.cs" />
     <Compile Include="Views\Controls\NavigationButton.cs" />
@@ -361,6 +365,9 @@
   <ItemGroup>
     <None Include="assemblies\CoreAudioApi.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\app.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.