[#] All forms use one Icon. Change configuration file path.

huiyadanli · Apr 4, 2018 · e2f5f94 · e2f5f94
1 parent 685f841
commit e2f5f94
Show file tree

Hide file tree

Showing 13 changed files with 170 additions and 7,065 deletions.
diff --git a/PasteEx/App.config b/PasteEx/App.config
@@ -7,7 +7,7 @@
     </configSections>
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <probing privatePath="PasteEx/Language" />
+            <probing privatePath="Language" />
         </assemblyBinding>
     </runtime>
     <startup> 

diff --git a/PasteEx/FormMain.Designer.cs b/PasteEx/FormMain.Designer.cs
diff --git a/PasteEx/FormMain.resx b/PasteEx/FormMain.resx
diff --git a/PasteEx/FormMain.zh-CN.resx b/PasteEx/FormMain.zh-CN.resx
diff --git a/PasteEx/FormSetting.Designer.cs b/PasteEx/FormSetting.Designer.cs
diff --git a/PasteEx/FormSetting.resx b/PasteEx/FormSetting.resx
diff --git a/PasteEx/FormSetting.zh-CN.resx b/PasteEx/FormSetting.zh-CN.resx
diff --git a/PasteEx/MySettingsProvider.cs b/PasteEx/MySettingsProvider.cs
@@ -18,7 +18,7 @@ public sealed class MySettingsProvider : SettingsProvider, IApplicationSettingsP
         private const string _globalSettingsNodeName = "globalSettings";
         private const string _className = "MySettingsProvider";
 
-        public string _path = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "PasteEx", "PasteEx.settings");
+        public string _path = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "User", "PasteEx.settings");
 
         private XmlDocument _xmlDocument;
 

diff --git a/PasteEx/PasteEx.csproj b/PasteEx/PasteEx.csproj
@@ -10,6 +10,7 @@
     <AssemblyName>PasteEx</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -22,7 +23,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -125,7 +125,10 @@
     <EmbeddedResource Include="FormSetting.zh-CN.resx">
       <DependentUpon>FormSetting.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources1.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources\Strings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
@@ -163,7 +166,7 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /s /y zh-CN PasteEx\Language\zh-CN\
+    <PostBuildEvent>xcopy /s /y zh-CN Language\zh-CN\
 rd /s /q zh-CN</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/PasteEx/Properties/Resources.Designer.cs b/PasteEx/Properties/Resources.Designer.cs
diff --git a/PasteEx/Properties/Resources.resx b/PasteEx/Properties/Resources.resx
@@ -119,7 +119,7 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Image\ico.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Image\ico.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="loading" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Image\loading.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>