MS_08.09.2015

2015-09-08 10:15:45 +02:00 · 2015-09-08 10:15:45 +02:00 · b053807a99
commit b053807a99
parent 6123cba9d1
5 changed files with 92 additions and 97 deletions
--- a/app/DD-Record-Organiser/frmForm_Constructor.designer.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor.designer.vb
@ -130,6 +130,7 @@ Partial Class frmForm_Constructor
        Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
        Me.pnlTop = New System.Windows.Forms.Panel()
        Me.pnlMain = New System.Windows.Forms.Panel()
+        Me.pnlNavButtons = New System.Windows.Forms.Panel()
        CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridControlSelection, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.grvwSelection, System.ComponentModel.ISupportInitialize).BeginInit()
@ -190,7 +191,7 @@ Partial Class frmForm_Constructor
        Me.GridControlSelection.Location = New System.Drawing.Point(298, 0)
        Me.GridControlSelection.MainView = Me.grvwSelection
        Me.GridControlSelection.Name = "GridControlSelection"
-        Me.GridControlSelection.Size = New System.Drawing.Size(1013, 182)
+        Me.GridControlSelection.Size = New System.Drawing.Size(1013, 183)
        Me.GridControlSelection.TabIndex = 13
        Me.GridControlSelection.TabStop = False
        Me.GridControlSelection.UseEmbeddedNavigator = True
@ -236,7 +237,7 @@ Partial Class frmForm_Constructor
        Me.GridControlParentEntity.Location = New System.Drawing.Point(3, 3)
        Me.GridControlParentEntity.MainView = Me.GridViewParentEntity
        Me.GridControlParentEntity.Name = "GridControlParentEntity"
-        Me.GridControlParentEntity.Size = New System.Drawing.Size(325, 314)
+        Me.GridControlParentEntity.Size = New System.Drawing.Size(325, 317)
        Me.GridControlParentEntity.TabIndex = 14
        Me.GridControlParentEntity.TabStop = False
        Me.GridControlParentEntity.UseEmbeddedNavigator = True
@ -313,8 +314,8 @@ Partial Class frmForm_Constructor
        Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitCont_Details)
        Me.SplitContainerMain.Panel2.Controls.Add(Me.ToolStrip1)
        Me.SplitContainerMain.Panel2.Controls.Add(Me.StatusStrip2)
-        Me.SplitContainerMain.Size = New System.Drawing.Size(1311, 584)
-        Me.SplitContainerMain.SplitterDistance = 182
+        Me.SplitContainerMain.Size = New System.Drawing.Size(1311, 588)
+        Me.SplitContainerMain.SplitterDistance = 183
        Me.SplitContainerMain.TabIndex = 1
        '
        'SplitterLeft
@ -322,7 +323,7 @@ Partial Class frmForm_Constructor
        Me.SplitterLeft.BackColor = System.Drawing.SystemColors.InactiveCaption
        Me.SplitterLeft.Location = New System.Drawing.Point(295, 0)
        Me.SplitterLeft.Name = "SplitterLeft"
-        Me.SplitterLeft.Size = New System.Drawing.Size(3, 182)
+        Me.SplitterLeft.Size = New System.Drawing.Size(3, 183)
        Me.SplitterLeft.TabIndex = 12
        Me.SplitterLeft.TabStop = False
        '
@ -338,7 +339,7 @@ Partial Class frmForm_Constructor
        Me.TreeViewEbeneSelect.Location = New System.Drawing.Point(0, 0)
        Me.TreeViewEbeneSelect.Name = "TreeViewEbeneSelect"
        Me.TreeViewEbeneSelect.SelectedImageIndex = 1
-        Me.TreeViewEbeneSelect.Size = New System.Drawing.Size(295, 182)
+        Me.TreeViewEbeneSelect.Size = New System.Drawing.Size(295, 183)
        Me.TreeViewEbeneSelect.TabIndex = 9
        Me.TreeViewEbeneSelect.TabStop = False
        Me.ttToolTip.SetToolTip(Me.TreeViewEbeneSelect, "Wählen Sie hier die zu filternde Entität (RechtsKlick für Zurücksetzen)")
@ -382,7 +383,7 @@ Partial Class frmForm_Constructor
        Me.SplitCont_Details.Panel1.Text = "Panel1"
        Me.SplitCont_Details.Panel2.Controls.Add(Me.XtraTabControl1)
        Me.SplitCont_Details.Panel2.Text = "Panel2"
