Merge pull request #27 from radikale/master

Added "Fixed value" funcionality. 1.4.5.0
Tadelsucht · Jul 7, 2022 · 8f5ff00 · 8f5ff00
2 parents 969e9ad + 6bf17e9
commit 8f5ff00
Show file tree

Hide file tree

Showing 20 changed files with 335 additions and 160 deletions.
diff --git a/BulkPDF/App.config b/BulkPDF/App.config
@@ -17,7 +17,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="8fb06cb64d019a17" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.14.0.0" newVersion="2.14.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.17.1.0" newVersion="2.17.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

diff --git a/BulkPDF/BulkPDF.csproj b/BulkPDF/BulkPDF.csproj
@@ -62,8 +62,31 @@
     <StartupObject>BulkPDF.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
+      <HintPath>..\packages\BouncyCastle.1.8.9\lib\BouncyCastle.Crypto.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml, Version=2.11.3.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.2.11.3\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="itextsharp, Version=5.5.13.3, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+      <HintPath>..\packages\iTextSharp.5.5.13.3\lib\itextsharp.dll</HintPath>
+    </Reference>
+    <Reference Include="SpreadsheetLight, Version=3.5.0.0, Culture=neutral, PublicKeyToken=32fbb46dc1730c57, processorArchitecture=MSIL">
+      <HintPath>..\packages\SpreadsheetLight.3.5.0\lib\netstandard2.0\SpreadsheetLight.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Drawing.Common.6.0.0\lib\net461\System.Drawing.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.Packaging, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Packaging.6.0.0\lib\net461\System.IO.Packaging.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
@@ -173,6 +196,7 @@
     <None Include="Example.xlsx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -212,16 +236,6 @@
     </Content>
     <Content Include="Logo.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\BulkPDFConsole\BulkPDFConsole.csproj">
-      <Project>{686C3B64-15A6-4347-B3A2-23DA2C6D67F0}</Project>
-      <Name>BulkPDFConsole</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\BulkPDFCore\BulkPDFCore.csproj">
-      <Project>{2729DD97-FBAC-41AB-8D18-680E2B451D11}</Project>
-      <Name>BulkPDFCore</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <COMReference Include="IWshRuntimeLibrary">
       <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
@@ -233,6 +247,16 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\BulkPDFConsole\BulkPDFConsole.csproj">
+      <Project>{686c3b64-15a6-4347-b3a2-23da2c6d67f0}</Project>
+      <Name>BulkPDFConsole</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\BulkPDFCore\BulkPDFCore.csproj">
+      <Project>{2729dd97-fbac-41ab-8d18-680e2b451d11}</Project>
+      <Name>BulkPDFCore</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/BulkPDF/FieldOptionForm.Designer.cs b/BulkPDF/FieldOptionForm.Designer.cs
diff --git a/BulkPDF/FieldOptionForm.cs b/BulkPDF/FieldOptionForm.cs
@@ -41,6 +41,13 @@ public FieldOptionForm(Point location, PDFField pdfField, List<string> dataSourc
             cbUseValueFromDataSource.Checked = pdfField.UseValueFromDataSource;
             cbUseValueFromDataSource_CheckedChanged(null, null);
 
+            tbFixedValue.Text = "";
+            if (!String.IsNullOrEmpty(pdfField.FixedValue))
+                tbFixedValue.Text = PDFField.FixedValue;
+
+            cbUseFixedValue.Checked = pdfField.UseFixedValue;
+            cbUseFixedValue_CheckedChanged(null, null);
+
             cbReadOnly.Checked = pdfField.MakeReadOnly;
             cbReadOnly_CheckedChanged(null, null);
         }
@@ -75,11 +82,26 @@ private void cbUseValueFromDataSource_CheckedChanged(object sender, EventArgs e)
         {
             cbDataSourceColumns.Enabled = cbUseValueFromDataSource.Checked;
             pdfField.UseValueFromDataSource = cbUseValueFromDataSource.Checked;
+            if (cbUseValueFromDataSource.Checked && cbUseFixedValue.Checked)
+                cbUseFixedValue.Checked = false;
         }
 
         private void FieldOptionForm_FormClosing(object sender, FormClosingEventArgs e)
         {
             SavedLocation = this.DesktopLocation;
         }
+
+        private void cbUseFixedValue_CheckedChanged(object sender, EventArgs e)
+        {
+            tbFixedValue.Enabled = cbUseFixedValue.Checked;
+            pdfField.UseFixedValue = cbUseFixedValue.Checked;
+            if (cbUseFixedValue.Checked && cbUseValueFromDataSource.Checked)
+                cbUseValueFromDataSource.Checked = false;
+        }
+
+        private void tbFixedValue_Validated(object sender, EventArgs e)
+        {
+            pdfField.FixedValue = tbFixedValue.Text;
+        }
     }
 }
diff --git a/BulkPDF/FieldOptionForm.de.resx b/BulkPDF/FieldOptionForm.de.resx
@@ -112,18 +112,15 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="cbDataSourceColumns.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 54</value>
-  </data>
   <data name="bSet.Text" xml:space="preserve">
     <value>Auswählen</value>
   </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="cbUseValueFromDataSource.Size" type="System.Drawing.Size, System.Drawing">
     <value>212, 17</value>
   </data>
@@ -136,6 +133,12 @@
   <data name="cbReadOnly.Text" xml:space="preserve">
     <value>Schreibschutz setzen</value>
   </data>
+  <data name="cbUseFixedValue.Size" type="System.Drawing.Size, System.Drawing">
+    <value>119, 17</value>
+  </data>
+  <data name="cbUseFixedValue.Text" xml:space="preserve">
+    <value>Festen Wert nutzen</value>
+  </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAUAAAAAAAEAIAAGEAAAVgAAADAwAAABACAAqCUAAFwQAAAgIAAAAQAgAKgQAAAENgAAGBgAAAEA
@@ -501,7 +504,7 @@
         wAMAAMABAADAAQAAwAEAAMABAADAAQAAwAEAAMABAAAAAQAAAAEAAAABAAAAAQAAwAEAAOABAADwAQAA
 </value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>Manual</value>
   </data>