Skip to content

Commit 9d449ee

Browse files
tonyp7tonyp7
committed
update to 2.2.1
1 parent 002984e commit 9d449ee

File tree

8 files changed

+187
-13
lines changed

8 files changed

+187
-13
lines changed

‎ImageView/Components/ImageBox.cs‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
1-
using System;
1+
/*
2+
MIT License
3+
4+
Copyright (c) 2020 Tony Pottier
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+
*/
24+
25+
using System;
226
using System.Collections.Generic;
327
using System.ComponentModel;
428
using System.Drawing;
@@ -12,7 +36,7 @@
1236
namespace ImageView.Components
1337
{
1438
/// <summary>
15-
/// Place holder for a high performing blitter
39+
/// A higher performance picturebox
1640
/// </summary>
1741
public class ImageBox : System.Windows.Forms.PictureBox
1842
{

‎ImageView/Configuration/ConfigGeneral.cs‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
1-
using System;
1+
/*
2+
MIT License
3+
4+
Copyright (c) 2020 Tony Pottier
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+
*/
24+
25+
using System;
226
using System.Collections.Generic;
327
using System.Globalization;
428
using System.Linq;

‎ImageView/FrmLicense.cs‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,27 @@
1-
using ImageView.Configuration;
1+
/*
2+
MIT License
3+
4+
Copyright (c) 2020 Tony Pottier
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+
*/
24+
using ImageView.Configuration;
225
using System;
326
using System.Collections.Generic;
427
using System.ComponentModel;

‎ImageView/FrmSplashScreen.cs‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,27 @@
1-
using ImageView.Configuration;
1+
/*
2+
MIT License
3+
4+
Copyright (c) 2020 Tony Pottier
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+
*/
24+
using ImageView.Configuration;
225
using System;
326
using System.Collections.Generic;
427
using System.ComponentModel;

‎ImageView/ImageView.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3131
using System.Collections.Generic;
3232
using ImageMagick;
3333
using System.Diagnostics;
34-
3534
using ImageView.Configuration;
3635
using SevenZipExtractor;
3736
using ImageView.ImageEntry;

‎ImageView/ImageView.csproj‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<IsWebBootstrapper>false</IsWebBootstrapper>
1515
<NuGetPackageImportStamp>
1616
</NuGetPackageImportStamp>
17+
<TargetFrameworkProfile />
1718
<PublishUrl>publish\</PublishUrl>
1819
<Install>true</Install>
1920
<InstallFrom>Disk</InstallFrom>
@@ -24,11 +25,11 @@
2425
<UpdatePeriodically>false</UpdatePeriodically>
2526
<UpdateRequired>false</UpdateRequired>
2627
<MapFileExtensions>true</MapFileExtensions>
27-
<ApplicationRevision>0</ApplicationRevision>
28+
<ApplicationRevision>1</ApplicationRevision>
2829
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
2930
<UseApplicationTrust>false</UseApplicationTrust>
31+
<PublishWizardCompleted>true</PublishWizardCompleted>
3032
<BootstrapperEnabled>true</BootstrapperEnabled>
31-
<TargetFrameworkProfile />
3233
</PropertyGroup>
3334
<PropertyGroup>
3435
<ApplicationIcon>imageview.ico</ApplicationIcon>
@@ -41,7 +42,7 @@
4142
</AssemblyOriginatorKeyFile>
4243
</PropertyGroup>
4344
<PropertyGroup>
44-
<SignManifests>false</SignManifests>
45+
<SignManifests>true</SignManifests>
4546
</PropertyGroup>
4647
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
4748
<DebugSymbols>true</DebugSymbols>
@@ -79,6 +80,15 @@
7980
<ManifestTimestampUrl>
8081
</ManifestTimestampUrl>
8182
</PropertyGroup>
83+
<PropertyGroup>
84+
<GenerateManifests>false</GenerateManifests>
85+
</PropertyGroup>
86+
<PropertyGroup>
87+
<TargetZone>LocalIntranet</TargetZone>
88+
</PropertyGroup>
89+
<PropertyGroup>
90+
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
91+
</PropertyGroup>
8292
<ItemGroup>
8393
<Reference Include="Magick.NET-Q8-OpenMP-x64, Version=7.17.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
8494
<HintPath>..\packages\Magick.NET-Q8-OpenMP-x64.7.17.0.1\lib\net40\Magick.NET-Q8-OpenMP-x64.dll</HintPath>
@@ -212,6 +222,7 @@
212222
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
213223
</None>
214224
<None Include="packages.config" />
225+
<None Include="Properties\app.manifest" />
215226
<None Include="Properties\Settings.settings">
216227
<Generator>SettingsSingleFileGenerator</Generator>
217228
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -266,7 +277,7 @@
266277
</ItemGroup>
267278
<ItemGroup>
268279
<Content Include="imageview.ico" />
269-
<None Include="Resources\error.png" />
280+
<EmbeddedResource Include="Resources\error.png" />
270281
<None Include="Resources\transparent16.png" />
271282
<None Include="Resources\fr.png" />
272283
<None Include="Resources\en.png" />
@@ -325,6 +336,6 @@
325336
<Error Condition="!Exists('..\packages\Magick.NET-Q8-OpenMP-x64.7.17.0.1\build\net40\Magick.NET-Q8-OpenMP-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Magick.NET-Q8-OpenMP-x64.7.17.0.1\build\net40\Magick.NET-Q8-OpenMP-x64.targets'))" />
326337
</Target>
327338
<Import Project="..\packages\SevenZipExtractor.1.0.15\build\SevenZipExtractor.targets" Condition="Exists('..\packages\SevenZipExtractor.1.0.15\build\SevenZipExtractor.targets')" />
328-
<Import Project="..\packages\Magick.NET-Q8-OpenMP-x64.7.17.0.1\build\net40\Magick.NET-Q8-OpenMP-x64.targets" Condition="Exists('..\packages\Magick.NET-Q8-OpenMP-x64.7.17.0.1\build\net40\Magick.NET-Q8-OpenMP-x64.targets')" />
329339
<Import Project="MsBuildAL1073WarningWorkaround.targets" />
340+
<Import Project="..\packages\Magick.NET-Q8-OpenMP-x64.7.17.0.1\build\net40\Magick.NET-Q8-OpenMP-x64.targets" Condition="Exists('..\packages\Magick.NET-Q8-OpenMP-x64.7.17.0.1\build\net40\Magick.NET-Q8-OpenMP-x64.targets')" />
330341
</Project>

‎ImageView/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("2.0.0.0")]
37-
[assembly: AssemblyFileVersion("2.0.0.0")]
36+
[assembly: AssemblyVersion("2.2.1.0")]
37+
[assembly: AssemblyFileVersion("2.2.1.0")]
3838
[assembly: NeutralResourcesLanguage("")]

‎ImageView/Properties/app.manifest‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3+
<assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
4+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
5+
<security>
6+
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
7+
<!-- UAC Manifest Options
8+
If you want to change the Windows User Account Control level replace the
9+
requestedExecutionLevel node with one of the following.
10+
11+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
12+
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
13+
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
14+
15+
Specifying requestedExecutionLevel element will disable file and registry virtualization.
16+
Remove this element if your application requires this virtualization for backwards
17+
compatibility.
18+
-->
19+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
20+
</requestedPrivileges>
21+
<applicationRequestMinimum>
22+
<PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
23+
<defaultAssemblyRequest permissionSetReference="Custom" />
24+
</applicationRequestMinimum>
25+
</security>
26+
</trustInfo>
27+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
28+
<application>
29+
<!-- A list of the Windows versions that this application has been tested on
30+
and is designed to work with. Uncomment the appropriate elements
31+
and Windows will automatically select the most compatible environment. -->
32+
<!-- Windows Vista -->
33+
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
34+
<!-- Windows 7 -->
35+
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
36+
<!-- Windows 8 -->
37+
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
38+
<!-- Windows 8.1 -->
39+
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
40+
<!-- Windows 10 -->
41+
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
42+
</application>
43+
</compatibility>
44+
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
45+
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
46+
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
47+
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
48+
<!--
49+
<application xmlns="urn:schemas-microsoft-com:asm.v3">
50+
<windowsSettings>
51+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
52+
</windowsSettings>
53+
</application>
54+
-->
55+
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
56+
<!--
57+
<dependency>
58+
<dependentAssembly>
59+
<assemblyIdentity
60+
type="win32"
61+
name="Microsoft.Windows.Common-Controls"
62+
version="6.0.0.0"
63+
processorArchitecture="*"
64+
publicKeyToken="6595b64144ccf1df"
65+
language="*"
66+
/>
67+
</dependentAssembly>
68+
</dependency>
69+
-->
70+
</assembly>

0 commit comments

Comments
 (0)