-        Me.SplitCont_Details.Size = New System.Drawing.Size(1311, 373)
+        Me.SplitCont_Details.Size = New System.Drawing.Size(1311, 376)
        Me.SplitCont_Details.SplitterPosition = Global.DD_Record_Organiser.My.MySettings.Default.Constructor_DetailsSplitter
        Me.SplitCont_Details.TabIndex = 2
        Me.SplitCont_Details.Text = "SplitContainerControl1"
@ -399,7 +400,7 @@ Partial Class frmForm_Constructor
        Me.TCDetails.Name = "TCDetails"
        Me.TCDetails.SelectedTabPage = Me.TabPageDetails
        Me.TCDetails.ShowHeaderFocus = DevExpress.Utils.DefaultBoolean.[False]
-        Me.TCDetails.Size = New System.Drawing.Size(764, 369)
+        Me.TCDetails.Size = New System.Drawing.Size(764, 372)
        Me.TCDetails.TabIndex = 19
        Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageDetails, Me.TabPageWD_Files, Me.TabPageFollowUp})
        '
@ -408,7 +409,7 @@ Partial Class frmForm_Constructor
        Me.TabPageDetails.Controls.Add(Me.pnlDetails)
        Me.TabPageDetails.Image = Global.DD_Record_Organiser.My.Resources.Resources.grid_Data_16xMD
        Me.TabPageDetails.Name = "TabPageDetails"
-        Me.TabPageDetails.Size = New System.Drawing.Size(758, 338)
+        Me.TabPageDetails.Size = New System.Drawing.Size(758, 341)
        Me.TabPageDetails.Text = "Detailansicht:"
        '
        'pnlDetails
@ -417,7 +418,7 @@ Partial Class frmForm_Constructor
        Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlDetails.Location = New System.Drawing.Point(0, 0)
        Me.pnlDetails.Name = "pnlDetails"
-        Me.pnlDetails.Size = New System.Drawing.Size(758, 338)
+        Me.pnlDetails.Size = New System.Drawing.Size(758, 341)
        Me.pnlDetails.TabIndex = 0
        '
        'TabPageWD_Files
@ -426,7 +427,7 @@ Partial Class frmForm_Constructor
        Me.TabPageWD_Files.Controls.Add(Me.ToolStripDokumente)
        Me.TabPageWD_Files.Image = Global.DD_Record_Organiser.My.Resources.Resources.Files_7954
        Me.TabPageWD_Files.Name = "TabPageWD_Files"
-        Me.TabPageWD_Files.Size = New System.Drawing.Size(758, 338)
+        Me.TabPageWD_Files.Size = New System.Drawing.Size(758, 341)
        Me.TabPageWD_Files.Text = "windream-Dateien"
        Me.ttToolTip.SetToolTip(Me.TabPageWD_Files, "Zeigt die Dateien in windream zum ausgewählten Datensatz an")
        '
@ -438,7 +439,7 @@ Partial Class frmForm_Constructor
        Me.AxObjectListControl.Location = New System.Drawing.Point(0, 25)
        Me.AxObjectListControl.Name = "AxObjectListControl"
        Me.AxObjectListControl.OcxState = CType(resources.GetObject("AxObjectListControl.OcxState"), System.Windows.Forms.AxHost.State)
-        Me.AxObjectListControl.Size = New System.Drawing.Size(758, 313)
+        Me.AxObjectListControl.Size = New System.Drawing.Size(758, 316)
        Me.AxObjectListControl.TabIndex = 5
        Me.AxObjectListControl.TabStop = False
        '
@ -481,7 +482,7 @@ Partial Class frmForm_Constructor
        Me.TabPageFollowUp.Controls.Add(Me.ListViewFollowUp)
        Me.TabPageFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD
        Me.TabPageFollowUp.Name = "TabPageFollowUp"
-        Me.TabPageFollowUp.Size = New System.Drawing.Size(758, 338)
+        Me.TabPageFollowUp.Size = New System.Drawing.Size(758, 341)
        Me.TabPageFollowUp.Text = "Wiedervorlage"
        '
        'grpbxFU_Profile
