update 20250420

Client/Diverses/SplashScreen.Designer.cs

@@ -64,7 +64,7 @@
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(146, 26);
             this.label2.TabIndex = 2;
-            this.label2.Text = "15. April 2025";
+            this.label2.Text = "20. April 2025";
             // 
             // SplashScreen
             // 

Client/Klassen/clsAppParams.cs

@@ -173,7 +173,17 @@ namespace OnDoc.Klassen
         public static string unterschriftenpruefung { get; set; } = "No";
         public static Boolean parseparams()
         {
+
             if (executed) return false;
+            function = "";
+            partnernr = "";
+            struktur = "";
+            dokumenttypnr = "0";
+            Interaktion = "Yes";
+            showdoc = "Yes";
+            dokumentid = "";
+            unterschriftenpruefung = "No";
+
             string sparam = sourceparam.Substring(sourceparam.IndexOf('?') + 1, sourceparam.Length - (sourceparam.IndexOf('?') + 1));
             if (sparam.ToLower() == "ucheck")
             {

Client/UIControls/Serienbrief.Designer.cs

@@ -93,6 +93,7 @@
             this.partnerHinzufügenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.partnerLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.erneutGenerierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.vorschauToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
             this.ctxmenutree = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.partnerlistePrüfenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -136,6 +137,8 @@
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.folderBrowser1 = new Syncfusion.Windows.Forms.FolderBrowser(this.components);
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+            this.ribbonpaneladmin = new System.Windows.Forms.RibbonPanel();
+            this.ribbonButtonAddmin = new System.Windows.Forms.RibbonButton();
             this.docPreview1 = new OnDoc.UIControls.DocPreview();
             this.GrpDokumentInhalt.SuspendLayout();
             this.grpFaktura.SuspendLayout();
@@ -697,7 +700,7 @@
             this.pnlLoad.Controls.Add(this.btnsbloadcancel);
             this.pnlLoad.Controls.Add(this.btnsbloadok);
             this.pnlLoad.Controls.Add(this.panel1);
-            this.pnlLoad.Location = new System.Drawing.Point(1098, 118);
+            this.pnlLoad.Location = new System.Drawing.Point(178, 82);
             this.pnlLoad.Name = "pnlLoad";
             this.pnlLoad.Size = new System.Drawing.Size(957, 634);
             this.pnlLoad.TabIndex = 4;
@@ -815,9 +818,10 @@
             this.ctxmenuEmpfaenger.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.partnerHinzufügenToolStripMenuItem,
             this.partnerLöschenToolStripMenuItem,
-            this.erneutGenerierenToolStripMenuItem});
+            this.erneutGenerierenToolStripMenuItem,
+            this.vorschauToolStripMenuItem});
             this.ctxmenuEmpfaenger.Name = "ctxmenuEmpfaenger";
-            this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(211, 70);
+            this.ctxmenuEmpfaenger.Size = new System.Drawing.Size(211, 92);
             // 
             // partnerHinzufügenToolStripMenuItem
             // 
@@ -840,6 +844,13 @@
             this.erneutGenerierenToolStripMenuItem.Text = "Generierung zurücksetzen";
             this.erneutGenerierenToolStripMenuItem.Click += new System.EventHandler(this.erneutGenerierenToolStripMenuItem_Click);
             // 
+            // vorschauToolStripMenuItem
+            // 
+            this.vorschauToolStripMenuItem.Name = "vorschauToolStripMenuItem";
+            this.vorschauToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
+            this.vorschauToolStripMenuItem.Text = "Vorschau";
+            this.vorschauToolStripMenuItem.Click += new System.EventHandler(this.vorschauToolStripMenuItem_Click);
+            // 
             // treeViewAdv1
             // 
             treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1;
@@ -864,6 +875,7 @@
             this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(392, 112);
             this.treeViewAdv1.HelpTextControl.TabIndex = 0;
             this.treeViewAdv1.HelpTextControl.Visible = true;
+            this.treeViewAdv1.HideSelection = false;
             this.treeViewAdv1.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText;
             this.treeViewAdv1.Location = new System.Drawing.Point(3, 16);
             this.treeViewAdv1.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
@@ -1018,6 +1030,7 @@
             this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel7);
             this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel8);
             this.ribbonTabFunktionen.Panels.Add(this.ribbonPanel9);
