Skip to content

Commit e2f5f94

Browse files
committed
[#] All forms use one Icon. Change configuration file path.
1 parent 685f841 commit e2f5f94

File tree

13 files changed

+170
-7065
lines changed

13 files changed

+170
-7065
lines changed

PasteEx/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</configSections>
88
<runtime>
99
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
10-
<probing privatePath="PasteEx/Language" />
10+
<probing privatePath="Language" />
1111
</assemblyBinding>
1212
</runtime>
1313
<startup>

PasteEx/FormMain.Designer.cs

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

PasteEx/FormMain.resx

Lines changed: 152 additions & 1796 deletions
Large diffs are not rendered by default.

PasteEx/FormMain.zh-CN.resx

Lines changed: 0 additions & 1656 deletions
Large diffs are not rendered by default.

PasteEx/FormSetting.Designer.cs

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

PasteEx/FormSetting.resx

Lines changed: 0 additions & 1656 deletions
Large diffs are not rendered by default.

PasteEx/FormSetting.zh-CN.resx

Lines changed: 0 additions & 1656 deletions
Large diffs are not rendered by default.

PasteEx/MySettingsProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public sealed class MySettingsProvider : SettingsProvider, IApplicationSettingsP
1818
private const string _globalSettingsNodeName = "globalSettings";
1919
private const string _className = "MySettingsProvider";
2020

21-
public string _path = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "PasteEx", "PasteEx.settings");
21+
public string _path = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "User", "PasteEx.settings");
2222

2323
private XmlDocument _xmlDocument;
2424

PasteEx/PasteEx.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<AssemblyName>PasteEx</AssemblyName>
1111
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
13+
<IsWebBootstrapper>false</IsWebBootstrapper>
1314
<PublishUrl>publish\</PublishUrl>
1415
<Install>true</Install>
1516
<InstallFrom>Disk</InstallFrom>
@@ -22,7 +23,6 @@
2223
<MapFileExtensions>true</MapFileExtensions>
2324
<ApplicationRevision>0</ApplicationRevision>
2425
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
25-
<IsWebBootstrapper>false</IsWebBootstrapper>
2626
<UseApplicationTrust>false</UseApplicationTrust>
2727
<BootstrapperEnabled>true</BootstrapperEnabled>
2828
</PropertyGroup>
@@ -125,7 +125,10 @@
125125
<EmbeddedResource Include="FormSetting.zh-CN.resx">
126126
<DependentUpon>FormSetting.cs</DependentUpon>
127127
</EmbeddedResource>
128-
<EmbeddedResource Include="Properties\Resources.resx" />
128+
<EmbeddedResource Include="Properties\Resources.resx">
129+
<Generator>ResXFileCodeGenerator</Generator>
130+
<LastGenOutput>Resources1.Designer.cs</LastGenOutput>
131+
</EmbeddedResource>
129132
<EmbeddedResource Include="Resources\Strings.resx">
130133
<Generator>ResXFileCodeGenerator</Generator>
131134
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
@@ -163,7 +166,7 @@
163166
<ItemGroup />
164167
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
165168
<PropertyGroup>
166-
<PostBuildEvent>xcopy /s /y zh-CN PasteEx\Language\zh-CN\
169+
<PostBuildEvent>xcopy /s /y zh-CN Language\zh-CN\
167170
rd /s /q zh-CN</PostBuildEvent>
168171
</PropertyGroup>
169172
</Project>

PasteEx/Properties/Resources.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)