@ -695,7 +696,7 @@ Partial Class frmForm_Constructor
        Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0)
        Me.XtraTabControl1.Name = "XtraTabControl1"
        Me.XtraTabControl1.SelectedTabPage = Me.TabPageParentEntity
-        Me.XtraTabControl1.Size = New System.Drawing.Size(538, 369)
+        Me.XtraTabControl1.Size = New System.Drawing.Size(538, 372)
        Me.XtraTabControl1.TabIndex = 0
        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageParentEntity})
        '
@ -709,7 +710,7 @@ Partial Class frmForm_Constructor
        Me.TabPageParentEntity.Controls.Add(Me.Label4)
        Me.TabPageParentEntity.Controls.Add(Me.GridControlParentEntity)
        Me.TabPageParentEntity.Name = "TabPageParentEntity"
-        Me.TabPageParentEntity.Size = New System.Drawing.Size(532, 341)
+        Me.TabPageParentEntity.Size = New System.Drawing.Size(532, 344)
        Me.TabPageParentEntity.Text = "Parent-Entity"
        '
        'Button1
@ -717,7 +718,7 @@ Partial Class frmForm_Constructor
        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.Close_16xLG
        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(423, 290)
+        Me.Button1.Location = New System.Drawing.Point(423, 293)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(98, 27)
        Me.Button1.TabIndex = 18
@ -734,7 +735,7 @@ Partial Class frmForm_Constructor
        Me.btnRefreshPEntity.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.btnRefreshPEntity.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG
        Me.btnRefreshPEntity.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 325)
+        Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 328)
        Me.btnRefreshPEntity.Name = "btnRefreshPEntity"
        Me.btnRefreshPEntity.Size = New System.Drawing.Size(518, 31)
        Me.btnRefreshPEntity.TabIndex = 17
@ -1138,22 +1139,31 @@ Partial Class frmForm_Constructor
        '
        'pnlTop
        '
+        Me.pnlTop.Controls.Add(Me.pnlNavButtons)
        Me.pnlTop.Controls.Add(Me.BindingNavigatorForm1)
        Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnlTop.Location = New System.Drawing.Point(0, 0)
        Me.pnlTop.Name = "pnlTop"
-        Me.pnlTop.Size = New System.Drawing.Size(1311, 74)
+        Me.pnlTop.Size = New System.Drawing.Size(1311, 70)
        Me.pnlTop.TabIndex = 4
        '
        'pnlMain
        '
        Me.pnlMain.Controls.Add(Me.SplitContainerMain)
        Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlMain.Location = New System.Drawing.Point(0, 74)
+        Me.pnlMain.Location = New System.Drawing.Point(0, 70)
        Me.pnlMain.Name = "pnlMain"
-        Me.pnlMain.Size = New System.Drawing.Size(1311, 584)
+        Me.pnlMain.Size = New System.Drawing.Size(1311, 588)
        Me.pnlMain.TabIndex = 5
        '
+        'pnlNavButtons
+        '
+        Me.pnlNavButtons.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pnlNavButtons.Location = New System.Drawing.Point(0, 25)
+        Me.pnlNavButtons.Name = "pnlNavButtons"
+        Me.pnlNavButtons.Size = New System.Drawing.Size(1311, 45)
+        Me.pnlNavButtons.TabIndex = 2
+        '
        'frmForm_Constructor
        '
        Me.AllowDrop = True
@ -1330,5 +1340,6 @@ Partial Class frmForm_Constructor
    Friend WithEvents Button1 As System.Windows.Forms.Button
    Friend WithEvents pnlTop As System.Windows.Forms.Panel
    Friend WithEvents pnlMain As System.Windows.Forms.Panel
+    Friend WithEvents pnlNavButtons As System.Windows.Forms.Panel

 End Class
--- a/app/DD-Record-Organiser/frmForm_Constructor.resx
+++ b/app/DD-Record-Organiser/frmForm_Constructor.resx
@ -140,6 +140,15 @@
  <metadata name="CMSEntity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1123, 56</value>
  </metadata>