+            this.ribbonTabFunktionen.Panels.Add(this.ribbonpaneladmin);
             this.ribbonTabFunktionen.Text = "Funktionen";
             // 
             // ribbonPanel1
@@ -1317,6 +1330,22 @@
             this.splitContainer1.SplitterDistance = 902;
             this.splitContainer1.TabIndex = 5;
             // 
+            // ribbonpaneladmin
+            // 
+            this.ribbonpaneladmin.Items.Add(this.ribbonButtonAddmin);
+            this.ribbonpaneladmin.Name = "ribbonpaneladmin";
+            this.ribbonpaneladmin.Text = "";
+            // 
+            // ribbonButtonAddmin
+            // 
+            this.ribbonButtonAddmin.CheckOnClick = true;
+            this.ribbonButtonAddmin.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.Image")));
+            this.ribbonButtonAddmin.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.LargeImage")));
+            this.ribbonButtonAddmin.Name = "ribbonButtonAddmin";
+            this.ribbonButtonAddmin.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButtonAddmin.SmallImage")));
+            this.ribbonButtonAddmin.Text = "Grid erweitern";
+            this.ribbonButtonAddmin.Click += new System.EventHandler(this.ribbonButton1_Click_1);
+            // 
             // docPreview1
             // 
             this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1483,5 +1512,8 @@
         private System.Windows.Forms.Button btnblexport;
         private Syncfusion.Windows.Forms.FolderBrowser folderBrowser1;
         private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
+        private System.Windows.Forms.ToolStripMenuItem vorschauToolStripMenuItem;
+        private System.Windows.Forms.RibbonPanel ribbonpaneladmin;
+        private System.Windows.Forms.RibbonButton ribbonButtonAddmin;
     }
 }

Client/UIControls/Serienbrief.cs

@@ -120,6 +120,7 @@ namespace OnDoc.UIControls
             Security security = new Security();
             security.set_security_general(this);
             security = null;
+            if (AppParams.isSysadmin) { this.ribbonpaneladmin.Visible = true; } else { this.ribbonpaneladmin.Visible=false; }
             //Closing += Form_Closing;
         }
 
@@ -238,6 +239,7 @@ namespace OnDoc.UIControls
                 ctxmenuEmpfaenger.Enabled = true;
                 partnerHinzufügenToolStripMenuItem.Visible = true;
                 partnerLöschenToolStripMenuItem.Visible = true;
+                vorschauToolStripMenuItem.Visible = true;
 
                 erneutGenerierenToolStripMenuItem.Visible = false;
                 docPreview1.Visible = false;
@@ -246,6 +248,7 @@ namespace OnDoc.UIControls
             {
                 partnerHinzufügenToolStripMenuItem.Visible = false;
                 partnerLöschenToolStripMenuItem.Visible = false;
+                vorschauToolStripMenuItem.Visible = false;
                 sfDataGridEmpfaenger.AllowEditing = false;
                 erneutGenerierenToolStripMenuItem.Visible = true;
                 docPreview1.clear_viewer();
@@ -563,9 +566,16 @@ namespace OnDoc.UIControls
                 sfDataGridEmpfaenger.Columns["PLZ"].Visible = false;
                 sfDataGridEmpfaenger.Columns["Ort"].Visible = false;
 
-                sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = false;
+                if (!this.ribbonButtonAddmin.Checked)
-                sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
+                {
-                sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = false;
+                    sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = false;
+                    sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
+                    sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = false;
+                }
+                if (this.ribbonButtonAddmin.Checked)
+                {
+                    sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = true;
+                }
 
 
                 sfDataGridEmpfaenger.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
@@ -869,8 +879,8 @@ namespace OnDoc.UIControls
             try { sb.postzustellung = Convert.ToInt32(cbboxpostzustellung.SelectedValue.ToString()); } catch { sb.postzustellung = 0; }
             try { sb.unterschriftlinks = Convert.ToInt32(cbboxunterschriftlinks.SelectedValue.ToString()); } catch { sb.unterschriftlinks = 0; }
             try { sb.unterschriftrechts = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue.ToString()); } catch { sb.unterschriftrechts = 0; }
