Skip to content

Commit 5063a73

Browse files
committed
refactoring custom property collection
1 parent bde351d commit 5063a73

File tree

7 files changed

+232
-238
lines changed

7 files changed

+232
-238
lines changed

PdfFileType/Export/PdfExporter.cs

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Linq;
1111
using System.Threading;
1212
using PaintDotNet;
13+
using PaintDotNet.PropertySystem;
1314
using PaintDotNet.Rendering;
1415

1516
namespace PdfFileTypePlugin.Export
@@ -52,12 +53,16 @@ protected PdfExporter(Document input, Stream output, PropertyBasedSaveConfigToke
5253
ScratchSurface = scratchSurface;
5354
progress = progressCallback;
5455

55-
Quality = token.GetInt32PropertyValue(PropertyNames.Quality);
56-
SkipHiddenLayers = token.GetBooleanPropertyValue(PropertyNames.SkipInvisibleLayers);
57-
SkipDuplicateLayers = token.GetBooleanPropertyValue(PropertyNames.SkipDuplicateLayers);
58-
PdfStd = (PdfStandard)token.GetStaticListChoicePropertyValue(PropertyNames.PdfStandard);
59-
Mode = (ExportMode)token.GetStaticListChoicePropertyValue(PropertyNames.ExportMode);
60-
EmbedProperties = token.GetBooleanPropertyValue(PropertyNames.EmbedProperties) && (Mode == ExportMode.Cropped || Mode == ExportMode.Normal);
56+
PropertyCollection props = token.Properties;
57+
58+
#pragma warning disable format // @formatter:off
59+
Quality = props.GetPropertyValue<int>(PropertyNames.Quality);
60+
SkipHiddenLayers = props.GetPropertyValue<bool>(PropertyNames.SkipInvisibleLayers);
61+
SkipDuplicateLayers = props.GetPropertyValue<bool>(PropertyNames.SkipDuplicateLayers);
62+
PdfStd = props.GetPropertyValue<PdfStandard>(PropertyNames.PdfStandard);
63+
Mode = props.GetPropertyValue<ExportMode>(PropertyNames.ExportMode);
64+
EmbedProperties = props.GetPropertyValue<bool>(PropertyNames.EmbedProperties) && (Mode == ExportMode.Cropped || Mode == ExportMode.Normal);
65+
#pragma warning restore format // @formatter:on
6166

6267
if (EmbedProperties)
6368
{
@@ -164,7 +169,8 @@ protected MemoryStream EncodeLossless(Bitmap bmp)
164169

165170
public static PdfExporter Create(Document input, Stream output, PropertyBasedSaveConfigToken token, Surface scratchSurface, ProgressEventHandler progressCallback)
166171
{
167-
PdfStandard std = (PdfStandard)token.GetStaticListChoicePropertyValue(PropertyNames.PdfStandard);
172+
PropertyCollection props = token.Properties;
173+
PdfStandard std = props.GetPropertyValue<PdfStandard>(PropertyNames.PdfStandard);
168174
return std == PdfStandard.None
169175
#pragma warning disable IDE0004
170176
? (PdfExporter)new PdfiumExporter(input, output, token, scratchSurface, progressCallback)

PdfFileType/Localization/StringResources.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="Alignment" xml:space="preserve">
121121
<value>Alignment</value>

PdfFileType/PaintDotNet/PropertyBasedEffectConfigTokenExtensions.cs

Lines changed: 0 additions & 47 deletions
This file was deleted.

PdfFileType/PaintDotNet/PropertyBasedSaveConfigTokenExtensions.cs

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)