Options fenster repariert

BerichtGen/Bericht.cs

@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 
 namespace BerichtGen
 {
-    public  class Bericht
+    class Bericht
     {
         private List<Image> _listImages;
         /// <summary>

BerichtGen/BerichtGen.csproj

@@ -70,15 +70,17 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bericht.cs" />
-    <Compile Include="Options.cs" />
-    <Compile Include="Options.Designer.cs">
-      <DependentUpon>Options.cs</DependentUpon>
+    <Compile Include="FrmOptions.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FrmOptions.Designer.cs">
+      <DependentUpon>FrmOptions.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Options.resx">
-      <DependentUpon>Options.cs</DependentUpon>
+    <EmbeddedResource Include="FrmOptions.resx">
+      <DependentUpon>FrmOptions.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

BerichtGen/FrmOptions.Designer.cs

@@ -1,6 +1,6 @@
 namespace BerichtGen
 {
-    partial class Options
+    partial class FrmOptions
     {
         /// <summary>
         /// Required designer variable.
@@ -103,7 +103,7 @@
             this.label1.TabIndex = 5;
             this.label1.Text = "Nach dem erzeugen öffnen";
             // 
-            // Options
+            // FrmOptions
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -114,7 +114,7 @@
             this.Controls.Add(this.cb_pdf);
             this.Controls.Add(this.cb_doc);
             this.Controls.Add(this.btn_start);
-            this.Name = "Options";
+            this.Name = "FrmOptions";
             this.Text = "Options";
             this.ResumeLayout(false);
             this.PerformLayout();

BerichtGen/FrmOptions.cs

@@ -4,7 +4,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
-using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -15,7 +14,7 @@ using System.Windows.Forms;
 
 namespace BerichtGen
 {
-    public partial class Options : Form
+    public partial class FrmOptions : Form
     {
         Thread generateProtokollThread;
         Hashtable grundDaten;
@@ -24,25 +23,26 @@ namespace BerichtGen
         string speicherpfad;
         string source;
         List<BilderObject> bilderObjects;
+
         DataTable tableContent = null;
-
-
-        public Options(string firma, string vorlage, string speicherpfad, Hashtable grunddaten, List<BilderObject> bilderObjects, DataTable tableContent = null)
+        public FrmOptions(string firma, string vorlage, string speicherpfad, Hashtable grunddaten, List<BilderObject> bilderObjects, DataTable tableContent = null)
         {
             InitializeComponent();
+
             this.firma = firma;
             this.vorlage = vorlage;
             this.speicherpfad = speicherpfad;
             this.grundDaten = grunddaten;
             this.bilderObjects = bilderObjects;
             this.tableContent = tableContent;
-            this.source = Path.Combine("documents",firma, vorlage);
+            this.source = Path.Combine("documents", firma, vorlage);
+
         }
 
         void Gen()
         {
             Bericht bericht = new Bericht();
-            bericht.Erzeuge(source, speicherpfad, grundDaten,bilderObjects,tableContent);
+            bericht.Erzeuge(source, speicherpfad, grundDaten, bilderObjects, tableContent);
         }
 
         private void btn_start_Click(object sender, EventArgs e)
@@ -53,10 +53,10 @@ namespace BerichtGen
 
             while (generateProtokollThread.IsAlive)
             {
-                
+
             }
 
-            if(rb_yes.Checked)
+            if (rb_yes.Checked)
             {
 
             }