-            if (cbboxunterschriftlinks.Text.Trim() == "") { sb.unterschriftlinks = 0; }
+            try { if (cbboxunterschriftlinks.Text.Trim() == "") { sb.unterschriftlinks = 0; } } catch { sb.unterschriftlinks = 0; }
-            if (cbboxunterschriftrechts.Text.Trim() == "") { sb.unterschriftrechts = 0; }
+            try { if (cbboxunterschriftrechts.Text.Trim() == "") { sb.unterschriftrechts = 0; } } catch { sb.unterschriftrechts = 0; }
             try
             {
                 if (cbdigitaleunterschrfiten.Checked)
@@ -1519,7 +1529,7 @@ namespace OnDoc.UIControls
             finally { db = null; }
 
         }
-        private void Generate(int vorschauid = -1)
+        private void Generate(int vorschauid = -1, bool sbmain = false)
         {
 
 
@@ -1538,6 +1548,7 @@ namespace OnDoc.UIControls
             {
                 Helper.FileHelper fh = new FileHelper();
                 sb.VorlageBase64 = fh.Base64FromFile(PreviewFiename);
+                fh = null;
             }
             else
             {
@@ -1591,7 +1602,7 @@ namespace OnDoc.UIControls
             imghelper = null;
 
 
-            vorlagendaten_aufbereiten(vorschauid);
+            vorlagendaten_aufbereiten(vorschauid, sbmain);
             if (cbdigitaleunterschrfiten.Checked)
             {
                 sb.toapproval = 1;
@@ -1606,6 +1617,7 @@ namespace OnDoc.UIControls
                 sb.approval2 = 0;
 
             }
+            if (sbmain) { return; }
             update_serienbriefdaten(false);
             update_zahlen();
             treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[2];
@@ -1613,7 +1625,7 @@ namespace OnDoc.UIControls
 
         }
 
-        private void vorlagendaten_aufbereiten(int vorschauid = -1)
+        private void vorlagendaten_aufbereiten(int vorschauid = -1, bool sbmain = false)
         {
 
             init_progressbar("Dokumente generieren", vorlagendaten.Rows.Count);
@@ -1844,7 +1856,17 @@ namespace OnDoc.UIControls
                     if (vorschauid != -1 && Convert.ToInt32(vorlagendaten.Rows[i]["IntEintragnr"]) == vorschauid)
                     {
                         string pdfdoc_preview = dget.Convert_Word_To_PDF(dg.generate_serienbrief(sb.VorlageBase64, sb, dokumentid, AppParams.RESTURI, AppParams.apikey));
-                        sbedit.Update_Preview(pdfdoc_preview);
+                        if (!sbmain)
+                        {
+                            sbedit.Update_Preview(pdfdoc_preview);
+                        }
+                        else
+                        {
+                            docPreview1.show_base64(pdfdoc_preview, "");
+                            docPreview1.Visible= true;
+                        }
+
+
                     }
                     else
                     {
@@ -2940,6 +2962,40 @@ namespace OnDoc.UIControls
             versandpakete.Add(vp);
             OnDoc.Versandstrasse.Versandstrasse vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete);
             vs.ShowDialog();
+            if (vs.sb.status == 1)
+            {
+                foreach (System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
+                {
+                    dr["status"] = 2;
+                }
+                sb.dsempfaenger.AcceptChanges();
+                update_serienbriefdaten(false);
+                update_zahlen();
+            }
+
+        }
+
+        private void vorschauToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var selectedItem = this.sfDataGridEmpfaenger.CurrentItem as DataRowView;
+            var dataRow = (selectedItem as DataRowView).Row;
+            var cellValue = dataRow["IntEintragnr"].ToString();
+            IsPreview = true;
+            DB db = new DB(AppParams.connectionstring);
+            string fn = db.get_sb_vorlage(sb.serienbriefnr, AppParams.tempdir);
+            sb.VorlageBase64 = db.dsdaten.Tables[0].Rows[0][0].ToString();
+            FileHelper fh = new FileHelper();
+            PreviewFiename = AppParams.tempdir + "sb_" + DateTime.Now.ToString("yyyyMMddhhmmss") + "_pv.pdf";
+            fh.SaveBase64ToFile(sb.VorlageBase64, PreviewFiename);
+            fn = null;
+            int vorschauid = Convert.ToInt32(cellValue);
+            update_serienbriefdaten(false);
+            Generate(vorschauid,true);
+            IsPreview = false;
+        }
+
+        private void ribbonButton1_Click_1(object sender, EventArgs e)
+        {
 
         }
     }

Client/UIControls/Serienbrief.resx

@@ -128,6 +128,24 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="ribbonButtonAddmin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="ribbonButtonAddmin.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="ribbonButtonAddmin.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