+  <data name="DateiimportEntitätToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        xAAADsQBlSsOGwAAALNJREFUOE9jIAS+fftmAMTvgfg/NgxVhh0AFYA1t7W1/XdycsLAKAbATETHIM3N
+        zS3/P7z/iIKxGoBuAwgja4aJ4TUAppgQpp4BIAKGyTYAxCEWYzPgfH5+PoZCXPjokaMYBjQsX74cQyEu
+        3NfXj2GAwZUrVzAU4sLJScmoBkBj4H1kZCSGYlz41s3bYBrZgPm4kis2vH7dejCNbEDCvn37MBQSwsgG
+        CIA45GCG//8pwf8ZANa5gGyReLItAAAAAElFTkSuQmCC
+</value>
+  </data>
  <metadata name="ImageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1013, 56</value>
  </metadata>
@ -148,7 +157,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS
-        CQAAAk1TRnQBSQFMAgEBAgEAAdABCAHQAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAeABCAHgAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@ -193,24 +202,6 @@
  <metadata name="ttToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>811, 17</value>
  </metadata>
-  <metadata name="ToolStripDokumente.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>646, 17</value>
-  </metadata>
-  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>912, 17</value>
-  </metadata>
-  <metadata name="StatusStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
-  </metadata>
-  <data name="DateiimportEntitätToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAALNJREFUOE9jIAS+fftmAMTvgfg/NgxVhh0AFYA1t7W1/XdycsLAKAbATETHIM3N
-        zS3/P7z/iIKxGoBuAwgja4aJ4TUAppgQpp4BIAKGyTYAxCEWYzPgfH5+PoZCXPjokaMYBjQsX74cQyEu
-        3NfXj2GAwZUrVzAU4sLJScmoBkBj4H1kZCSGYlz41s3bYBrZgPm4kis2vH7dejCNbEDCvn37MBQSwsgG
-        CIA45GCG//8pwf8ZANa5gGyReLItAAAAAElFTkSuQmCC
-</value>
-  </data>
  <data name="AxObjectListControl.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
@ -255,23 +246,12 @@
  <metadata name="VWPMO_WF_USER_ACTIVEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>299, 56</value>
  </metadata>
-  <metadata name="VWPMO_WF_USER_ACTIVEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>299, 56</value>
-  </metadata>
  <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1349, 17</value>
  </metadata>
-  <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1349, 17</value>
+  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>912, 17</value>
  </metadata>
-  <data name="TSDropDownButtonRecordFunctions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAB5SURBVDhPlZFBCsAwCAR9W/7/l7aXXFsW3KASqxGmIuok
-        pLKLOefbRVd8oDHGKCkF9/WktAU8zXIkyGgLkAnrI0HGEuDTxUqdgEWVf29gm5HdjBOgsM1I+wYUxcwZ
-        1JYl4GAGh3ccvYH+ZR9o8IQq64oPNLroigmRDwwRqGv/fuehAAAAAElFTkSuQmCC
-</value>
-  </data>
  <data name="WindreamSucheNeuLadenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
@ -330,6 +310,14 @@
        vFXvHu0qboy1gTO+AGdTgXVqwDg0YOcIUPqXoPpuY1F5o2Tqeer/0Fh7XNqDvQYVubvlJwzK+qvjj+tG
        Jp/UcSZF3Q+L4vrOTOu1/Pv7VxY0d2rl2luXLh70HGrwLzoy+eeC7DdDjRpyPiqHagAAAABJRU5ErkJg
        gg==
+</value>
+  </data>
+  <data name="TSDropDownButtonRecordFunctions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAB5SURBVDhPlZFBCsAwCAR9W/7/l7aXXFsW3KASqxGmIuok
+        pLKLOefbRVd8oDHGKCkF9/WktAU8zXIkyGgLkAnrI0HGEuDTxUqdgEWVf29gm5HdjBOgsM1I+wYUxcwZ
+        1JYl4GAGh3ccvYH+ZR9o8IQq64oPNLroigmRDwwRqGv/fuehAAAAAElFTkSuQmCC
 </value>
  </data>
  <data name="tsbtnshowTaskoverview.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -365,6 +353,9 @@
        B5Fv7P0qqe28k2VwOD8A3i8M0yVWkE8AAAAASUVORK5CYII=
 </value>
  </data>
+  <metadata name="StatusStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
  <data name="tsstatus_Detail.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@ -438,16 +429,6 @@
        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="ToolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADQSURBVDhPlY6xC0FRGMXvLIPBYjKZTDIYkOEtDAzU86Qw
