Unicode support

Tadelsucht · Mar 21, 2021 · b92c727 · b92c727
1 parent 9033145
commit b92c727
Show file tree

Hide file tree

Showing 14 changed files with 543 additions and 72 deletions.
diff --git a/BulkPDF/BulkPDF.csproj b/BulkPDF/BulkPDF.csproj
@@ -137,6 +137,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="FieldOptionForm.de.resx">
       <DependentUpon>FieldOptionForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="FieldOptionForm.resx">
       <DependentUpon>FieldOptionForm.cs</DependentUpon>
@@ -146,6 +147,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="MainForm.de.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="ProgressForm.de.resx">
       <DependentUpon>ProgressForm.cs</DependentUpon>
@@ -188,6 +190,9 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <None Include="unifont.ttf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="App.config" />

diff --git a/BulkPDF/Example.xlsx b/BulkPDF/Example.xlsx
diff --git a/BulkPDF/Licenses.Designer.cs b/BulkPDF/Licenses.Designer.cs
diff --git a/BulkPDF/Licenses.resx b/BulkPDF/Licenses.resx
diff --git a/BulkPDF/MainForm.Designer.cs b/BulkPDF/MainForm.Designer.cs
diff --git a/BulkPDF/MainForm.cs b/BulkPDF/MainForm.cs
@@ -23,7 +23,7 @@ public partial class MainForm : Form
         ProgressForm progressForm;
         int tempSelectedIndex;
         bool finalize = false;
-
+        bool unicode = false;
 
         public MainForm()
         {
@@ -159,6 +159,7 @@ private void bFinish_Click(object sender, EventArgs e)
                             progressForm = new ProgressForm();
                             progressForm.Show();
                             finalize = cbFinalize.Checked;
+                            unicode = cbUnicode.Checked;
 
                             BackgroundWorker backGroundWorker = new BackgroundWorker();
                             backGroundWorker.DoWork += backGroundWorker_DoWork;
@@ -187,7 +188,7 @@ void backGroundWorker_DoWork(object sender, DoWorkEventArgs e)
         {
             try
             {
-                PDFFiller.CreateFiles(pdf, finalize, dataSource, pdfFields, tbOutputDir.Text + @"\", ConcatFilename, progressForm.SetPercent, progressForm.GetIsAborted);
+                PDFFiller.CreateFiles(pdf, finalize, unicode, dataSource, pdfFields, tbOutputDir.Text + @"\", ConcatFilename, progressForm.SetPercent, progressForm.GetIsAborted);
             }
             catch (Exception ex)
             {
@@ -402,6 +403,7 @@ private void bSaveConfiguration_Click(object sender, EventArgs e)
                 xmlWriter.WriteElementString("RowNumber", cbRowNumberFilename.Checked.ToString());
                 xmlWriter.WriteEndElement(); // </Filename>
                 xmlWriter.WriteElementString("Finalize", cbFinalize.Checked.ToString());
+                xmlWriter.WriteElementString("Unicode", cbUnicode.Checked.ToString());
                 xmlWriter.WriteElementString("OutputDir", tbOutputDir.Text);
                 xmlWriter.WriteEndElement(); // </Options>
 
@@ -494,6 +496,14 @@ private void bLoadConfiguration_Click(object sender, EventArgs e)
 
                     //// Other
                     cbFinalize.Checked = Convert.ToBoolean(xmlOptions.Element("Finalize").Value);
+                    try
+                    {
+                        cbUnicode.Checked = Convert.ToBoolean(xmlOptions.Element("Unicode").Value);
+                    }
+                    catch
+                    {
+                        // Ignore. Ugly but don't hurt anyone.
+                    }
                     tbOutputDir.Text = Environment.ExpandEnvironmentVariables(xmlOptions.Element("OutputDir").Value);
 
                     wizardPages.SelectedIndex = wizardPages.TabPages.Count - 1;