Client/Versandstrasse/Versandstrasse.cs

@@ -36,7 +36,7 @@ namespace OnDoc.Versandstrasse
         private TreeViewAdvDragHighlightTracker treeViewDragHighlightTracker = null;
         private TreeNodeAdv currentSourceNode;
         private bool serienbrief = false;
-        private serienbrief sb;
+        public serienbrief sb;
         private bool direktversenden = false;
         public Versandstrasse(List<Versandpaket> pakete)
         {
@@ -120,6 +120,25 @@ namespace OnDoc.Versandstrasse
             this.pnlpostkorb.Visible = false;
             this.pnlpostkorb.Dock = DockStyle.Fill;
             this.pnlcouvert.Dock = DockStyle.Fill;
+            panelPrepare.Left = this.Width - this.panelPrepare.Width;
+            lblprueftext.MaximumSize = new Size(panelVerify.Width-10, 50);
+            lblprueftextSB.MaximumSize = new Size(panelVerify.Width-10, 50); 
+            lblprueftextsb2.MaximumSize = new Size(panelVerify.Width-10, 50);
+
+            lblpostausgang.MaximumSize = new Size(500, 60);
+
+            DB db = new DB(AppParams.connectionstring);
+            db.Get_Tabledata("Select * from OnDoc_Versandstrasse_Texte order by id",false,true);
+            lblprueftext.Text = db.dsdaten.Tables[0].Rows[0]["textblock"].ToString();
+            lblprueftextSB.Text = db.dsdaten.Tables[0].Rows[1]["textblock"].ToString();
+            lblprueftextsb2.Text = db.dsdaten.Tables[0].Rows[2]["textblock"].ToString();
+            lblpostausgang.Text = db.dsdaten.Tables[0].Rows[3]["textblock"].ToString();
+            db = null;
+
+            //lblprueftext.Text = "Prüfe die Angaben und das PDF. Mit Klick auf «Couvert in Postausgang legen» wird das Couvert im Postausgang bereitgelegt. Der Versand vom Postausgang erfolgt um 15.45 Uhr. Bis 15.45 Uhr kann das Couvert noch geöffnet/bearbeitet oder gelöscht werden.";
+            //lblprueftextSB.MaximumSize = new Size(panelVerify.Width, 50);
+            //lblprueftextSB.Text = "Prüfe die Angaben und das PDF. Mit Klick auf «Couvert in Postausgang legen» wird das Couvert im Postausgang bereitgelegt. Der Versand vom Postausgang erfolgt um 15.45 Uhr. Bis 15.45 Uhr kann das Couvert noch geöffnet/bearbeitet oder gelöscht werden.";
+
         }
         private void Reload_Tree()
         {
@@ -605,6 +624,7 @@ namespace OnDoc.Versandstrasse
                 panelVerify.Visible = true;
                 this.txtAnzahlSeiten.Text = pdfViewerControl1.PageCount.ToString();
                 this.txtAnzahlDokumente.Text = paket.Dokument.Count().ToString();
+                lblprieveiwbezeichnung.Text = "Aufbereitetes PDF";
             }
             catch { }
             panelPrepare.Visible = false;
@@ -646,6 +666,7 @@ namespace OnDoc.Versandstrasse
             }
             else
             {
+                this.txtadresse.Text = "";
                 treeViewAdvAdresse.Enabled = false;
                 Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket;
                 vp.GAS = "";
@@ -686,6 +707,7 @@ namespace OnDoc.Versandstrasse
                     svp.bemerkung = vd.DokumentID +" / " + sb.serienbriefnr.ToString() + "_" + _newDataTable.Rows[0]["inteintragnr"].ToString();
                     svp.Dokument.Clear();
                     svp.Dokument.Add(vd);
+                   
                     DB db = new DB(AppParams.connectionstring);
                     //db.clear_parameter();
                     //db.add_parameter("@tgnummer", AppParams.currenttgnummer);
@@ -696,11 +718,20 @@ namespace OnDoc.Versandstrasse
                     //db.Get_Tabledata("Ondoc_Insert_Versandprotokoll", true, false);
                     //svp.protokollid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
                     db = null;
-
+                    this.progressBarAdv1.Value = this.progressBarAdv1.Value + 1;
                     send_vs(ref svp, false);
+
                    
+
+
                 }
+
+               
+                sb.status = 1;
+
                 pdfViewerControl1.Unload();