-        MMigZGAQL2WyqVcMFgNZ/Rd6/9PVOa5Vna9O3Xu+fr8+Ez6CaP/sWTXgDGZ39+3rfZEDjoLNrc2PGnAU
-        rK8tOwyLcsBRsDw37G/iOHav7/z7g6NgfvJcpQnAUTA9VrlQA46C8aHknNoF4CgYbAuu0gTgKAhWeS7U
-        gKOgs8g5p3YBOAqas6yrNAE4CuqTDBdqwFHgjdLOqV0AjoJaP+UqTQCOgrKfiCrdpFUDzhhjPlRg7jGq
-        htNmAAAAAElFTkSuQmCC
 </value>
  </data>
  <data name="ClearAllFiltersToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -471,6 +452,16 @@
        ZRMmbLlRLflSG2RF+oN/sCmVj5eVjiGVevkcyoiUhACwmC3oh0Cljrn6/mtteS2YeqyjVlt2X1X3hhEt
        5Bs3FWPeIJFWuI8ZbjvrqSeYkauCLIyKOYo3tnLYwdB9lCMD5hae5D9VTN+SJ8qNMLqeTYOdd1PS/wAf
        uGOKZCTnGolfNmACmAiVQqoiYvdvpaZB6h9aip4hu6g2rNRGHEWN9sR0Y2BZma7rP//Z
+</value>
+  </data>
+  <data name="ToolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADQSURBVDhPlY6xC0FRGMXvLIPBYjKZTDIYkOEtDAzU86Qw
+        MMigZGAQL2WyqVcMFgNZ/Rd6/9PVOa5Vna9O3Xu+fr8+Ez6CaP/sWTXgDGZ39+3rfZEDjoLNrc2PGnAU
+        rK8tOwyLcsBRsDw37G/iOHav7/z7g6NgfvJcpQnAUTA9VrlQA46C8aHknNoF4CgYbAuu0gTgKAhWeS7U
+        gKOgs8g5p3YBOAqas6yrNAE4CuqTDBdqwFHgjdLOqV0AjoJaP+UqTQCOgrKfiCrdpFUDzhhjPlRg7jGq
+        htNmAAAAAElFTkSuQmCC
 </value>
  </data>
  <metadata name="BindingSourceForm2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/app/DD-Record-Organiser/frmForm_Constructor.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor.vb
@ -1427,7 +1427,7 @@ Public Class frmForm_Constructor
        Dim btn As New Button
        btn.FlatStyle = FlatStyle.Flat
        btn.Text = Text
-        btn.Size = New Size(245, 50)
+        btn.Size = New Size(245, 42)
        Dim colorBackground As Color
        Dim colorBorder As Color
        Dim style As FontStyle = FontStyle.Bold
@ -1456,14 +1456,14 @@ Public Class frmForm_Constructor
        btn.BackColor = colorBackground
        btn.FlatAppearance.BorderColor = colorBorder

-        pnlTop.Controls.Add(btn)
+        pnlNavButtons.Controls.Add(btn)
        Select Case entity
            Case 1
-                btn.Location = New Point(12, 28)
+                btn.Location = New Point(12, 2)
            Case 2
-                btn.Location = New Point(263, 28)
+                btn.Location = New Point(263, 2)
            Case 3
-                btn.Location = New Point(514, 28)
+                btn.Location = New Point(514, 2)
                btn.ForeColor = Color.White
        End Select
    End Sub
@ -1479,6 +1479,7 @@ Public Class frmForm_Constructor
                    tslblEntity.Text = EBENE1_ENTITY & " - " & EBENE1_GRID_RESULT
                    'tslblEntity1.Text = EBENE1_ENTITY & " - " & EBENE1_GRID_RESULT
                    'Me.tslblEntity1.Visible = True
+                    pnlNavButtons.Controls.Clear()
                    Create_NavButton(1, EBENE1_GRID_RESULT)
                Case 2
                    If CURRENT_FORM_TYPE = 5 Then
@ -1487,6 +1488,7 @@ Public Class frmForm_Constructor
                        'tslblEntity2.Text = "Gruppen-Entität: " & EBENE2_ENTITY
                        'Me.tslblEntity1.Visible = True
                        'Me.tslblEntity2.Visible = True
+                        pnlNavButtons.Controls.Clear()
                        Create_NavButton(1, EBENE1_GRID_RESULT)
                        Create_NavButton(2, EBENE2_ENTITY)

