add icon

jarvisniu · Feb 27, 2016 · c94d291 · c94d291
1 parent 9c7ae3d
commit c94d291
Show file tree

Hide file tree

Showing 12 changed files with 102 additions and 25 deletions.
diff --git a/Niv.csproj b/Niv.csproj
@@ -51,6 +51,9 @@
   <PropertyGroup>
     <StartupObject>Niv.App</StartupObject>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>res\Niv.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -101,10 +104,10 @@
     <Compile Include="prop\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="resx\Languages.en-US.Designer.cs">
+    <Compile Include="resx\Languages.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>Languages.en-US.resx</DependentUpon>
+      <DependentUpon>Languages.resx</DependentUpon>
     </Compile>
     <Compile Include="prop\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -123,9 +126,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Languages.zh-CN.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="resx\Languages.en-US.resx">
+    <EmbeddedResource Include="resx\Languages.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Languages.en-US.Designer.cs</LastGenOutput>
+      <LastGenOutput>Languages.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="prop\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -142,7 +145,7 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
-    <Resource Include="res\Niv.png" />
+    <Resource Include="res\Niv.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/exe/Niv.exe b/exe/Niv.exe
diff --git a/prop/AssemblyInfo.cs b/prop/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyDescription("A fast compact image viewer on Windows")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Jarvis Niu")]
-[assembly: AssemblyProduct("Niv")]
+[assembly: AssemblyProduct("Niv - Niu Image Viewer")]
 [assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyTrademark("Niv")]
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]

diff --git a/res/Niv.ico b/res/Niv.ico
diff --git a/res/Niv.png b/res/Niv.png
diff --git a/resx/Languages.Designer.cs b/resx/Languages.Designer.cs
diff --git a/resx/Languages.en-US.Designer.cs b/resx/Languages.en-US.Designer.cs
diff --git a/resx/Languages.en-US.resx → resx/Languages.resx b/resx/Languages.en-US.resx → resx/Languages.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="appName" xml:space="preserve">
-    <value>Niv Image Viewer</value>
+    <value>Niv</value>
   </data>
   <data name="_missing" xml:space="preserve">
     <value>[DATA MISSING]</value>

diff --git a/resx/Resources.Designer.cs b/resx/Resources.Designer.cs
diff --git a/resx/Resources.resx b/resx/Resources.resx
@@ -117,8 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Niv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\res\Niv.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>
diff --git a/src/I18N.cs b/src/I18N.cs
@@ -22,8 +22,15 @@ static I18N()
             currLang = Thread.CurrentThread.CurrentCulture.Name;
             if (currLang != "zh-CN" && currLang != "zh-TW") currLang = "en-US";
             // currLang = "zh-TW";
-
-            cultureInfo = new CultureInfo(currLang, true);
+            try
+            {
+                cultureInfo = new CultureInfo(currLang, true);
+            }
+            catch (Exception ex)
+            {
+                currLang = "en-US";
+                cultureInfo = new CultureInfo(currLang, true);
+            }
             resManager = new ResourceManager("Niv.resx.Languages", Assembly.GetExecutingAssembly());
         }
 

diff --git a/win/Niv.xaml b/win/Niv.xaml
@@ -5,6 +5,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Niv"
         mc:Ignorable="d"
-        Title="MainWindow" Height="350" Width="525" Loaded="window_Loaded" WindowStartupLocation="CenterScreen" WindowState="Maximized">
+        Title="MainWindow" Height="350" Width="525" Loaded="window_Loaded" WindowStartupLocation="CenterScreen" WindowState="Maximized" Icon="/Niv;component/res/Niv.ico">
     <Grid/>
 </Window>