+                lblprieveiwbezeichnung.Text = "";
+                this.Close();
                 return;
             }
             panelVerify.Visible = false;
@@ -721,6 +752,7 @@ namespace OnDoc.Versandstrasse
 
             SendTo_Versandstrasse();
             pdfViewerControl1.Unload();
+            lblprieveiwbezeichnung.Text = "";
             vdl = null;
             vp = null;
         }
@@ -953,6 +985,7 @@ namespace OnDoc.Versandstrasse
                     if (ribbonButtonDokPreview.Checked)
                     {
                         clsVersandstrasse vs = new clsVersandstrasse();
+                        lblprieveiwbezeichnung.Text = node.Text;
                         string dok = "";
                         if (serienbrief)
                         {
@@ -1030,26 +1063,38 @@ namespace OnDoc.Versandstrasse
 
         private void treeViewAdvCouverts_AfterSelect(object sender, EventArgs e)
         {
+
             try
             {
                 TreeNodeAdv node = treeViewAdvCouverts.SelectedNode;
-                if (this.ribbonbuttondokpreviewpostkorb.Checked)
+                if (node.Level == 1)
                 {
-                    var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString()));
+                    if (this.ribbonbuttondokpreviewpostkorb.Checked)
-                    this.pdfViewerControl2.Load(stream);
+                    {
-                    stream = null;
+                        var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString()));
+                        this.pdfViewerControl2.Load(stream);
+                        stream = null;
+                    }
+                    if (node.Level == 1)
+                    {
+                        DB db = new DB(AppParams.connectionstring);
+                        db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where id=" + node.Tag.ToString(), false, true);
+                        Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(db.dsdaten.Tables[0].Rows[0]["paket"].ToString());
+
+                        db = null;
+                        this.textBox4.Text = this.pdfViewerControl2.PageCount.ToString();
+                        this.textBox3.Text = node.Nodes.Count.ToString();
+                        this.textBox2.Text = vp.Versandoption;
+                        this.textBox1.Text = vp.GASAdresse.Replace(";", Environment.NewLine);
+                    }
                 }
-                if (node.Level==1)
+                else
                 {
-                    DB db = new DB(AppParams.connectionstring);
+                    this.textBox4.Text = ""; 
-                    db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where id=" + node.Tag.ToString(), false, true);
+                    this.textBox3.Text = "";
-                    Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(db.dsdaten.Tables[0].Rows[0]["paket"].ToString());
+                    this.textBox2.Text = "";
-                   
+                    this.textBox1.Text = "";
-                    db = null;
+
-                    this.textBox4.Text = this.pdfViewerControl2.PageCount.ToString();
-                    this.textBox3.Text = node.Nodes.Count.ToString();
-                    this.textBox2.Text = vp.Versandoption;
-                    this.textBox1.Text = vp.GASAdresse;
                 }
 
             }
@@ -1066,6 +1111,7 @@ namespace OnDoc.Versandstrasse
             }
             db = null;
             pdfViewerControl2.Unload();
+            lblprieveiwbezeichnung.Text = "";
             Refresh_VersandCouverts();
 
         }
@@ -1087,6 +1133,7 @@ namespace OnDoc.Versandstrasse
             db = null;
             treeViewAdvCouverts.Nodes.Remove(treeViewAdvCouverts.SelectedNode);
             pdfViewerControl2.Unload();
+            lblprieveiwbezeichnung.Text = "";
             Reload_Tree();
             ribbon1.TabIndex = 0;
             
@@ -1150,9 +1197,16 @@ namespace OnDoc.Versandstrasse
         private void btnsendserienbrief_Click(object sender, EventArgs e)
         {
             direktversenden = true;
+            this.pnlprogress.Visible = true;
+            this.progressBarAdv1.Minimum = 0;
+            this.progressBarAdv1.Value = 0;
+            this.progressBarAdv1.Maximum = treeViewAdv1.SelectedNode.Nodes.Count;
+            Application.DoEvents();
             btnSendFinal_Click(sender, e);
+
             direktversenden = false;
             this.panelverifysb.Visible = false;
+            this.pnlprogress.Visible = false;
         }
 
         private void button5_Click(object sender, EventArgs e)