@ -1495,6 +1497,7 @@ Public Class frmForm_Constructor
                    If EBENE1_GRID_RESULT Is Nothing = False Then
                        tslblEntity.Text = EBENE1_ENTITY & " - " & EBENE1_GRID_RESULT & " #### " & EBENE2_ENTITY & " - " & EBENE2_GRID_RESULT
                        'tslblEntity1.Text = EBENE1_ENTITY & " - " & EBENE1_GRID_RESULT
+                        pnlNavButtons.Controls.Clear()
                        Create_NavButton(1, EBENE1_GRID_RESULT)
                        Create_NavButton(2, EBENE2_GRID_RESULT)

@ -1512,7 +1515,7 @@ Public Class frmForm_Constructor
                        'tslblEntity1.Text = EBENE1_ENTITY & " - " & EBENE1_GRID_RESULT
                        'tslblEntity2.Text = EBENE2_ENTITY & " - " & EBENE2_GRID_RESULT
                        'tslblEntity3.Text = "Gruppen-Entität: " & EBENE3_GRID_RESULT
-
+                        pnlNavButtons.Controls.Clear()
                        Create_NavButton(1, EBENE1_GRID_RESULT)
                        Create_NavButton(2, EBENE2_GRID_RESULT)
                        Create_NavButton(3, EBENE3_GRID_RESULT)
@ -1531,7 +1534,7 @@ Public Class frmForm_Constructor
                        'Me.tslblEntity1.Visible = True
                        'Me.tslblEntity2.Visible = True
                        'Me.tslblEntity3.Visible = True
-
+                        pnlNavButtons.Controls.Clear()
                        Create_NavButton(1, EBENE1_GRID_RESULT)
                        Create_NavButton(2, EBENE2_GRID_RESULT)
                        Create_NavButton(3, EBENE3_GRID_RESULT)
@ -1543,6 +1546,7 @@ Public Class frmForm_Constructor
                        tslblEntity.Text = EBENE2_ENTITY & " - " & EBENE2_GRID_RESULT & " #### " & EBENE3_ENTITY & " - " & EBENE3_GRID_RESULT
                        ' Me.tslblEntity1.Visible = True
                        'Me.tslblEntity2.Visible = True
+                        pnlNavButtons.Controls.Clear()
                        Create_NavButton(1, EBENE2_GRID_RESULT)
                        Create_NavButton(2, EBENE3_GRID_RESULT)

