diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index 61e80f07..36f9e330 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -60,6 +60,7 @@ Partial Public Class frmEnvelopeEditor Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.bbtnitm_ConcatFiles = New DevExpress.XtraBars.BarButtonItem() + Me.btnShowFile = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupDocuments = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -101,7 +102,6 @@ Partial Public Class frmEnvelopeEditor Me.EnvelopeDocumentBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.txtEnvelopeIdLabel = New DevExpress.XtraBars.BarStaticItem() - Me.btnShowFile = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -359,6 +359,13 @@ Partial Public Class frmEnvelopeEditor Me.bbtnitm_ConcatFiles.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitm_ConcatFiles.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.bbtnitm_ConcatFiles.Name = "bbtnitm_ConcatFiles" ' + 'btnShowFile + ' + resources.ApplyResources(Me.btnShowFile, "btnShowFile") + Me.btnShowFile.Id = 17 + Me.btnShowFile.ImageOptions.SvgImage = CType(resources.GetObject("btnShowFile.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.btnShowFile.Name = "btnShowFile" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupDocuments, Me.RibbonPageGroupInvitation, Me.RibbonPageGroupAddSignature, Me.RibbonPageGroupReceiver}) @@ -684,13 +691,6 @@ Partial Public Class frmEnvelopeEditor Me.txtEnvelopeIdLabel.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.txtEnvelopeIdLabel.Tag = "Envelope-ID: {0}" ' - 'btnShowFile - ' - resources.ApplyResources(Me.btnShowFile, "btnShowFile") - Me.btnShowFile.Id = 17 - Me.btnShowFile.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.btnShowFile.Name = "btnShowFile" - ' 'frmEnvelopeEditor ' Me.AllowDrop = True diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 65da7d8a..27ecec05 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -436,7 +436,7 @@ Dokument anzeigen - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -1131,6 +1131,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + btnShowFile + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -1329,12 +1335,6 @@ DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - btnShowFile - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmEnvelopeEditor diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index 026fba02..43b91350 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -166,6 +166,9 @@ Partial Public Class frmEnvelopeEditor End If End Sub Private Sub SetPhoneNumberColumnVisible() + If IsNothing(Envelope) Then + Exit Sub + End If If Envelope.TFA_Enabled = True Then colPhoneNumber.Visible = True Else diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index 665fc715..b48cc120 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -86,9 +86,12 @@ Partial Class frmMain Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn() Me.XtraTabPageAdmin = New DevExpress.XtraTab.XtraTabPage() + Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControlData = New DevExpress.XtraGrid.GridControl() Me.GridViewData = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.ChartControl1 = New DevExpress.XtraCharts.ChartControl() Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() + Me.GroupControl2 = New DevExpress.XtraEditors.GroupControl() Me.GroupControl1 = New DevExpress.XtraEditors.GroupControl() Me.btnEnvelopes_All = New DevExpress.XtraEditors.SimpleButton() Me.btnEnvelopes_thisYear = New DevExpress.XtraEditors.SimpleButton() @@ -96,9 +99,6 @@ Partial Class frmMain Me.btnEnvelopes_thismonth = New DevExpress.XtraEditors.SimpleButton() Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components) Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() - Me.GroupControl2 = New DevExpress.XtraEditors.GroupControl() - Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() - Me.ChartControl1 = New DevExpress.XtraCharts.ChartControl() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -118,20 +118,20 @@ Partial Class frmMain CType(Me.ViewHistoryCompleted, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewCompleted, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageAdmin.SuspendLayout() - CType(Me.GridControlData, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridViewData, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.PanelControl1.SuspendLayout() - CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupControl1.SuspendLayout() - CType(Me.GroupControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl2.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl2.Panel1.SuspendLayout() CType(Me.SplitContainerControl2.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl2.Panel2.SuspendLayout() Me.SplitContainerControl2.SuspendLayout() + CType(Me.GridControlData, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewData, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ChartControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.PanelControl1.SuspendLayout() + CType(Me.GroupControl2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupControl1.SuspendLayout() Me.SuspendLayout() ' 'SplashScreenManager1 @@ -640,6 +640,22 @@ Partial Class frmMain Me.XtraTabPageAdmin.Name = "XtraTabPageAdmin" resources.ApplyResources(Me.XtraTabPageAdmin, "XtraTabPageAdmin") ' + 'SplitContainerControl2 + ' + resources.ApplyResources(Me.SplitContainerControl2, "SplitContainerControl2") + Me.SplitContainerControl2.Name = "SplitContainerControl2" + ' + 'SplitContainerControl2.Panel1 + ' + Me.SplitContainerControl2.Panel1.Controls.Add(Me.GridControlData) + resources.ApplyResources(Me.SplitContainerControl2.Panel1, "SplitContainerControl2.Panel1") + ' + 'SplitContainerControl2.Panel2 + ' + Me.SplitContainerControl2.Panel2.Controls.Add(Me.ChartControl1) + resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2") + Me.SplitContainerControl2.SplitterPosition = 501 + ' 'GridControlData ' resources.ApplyResources(Me.GridControlData, "GridControlData") @@ -653,6 +669,12 @@ Partial Class frmMain Me.GridViewData.GridControl = Me.GridControlData Me.GridViewData.Name = "GridViewData" ' + 'ChartControl1 + ' + resources.ApplyResources(Me.ChartControl1, "ChartControl1") + Me.ChartControl1.Name = "ChartControl1" + Me.ChartControl1.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} + ' 'PanelControl1 ' Me.PanelControl1.Controls.Add(Me.GroupControl2) @@ -660,6 +682,11 @@ Partial Class frmMain resources.ApplyResources(Me.PanelControl1, "PanelControl1") Me.PanelControl1.Name = "PanelControl1" ' + 'GroupControl2 + ' + resources.ApplyResources(Me.GroupControl2, "GroupControl2") + Me.GroupControl2.Name = "GroupControl2" + ' 'GroupControl1 ' Me.GroupControl1.Controls.Add(Me.btnEnvelopes_All) @@ -705,33 +732,6 @@ Partial Class frmMain ' resources.ApplyResources(Me.SaveFileDialog1, "SaveFileDialog1") ' - 'GroupControl2 - ' - resources.ApplyResources(Me.GroupControl2, "GroupControl2") - Me.GroupControl2.Name = "GroupControl2" - ' - 'SplitContainerControl2 - ' - resources.ApplyResources(Me.SplitContainerControl2, "SplitContainerControl2") - Me.SplitContainerControl2.Name = "SplitContainerControl2" - ' - 'SplitContainerControl2.Panel1 - ' - Me.SplitContainerControl2.Panel1.Controls.Add(Me.GridControlData) - resources.ApplyResources(Me.SplitContainerControl2.Panel1, "SplitContainerControl2.Panel1") - ' - 'SplitContainerControl2.Panel2 - ' - Me.SplitContainerControl2.Panel2.Controls.Add(Me.ChartControl1) - resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2") - Me.SplitContainerControl2.SplitterPosition = 501 - ' - 'ChartControl1 - ' - resources.ApplyResources(Me.ChartControl1, "ChartControl1") - Me.ChartControl1.Name = "ChartControl1" - Me.ChartControl1.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} - ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -762,20 +762,20 @@ Partial Class frmMain CType(Me.ViewHistoryCompleted, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewCompleted, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageAdmin.ResumeLayout(False) - CType(Me.GridControlData, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridViewData, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.PanelControl1.ResumeLayout(False) - CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupControl1.ResumeLayout(False) - CType(Me.GroupControl2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl2.Panel1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl2.Panel1.ResumeLayout(False) CType(Me.SplitContainerControl2.Panel2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl2.Panel2.ResumeLayout(False) CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl2.ResumeLayout(False) + CType(Me.GridControlData, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewData, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ChartControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.PanelControl1.ResumeLayout(False) + CType(Me.GroupControl2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupControl1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index 5baff6eb..78269cf4 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -1394,7 +1394,7 @@ iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - DQAACw0B7QfALAAAEYBJREFUeF7t3b+uHEkVx/F9BD8ED7DmBfAD8ACEDsjZnMQJuXMSJxsRICJEgGRB + DAAACwwBP0AiyAAAEYBJREFUeF7t3b+uHEkVx/F9BD8ED7DmBfAD8ACEDsjZnMQJuXMSJxsRICJEgGRB QgJaCQmJCAdEJGxCQnKpnz1t+rbPzPR016k6p+obfKR1773Tf6brdNU5VX2/enp6CunbH7x8Ubwq3hTv ivfFh+IJCEz3qO5V3bO6d3UPv7Du8QjMjT3oIhWvC104GjpGo3ta97bu8TABwdzYii5E8U3xXWFdNGBU uue7BwNzo7dy0uoWKRpaFwaYjdrCK6uteDM3eiknqYhH9x6wqW28ttqOF3NjbTqpy8lZJw3guWaBwNxY diff --git a/EnvelopeGenerator.Form/frmRueckruf.Designer.vb b/EnvelopeGenerator.Form/frmRueckruf.Designer.vb index 124739cc..288d7939 100644 --- a/EnvelopeGenerator.Form/frmRueckruf.Designer.vb +++ b/EnvelopeGenerator.Form/frmRueckruf.Designer.vb @@ -25,11 +25,11 @@ Partial Class frmRueckruf Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmRueckruf)) Me.Label2 = New System.Windows.Forms.Label() Me.txtReason = New System.Windows.Forms.TextBox() - Me.btnWeiter = New System.Windows.Forms.Button() Me.Label1 = New System.Windows.Forms.Label() Me.btnCancel = New System.Windows.Forms.Button() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tsstatus = New System.Windows.Forms.ToolStripStatusLabel() + Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() Me.StatusStrip1.SuspendLayout() Me.SuspendLayout() ' @@ -53,15 +53,6 @@ Partial Class frmRueckruf Me.txtReason.Size = New System.Drawing.Size(429, 87) Me.txtReason.TabIndex = 1 ' - 'btnWeiter - ' - Me.btnWeiter.Location = New System.Drawing.Point(25, 134) - Me.btnWeiter.Name = "btnWeiter" - Me.btnWeiter.Size = New System.Drawing.Size(203, 44) - Me.btnWeiter.TabIndex = 2 - Me.btnWeiter.Text = "Umschlag zurückrufen" - Me.btnWeiter.UseVisualStyleBackColor = True - ' 'Label1 ' Me.Label1.AutoSize = True @@ -96,15 +87,24 @@ Partial Class frmRueckruf Me.tsstatus.Name = "tsstatus" Me.tsstatus.Size = New System.Drawing.Size(0, 17) ' + 'SimpleButton1 + ' + Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.SimpleButton1.Location = New System.Drawing.Point(25, 134) + Me.SimpleButton1.Name = "SimpleButton1" + Me.SimpleButton1.Size = New System.Drawing.Size(220, 44) + Me.SimpleButton1.TabIndex = 6 + Me.SimpleButton1.Text = "Umschlag zurückrufen" + ' 'frmRueckruf ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(488, 207) + Me.Controls.Add(Me.SimpleButton1) Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.btnCancel) Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.btnWeiter) Me.Controls.Add(Me.txtReason) Me.Controls.Add(Me.Label2) Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -124,9 +124,9 @@ Partial Class frmRueckruf Friend WithEvents Label2 As Label Friend WithEvents txtReason As TextBox - Friend WithEvents btnWeiter As Button Friend WithEvents Label1 As Label Friend WithEvents btnCancel As Button Friend WithEvents StatusStrip1 As StatusStrip Friend WithEvents tsstatus As ToolStripStatusLabel + Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton End Class diff --git a/EnvelopeGenerator.Form/frmRueckruf.resx b/EnvelopeGenerator.Form/frmRueckruf.resx index 0bdadd01..2dbe5cb9 100644 --- a/EnvelopeGenerator.Form/frmRueckruf.resx +++ b/EnvelopeGenerator.Form/frmRueckruf.resx @@ -120,17 +120,37 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFJSURBVDhPpVOhjoNQEOQT+gn9hPuEC56kFleBB41CYRs8 - SSWyAg8aRULwh4OAwGHf7Sz7yuMCd+ImmfRlZ3cYeFsLWJblQnwSFXEmBiz8ANUj6dG8aSGoqko5jsNs - 23YTCXS+Eussy5Rt26ooCuiRyNxQpmnKIuh5nhrHEUmQLMA5jmPW0Ee1l4yuQBMSaAMwSRI0zl3XsSFq - MKFaTbzI6AoUIOR5vjPB0/BKOBuprjK2x5kJCJNpmvD0T2k/BtyJHNU0gCnVn9J2DBk+TOC67p/xP4gz - Ppw5aH4D3/f5A8rIBj18Ers2b0Fu5iGjKxAtDMPdMBaGGvmu6feOHiQwjN9LZunt0jy6azoj5Rc0vFLT - NLxkLJoGp4tCQI1Yoh+v1Pd9ycIwDLzjEntzPgHpD/wXsLl0jrRzIPx1WIP67sQStJRS/6CyvgGjI/3S - /lGAOgAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAUlJREFUOE+lU6GOg1AQ5BP6Cf2E+4QLnqQWV4EHjUJhGzxJJbICDxpFQvCHg4DA + Yd/tLPvK4wJ34iaZ9GVndxh4WwtYluVCfBIVcSYGLPwA1SPp0bxpIaiqSjmOw2zbdhMJdL4S6yzLlG3b + qigK6JHI3FCmacoi6HmeGscRSZAswDmOY9bQR7WXjK5AExJoAzBJEjTOXdexIWowoVpNvMjoChQg5Hm+ + M8HT8Eo4G6muMrbHmQkIk2ma8PRPaT8G3Ikc1TSAKdWf0nYMGT5M4Lrun/E/iDM+nDlofgPf9/kDysgG + PXwSuzZvQW7mIaMrEC0Mw90wFoYa+a7p944eJDCM30tm6e3SPLprOiPlFzS8UtM0vGQsmgani0JAjVii + H6/U933JwjAMvOMSe3M+AekP/BewuXSOtHMg/HVYg/ruxBK0lFL/oLK+AaMj/dL+UYA6AAAAAElFTkSu + QmCC 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKoCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlRyYXNoIj4NCiAgICA8cGF0aCBkPSJNOCwyN2MwLDAu + NSwwLjUsMSwxLDFoMTRjMC41LDAsMS0wLjUsMS0xVjEySDhWMjd6IiBjbGFzcz0iQmxhY2siIC8+DQog + ICAgPHBhdGggZD0iTTI1LDZoLTdWNWMwLTAuNS0wLjUtMS0xLTFoLTJjLTAuNSwwLTEsMC41LTEsMXYx + SDdDNi41LDYsNiw2LjUsNiw3djNoMjBWN0MyNiw2LjUsMjUuNSw2LDI1LDZ6IiBjbGFzcz0iQmxhY2si + IC8+DQogIDwvZz4NCjwvc3ZnPgs= + + \ No newline at end of file diff --git a/EnvelopeGenerator.Form/frmRueckruf.vb b/EnvelopeGenerator.Form/frmRueckruf.vb index 76317af6..3d1a1db8 100644 --- a/EnvelopeGenerator.Form/frmRueckruf.vb +++ b/EnvelopeGenerator.Form/frmRueckruf.vb @@ -12,7 +12,19 @@ Public Class frmRueckruf ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnWeiter.Click + + Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click + Continue_Reject = False + Me.Close() + End Sub + + Private Sub frmRueckruf_Load(sender As Object, e As EventArgs) Handles Me.Load + txtReason.Text = "" + tsstatus.Text = "" + Continue_Reject = False + End Sub + + Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click If txtReason.Text <> "" Then If MsgBox(Resources.Envelope.Do_you_really_want_to_delete_this_envelope, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.No Then Me.Close() @@ -38,13 +50,4 @@ Public Class frmRueckruf tsstatus.Text = "Please add a reason for aborting - " & Now End If End Sub - - Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click - Me.Close() - End Sub - - Private Sub frmRueckruf_Load(sender As Object, e As EventArgs) Handles Me.Load - txtReason.Text = "" - tsstatus.Text = "" - End Sub End Class \ No newline at end of file