@@ -1199,6 +1253,7 @@ namespace OnDoc.Versandstrasse
         {
             if (this.ribbonTab1.Active)
             {
+                this.lblpostausgang.Visible = false;
                 this.pnlcouvert.Visible = true;
                 this.pnlcouvert.Dock= DockStyle.Fill;
                 this.pnlpostkorb.Visible = false;
@@ -1209,6 +1264,8 @@ namespace OnDoc.Versandstrasse
         {
             if (this.ribbonTab2.Active)
             {
+                this.lblpostausgang.Visible = true;
+                this.lblpostausgang.Left = this.Width-lblpostausgang.Width;
                 this.pnlcouvert.Visible = false;
                 
                 this.pnlpostkorb.Visible = true;
@@ -1223,10 +1280,12 @@ namespace OnDoc.Versandstrasse
             {
                 this.ribbonButtonDokPreview.Checked = false;
                 this.pdfViewerControl1.Unload();
+                lblprieveiwbezeichnung.Text = "";
             }
             else
             {
                 this.ribbonButtonDokPreview.Checked = true;
+
                 treeViewAdv1_AfterSelect(sender, e);
             }
         }
@@ -1247,6 +1306,7 @@ namespace OnDoc.Versandstrasse
             {
                 ribbonbuttondokpreviewpostkorb.Checked = false;
                 this.pdfViewerControl2.Unload();
+                lblprieveiwbezeichnung.Text = "";
             }
             else
             {
@@ -1258,6 +1318,7 @@ namespace OnDoc.Versandstrasse
         private void Versandstrasse_Resize(object sender, EventArgs e)
         {
             this.treeViewAdvCouverts.Height = this.Height - this.ribbon1.Height-this.grpCouvertDetails.Height;
+            panelPrepare.Left = this.Width - this.panelPrepare.Width;
         }
     }
 }

Client/Versandstrasse/Versandstrasse.resx

@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0
-        DAAAAk1TRnQBSQFMAgEBBgEAAcABAAHAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DAAAAk1TRnQBSQFMAgEBBgEAAdABAAHQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -194,7 +194,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU
-        DAAAAk1TRnQBSQFMAgEBBQEAAcgBAAHIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DAAAAk1TRnQBSQFMAgEBBQEAAdgBAAHYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -248,7 +248,7 @@
         AYABAQIAAeABBwHAAQMBwAEDAgAB8AEPAfABDwHwAQ8BgAEBCw==
 </value>
   </data>
-  <data name="pdfViewerPrinterSettings3.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
+  <data name="pdfViewerPrinterSettings5.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
         dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
@@ -256,34 +256,42 @@
 </value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btnsendserienbrief.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnPrepare.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        OLWsgEPrC7BrewW27W9hT+cqWD4CsOgBMBcC7OgH2Mx9mmg67wO8mDIz74ppcC+S12FK5DTXMgXNpXyM
-        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
+        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
-        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
+        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
-        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
+        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
-        MyHEk3t+T9YuW7b0RUKWu1NrCVlKCHmYEHKfPyGP8gl5ypOQ5eROPUHI47OGB/ACFGsixUMCRTFNydQ0
+        swzY2+o2TLF8uz63izX4pX39AsepC8DmjsZN12uYDbLkA+z8b4HQhlw8AQS6OEhb43IH+zxLlbOmOeeq
-        lamaXucsFR2aqb7JrMw+OENJR2Tl0RvUhXR68VaaEkqG/f39VawgJSW1q0irx8ulhxDb1A9xgx3ihit3
+        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
-        1vkrqt6GhEYHDJ2DqBwcg6a8GiU6PVJS035kBW/kKCzjTie2lJSAV2iAqLEbwprLEB7/Yd6KOHYJCSfa
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        /wM19F1wo1uqCAAAAABJRU5ErkJggg==
+        qbavUnEMwcjEB+zIRJ5B8J7PKOmCK9SSOQi6JhX4XODu1D/wTnv0AzFf0UvmrIBXoTwDhQpab7zQqXxU
+        7cAaXxNE0R6wD9HaTAU6AlK7yMHXpC8odNmqXwafTMjs9fdjjrz1LRh9ic8RBZrmtbiUKdTOt0fXBFQa
+        lx31EYEWYlLjFkq2uCOyeBrCymbAjyHrIiS3bzXN6XEtkatdykaMBAlcNhXhflSgJyBLeIl8VZT6sT3R
+        gyl6rHYrka8Jos+2sqMTWj8p+L+458vU+wuH1wQxZ1vZh8/+K4hCuN8cSebjqIltHtQLXR7hSe37oxDu
+        RuMBnwLHlKqxBUNGgrgW9uH4+zpBdAL3ykm6CmKvDMKxDCkcy34MEUkdWOMBn8Izd1CNY8rWBEf+bLkb
+        E9es1hUA646lCndTz7VZUpM7LaMudBg+z/+L13WRyitX0mBoHDnTUnqc9nA1Jq6ZFhN//8zh+JZfqQmt
+        uisKefDbocT2+IhzPCTsPA8JufgQCUnpRCiXO5HAy90IOY2P+KXzEVJmL0K6KkAI2f00Yr78nTdDvHbY
+        xf7RvDU2gSc8mSKGExf74OdkARxP6YfYS0I4liqEo2ki+OmKGH5MH4CYTAlEX5VCVM4QRNKHIZwhB+0x
+        H8IcBUr+GFBKp4CUOyTGvz95/wHtujPe9iM88wAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnSendFinal.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAARiSURBVEhLtVRr
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAARiSURBVEhLtVRr
         TFtlGD4z3mayX/pnMfHPBJe4YcRRCvQGSBnQlkIQWkBKgRZYe3rZZH8wQd0FNtgUMlcuLgSTzbjBpllk
         XAqFAZMAm2ODJc7aQVsQ8JKNgSRTz2O+U1vKYeAS45s8Oe/znfd5nnznnO9QYoXhWEyy4a9IqR6RUt0a
         RO0thVBmvCVMs2ynOCVS0LESpeUPSaoJIrkRvAQdC75UD7ImVpgglBunqJjkfTjTNoiByWnYr6+i98Y0
@@ -305,39 +313,31 @@
         UCeuMVutPYztQB+zfKAHsHY/Gcgs0VjtTEPFGF4I9vwbJahImKh1DeYAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="btnPrepare.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnsendserienbrief.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        yMUCpS20BUuhlFLuE0Hxzru0s6U2ce5JTnLe9/y+90nOd86HQpmwnzmI4P6agQOcRdh/ZxHcGpbApfEZ
+        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
-        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
+        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
-        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
+        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
-        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
+        6zsIeoUycvMLclcQHCpQMoKCzYUT5cYKHCorx2dHKqcF585Dp1+kYOYVRYvimpkruu10wuFwoLyiAqnS
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        sPvSNRy+dhOyXR+hqKgIt//+C3KF0soK0qSZnWCYnIBeuwU8TSmEX3XNKwmvakXiiXZ8cPknGHt/h3T7
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        /wM19F1wo1uqCAAAAABJRU5ErkJggg==
-        7cAaXxNE0R6wD9HaTAU6AlK7yMHXpC8odNmqXwafTMjs9fdjjrz1LRh9ic8RBZrmtbiUKdTOt0fXBFQa
-        lx31EYEWYlLjFkq2uCOyeBrCymbAjyHrIiS3bzXN6XEtkatdykaMBAlcNhXhflSgJyBLeIl8VZT6sT3R
-        gyl6rHYrka8Jos+2sqMTWj8p+L+458vU+wuH1wQxZ1vZh8/+K4hCuN8cSebjqIltHtQLXR7hSe37oxDu
-        RuMBnwLHlKqxBUNGgrgW9uH4+zpBdAL3ykm6CmKvDMKxDCkcy34MEUkdWOMBn8Izd1CNY8rWBEf+bLkb
-        E9es1hUA646lCndTz7VZUpM7LaMudBg+z/+L13WRyitX0mBoHDnTUnqc9nA1Jq6ZFhN//8zh+JZfqQmt
-        uisKefDbocT2+IhzPCTsPA8JufgQCUnpRCiXO5HAy90IOY2P+KXzEVJmL0K6KkAI2f00Yr78nTdDvHbY
-        xf7RvDU2gSc8mSKGExf74OdkARxP6YfYS0I4liqEo2ki+OmKGH5MH4CYTAlEX5VCVM4QRNKHIZwhB+0x
-        H8IcBUr+GFBKp4CUOyTGvz95/wHtujPe9iM88wAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="pdfViewerPrinterSettings4.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
+  <data name="pdfViewerPrinterSettings6.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
         dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
@@ -355,7 +355,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq
-        CQAAAk1TRnQBSQFMAgEBAwEAAYgBAAGIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAwEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -400,19 +400,19 @@
   <data name="ribbonButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
+        wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonButton3.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
+        wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonButton3.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wgAADsIBFShKgAAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
+        wAAADsABataJCQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">