@ -1841,17 +1845,17 @@ Public Class frmForm_Constructor
                    EBENE2_GRID_RESULT = Nothing
                    EBENE3_GRID_RESULT = Nothing
                    _sql = ClassDatabase.Execute_Scalar("SELECT SQL_SELECT_EBENE1 FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FORM_ID)
-                    If ClassControlCommands.CTRL_EXISTSinPARENT("btnEntity2", pnlTop) Then
-                        Dim btn As Button = DirectCast(pnlTop.Controls("btnEntity2"), Button)
-                        pnlTop.Controls.Remove(btn)
+                    If ClassControlCommands.CTRL_EXISTSinPARENT("btnEntity2", pnlNavButtons) Then
+                        Dim btn As Button = DirectCast(pnlNavButtons.Controls("btnEntity2"), Button)
+                        pnlNavButtons.Controls.Remove(btn)
                    End If
-                    If ClassControlCommands.CTRL_EXISTSinPARENT("btnEntity3", pnlTop) Then
-                        Dim btn As Button = DirectCast(pnlTop.Controls("btnEntity3"), Button)
-                        pnlTop.Controls.Remove(btn)
+                    If ClassControlCommands.CTRL_EXISTSinPARENT("btnEntity3", pnlNavButtons) Then
+                        Dim btn As Button = DirectCast(pnlNavButtons.Controls("btnEntity3"), Button)
+                        pnlNavButtons.Controls.Remove(btn)
                    End If
-                    If ClassControlCommands.CTRL_EXISTSinPARENT("btnEntity1", pnlTop) Then
-                        Dim btn As Button = DirectCast(pnlTop.Controls("btnEntity1"), Button)
-                        pnlTop.Controls.Remove(btn)
+                    If ClassControlCommands.CTRL_EXISTSinPARENT("btnEntity1", pnlNavButtons) Then
+                        Dim btn As Button = DirectCast(pnlNavButtons.Controls("btnEntity1"), Button)
+                        pnlNavButtons.Controls.Remove(btn)
                    End If
                    'Try
                    '    Dim tileitem As DevExpress.XtraEditors.TileItem = TileControl1.Groups(0).Items(1)
@ -1891,13 +1895,13 @@ Public Class frmForm_Constructor
                    EBENE2_GRID_RESULT = Nothing
                    EBENE3_GRID_RESULT = Nothing
                    Try
-                        If ClassControlCommands.CTRL_EXISTSinPARENT("btnEntity3", pnlTop) Then
-                            Dim btn As Button = DirectCast(pnlTop.Controls("btnEntity3"), Button)
-                            pnlTop.Controls.Remove(btn)
+                        If ClassControlCommands.CTRL_EXISTSinPARENT("btnEntity3", pnlNavButtons) Then
+                            Dim btn As Button = DirectCast(pnlNavButtons.Controls("btnEntity3"), Button)
+                            pnlNavButtons.Controls.Remove(btn)
                        End If
-                        If ClassControlCommands.CTRL_EXISTSinPARENT("btnEntity2", pnlTop) Then
-                            Dim btn As Button = DirectCast(pnlTop.Controls("btnEntity2"), Button)
-                            pnlTop.Controls.Remove(btn)
+                        If ClassControlCommands.CTRL_EXISTSinPARENT("btnEntity2", pnlNavButtons) Then
+                            Dim btn As Button = DirectCast(pnlNavButtons.Controls("btnEntity2"), Button)
+                            pnlNavButtons.Controls.Remove(btn)
                        End If
                    Catch ex As Exception

@ -2207,6 +2211,7 @@ Public Class frmForm_Constructor
    Private Sub frmForm_Constructor_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        Me.BringToFront()
        LoadLayouts()
+        BindingNavigatorForm1.Visible = True
    End Sub
    Private Sub ExportNachExcelToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportNachExcelToolStripMenuItem.Click
        Dim saveFileDialog1 As New SaveFileDialog
--- a/app/DD-Record-Organiser/frmMain.Designer.vb
+++ b/app/DD-Record-Organiser/frmMain.Designer.vb
@ -68,7 +68,6 @@ Partial Class frmMain
        Me.DefaultLookAndFeel1 = New DevExpress.LookAndFeel.DefaultLookAndFeel(Me.components)
        Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem()
        Me.Button1 = New System.Windows.Forms.Button()
-        Me.Button2 = New System.Windows.Forms.Button()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.ribbonMain, System.ComponentModel.ISupportInitialize).BeginInit()
@ -436,15 +435,6 @@ Partial Class frmMain
        Me.Button1.Text = "Button1"
        Me.Button1.UseVisualStyleBackColor = True
        '
-        'Button2
-        '
-        Me.Button2.Location = New System.Drawing.Point(398, 375)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(75, 23)
-        Me.Button2.TabIndex = 4
-        Me.Button2.Text = "Button2"
-        Me.Button2.UseVisualStyleBackColor = True
-        '
        'frmMain
        '
        Me.Appearance.BackColor = System.Drawing.Color.White
@ -455,7 +445,6 @@ Partial Class frmMain
        Me.BackgroundImageLayoutStore = System.Windows.Forms.ImageLayout.Center
        Me.BackgroundImageStore = CType(resources.GetObject("$this.BackgroundImageStore"), System.Drawing.Image)
        Me.ClientSize = New System.Drawing.Size(1498, 678)
-        Me.Controls.Add(Me.Button2)
        Me.Controls.Add(Me.Button1)
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.ribbonMain)
@ -518,6 +507,5 @@ Partial Class frmMain
    Friend WithEvents BarButtonItem15 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem16 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents Button1 As System.Windows.Forms.Button
-    Friend WithEvents Button2 As System.Windows.Forms.Button

 End Class
--- a/app/DD-Record-Organiser/frmMain.vb
+++ b/app/DD-Record-Organiser/frmMain.vb
@ -519,7 +519,7 @@ Public Class frmMain
        frm.Show()
    End Sub

-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+    Private Sub Button2_Click(sender As Object, e As EventArgs)
        frmTestvb.Show()
    End Sub
 End Class