From 0ba3aba7ceb0d918460201a8fb276c2dd2bec35f Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 12 Jun 2018 15:30:44 +0200 Subject: [PATCH] Bugfixing2 --- app/DD_PM_WINDREAM/frmMain.Designer.vb | 201 ++++++++---------- app/DD_PM_WINDREAM/frmMain.resx | 224 +++++++++----------- app/DD_PM_WINDREAM/frmMain.vb | 7 +- app/DD_PM_WINDREAM/frmValidator.Designer.vb | 17 -- app/DD_PM_WINDREAM/frmValidator.resx | 56 ++--- 5 files changed, 218 insertions(+), 287 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 6190442..a3e9e1d 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -56,6 +56,18 @@ Partial Class frmMain Me.tsslblLastSysnc = New System.Windows.Forms.ToolStripStatusLabel() Me.tslblmessage = New System.Windows.Forms.ToolStripStatusLabel() Me.Panel1 = New System.Windows.Forms.Panel() + Me.pnlNavigator = New System.Windows.Forms.Panel() + Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) + Me.bindsourcegrid = New System.Windows.Forms.BindingSource(Me.components) + Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() + Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorSeparator = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorPositionItem = New System.Windows.Forms.ToolStripTextBox() + Me.BindingNavigatorSeparator1 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.GridControl_Docs = New DevExpress.XtraGrid.GridControl() Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CMGroupStart = New System.Windows.Forms.ToolStripMenuItem() @@ -73,8 +85,6 @@ Partial Class frmMain Me.NavBarItemDashboard = New DevExpress.XtraNavBar.NavBarItem() Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) Me.TimerRefresh = New System.Windows.Forms.Timer(Me.components) - Me.VWPM_PROFILE_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.VWPM_PROFILE_USERTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_PROFILE_USERTableAdapter() Me.TBPM_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_USERTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter() Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -82,18 +92,6 @@ Partial Class frmMain Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() Me.TimerReminder = New System.Windows.Forms.Timer(Me.components) - Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) - Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorSeparator = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorPositionItem = New System.Windows.Forms.ToolStripTextBox() - Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() - Me.BindingNavigatorSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() - Me.pnlNavigator = New System.Windows.Forms.Panel() - Me.bindsourcegrid = New System.Windows.Forms.BindingSource(Me.components) CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerDashboard.Panel1.SuspendLayout() Me.SplitContainerDashboard.Panel2.SuspendLayout() @@ -115,19 +113,18 @@ Partial Class frmMain Me.ToolStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout() Me.Panel1.SuspendLayout() + Me.pnlNavigator.SuspendLayout() + CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.BindingNavigator1.SuspendLayout() + CType(Me.bindsourcegrid, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuGrid.SuspendLayout() CType(Me.GridView_Docs, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.cmsNavPane.SuspendLayout() - CType(Me.VWPM_PROFILE_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.BindingNavigator1.SuspendLayout() - Me.pnlNavigator.SuspendLayout() - CType(Me.bindsourcegrid, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplitContainerDashboard @@ -375,6 +372,77 @@ Partial Class frmMain resources.ApplyResources(Me.Panel1, "Panel1") Me.Panel1.Name = "Panel1" ' + 'pnlNavigator + ' + resources.ApplyResources(Me.pnlNavigator, "pnlNavigator") + Me.pnlNavigator.Controls.Add(Me.BindingNavigator1) + Me.pnlNavigator.Name = "pnlNavigator" + ' + 'BindingNavigator1 + ' + Me.BindingNavigator1.AddNewItem = Nothing + Me.BindingNavigator1.BindingSource = Me.bindsourcegrid + Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem + Me.BindingNavigator1.CountItemFormat = "von {0} Dateien" + Me.BindingNavigator1.DeleteItem = Nothing + resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1") + Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2}) + Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem + Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem + Me.BindingNavigator1.MoveNextItem = Me.BindingNavigatorMoveNextItem + Me.BindingNavigator1.MovePreviousItem = Me.BindingNavigatorMovePreviousItem + Me.BindingNavigator1.Name = "BindingNavigator1" + Me.BindingNavigator1.PositionItem = Me.BindingNavigatorPositionItem + ' + 'BindingNavigatorCountItem + ' + Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem" + resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem") + ' + 'BindingNavigatorMoveFirstItem + ' + Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveFirstItem, "BindingNavigatorMoveFirstItem") + Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem" + ' + 'BindingNavigatorMovePreviousItem + ' + Me.BindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMovePreviousItem, "BindingNavigatorMovePreviousItem") + Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem" + ' + 'BindingNavigatorSeparator + ' + Me.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator" + resources.ApplyResources(Me.BindingNavigatorSeparator, "BindingNavigatorSeparator") + ' + 'BindingNavigatorPositionItem + ' + resources.ApplyResources(Me.BindingNavigatorPositionItem, "BindingNavigatorPositionItem") + Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" + ' + 'BindingNavigatorSeparator1 + ' + Me.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator1" + resources.ApplyResources(Me.BindingNavigatorSeparator1, "BindingNavigatorSeparator1") + ' + 'BindingNavigatorMoveNextItem + ' + Me.BindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveNextItem, "BindingNavigatorMoveNextItem") + Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem" + ' + 'BindingNavigatorMoveLastItem + ' + Me.BindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveLastItem, "BindingNavigatorMoveLastItem") + Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem" + ' + 'BindingNavigatorSeparator2 + ' + Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2" + resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2") + ' 'GridControl_Docs ' resources.ApplyResources(Me.GridControl_Docs, "GridControl_Docs") @@ -490,15 +558,6 @@ Partial Class frmMain ' Me.TimerRefresh.Interval = 60000 ' - 'VWPM_PROFILE_USERBindingSource - ' - Me.VWPM_PROFILE_USERBindingSource.DataMember = "VWPM_PROFILE_USER" - Me.VWPM_PROFILE_USERBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' - 'VWPM_PROFILE_USERTableAdapter - ' - Me.VWPM_PROFILE_USERTableAdapter.ClearBeforeFill = True - ' 'TBPM_USERBindingSource ' Me.TBPM_USERBindingSource.DataMember = "TBDD_USER" @@ -529,77 +588,6 @@ Partial Class frmMain 'TimerReminder ' ' - 'BindingNavigator1 - ' - Me.BindingNavigator1.AddNewItem = Nothing - Me.BindingNavigator1.BindingSource = Me.bindsourcegrid - Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem - Me.BindingNavigator1.CountItemFormat = "von {0} Dateien" - Me.BindingNavigator1.DeleteItem = Nothing - resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1") - Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2}) - Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem - Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem - Me.BindingNavigator1.MoveNextItem = Me.BindingNavigatorMoveNextItem - Me.BindingNavigator1.MovePreviousItem = Me.BindingNavigatorMovePreviousItem - Me.BindingNavigator1.Name = "BindingNavigator1" - Me.BindingNavigator1.PositionItem = Me.BindingNavigatorPositionItem - ' - 'BindingNavigatorMoveFirstItem - ' - Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveFirstItem, "BindingNavigatorMoveFirstItem") - Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem" - ' - 'BindingNavigatorMovePreviousItem - ' - Me.BindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMovePreviousItem, "BindingNavigatorMovePreviousItem") - Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem" - ' - 'BindingNavigatorSeparator - ' - Me.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator" - resources.ApplyResources(Me.BindingNavigatorSeparator, "BindingNavigatorSeparator") - ' - 'BindingNavigatorPositionItem - ' - resources.ApplyResources(Me.BindingNavigatorPositionItem, "BindingNavigatorPositionItem") - Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" - ' - 'BindingNavigatorCountItem - ' - Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem" - resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem") - ' - 'BindingNavigatorSeparator1 - ' - Me.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator" - resources.ApplyResources(Me.BindingNavigatorSeparator1, "BindingNavigatorSeparator1") - ' - 'BindingNavigatorMoveNextItem - ' - Me.BindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveNextItem, "BindingNavigatorMoveNextItem") - Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem" - ' - 'BindingNavigatorMoveLastItem - ' - Me.BindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveLastItem, "BindingNavigatorMoveLastItem") - Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem" - ' - 'BindingNavigatorSeparator2 - ' - Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator" - resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2") - ' - 'pnlNavigator - ' - resources.ApplyResources(Me.pnlNavigator, "pnlNavigator") - Me.pnlNavigator.Controls.Add(Me.BindingNavigator1) - Me.pnlNavigator.Name = "pnlNavigator" - ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -636,21 +624,20 @@ Partial Class frmMain Me.StatusStrip1.PerformLayout() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() + Me.pnlNavigator.ResumeLayout(False) + Me.pnlNavigator.PerformLayout() + CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).EndInit() + Me.BindingNavigator1.ResumeLayout(False) + Me.BindingNavigator1.PerformLayout() + CType(Me.bindsourcegrid, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuGrid.ResumeLayout(False) CType(Me.GridView_Docs, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.cmsNavPane.ResumeLayout(False) - CType(Me.VWPM_PROFILE_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).EndInit() - Me.BindingNavigator1.ResumeLayout(False) - Me.BindingNavigator1.PerformLayout() - Me.pnlNavigator.ResumeLayout(False) - Me.pnlNavigator.PerformLayout() - CType(Me.bindsourcegrid, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -667,8 +654,6 @@ Partial Class frmMain Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton Friend WithEvents NotifyIcon1 As System.Windows.Forms.NotifyIcon Friend WithEvents TimerRefresh As System.Windows.Forms.Timer - Friend WithEvents VWPM_PROFILE_USERBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents VWPM_PROFILE_USERTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_PROFILE_USERTableAdapter Friend WithEvents tstrpbtn_Config As System.Windows.Forms.ToolStripButton Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator Friend WithEvents TBPM_USERBindingSource As System.Windows.Forms.BindingSource diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index ec65ddc..2921c41 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -160,7 +160,7 @@ 0 - 1164, 95 + 907, 95 0, 0 @@ -223,7 +223,7 @@ 0 - 17, 134 + 1049, 95 0, 0 @@ -325,7 +325,7 @@ 0 - 168, 134 + 17, 134 0, 0 @@ -388,7 +388,7 @@ 0 - 330, 134 + 179, 134 0, 0 @@ -488,7 +488,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAYQBAwGEAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAYwBAwGMAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -707,10 +707,10 @@ Top, Left, Right - 500, 134 + 349, 134 - 654, 134 + 503, 134 87, 22 @@ -726,13 +726,13 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEqSURBVDhPYxg8oHDW8/9NC57/z5z4+D9UCAOEtz/AKceQ - O/PZ/1VH3v/HpSi++8H/4IZruA3ImPL0/8J9H7Aqiu95+H/p/v///asv4DYgoefJ/2lb3mMoimi/D9ac - Oev/f6/SE7gNiOx69L939QcURaGt98CaW9cBbe/8+98l/wBuAwKbH/6vm/8Orii45e7/RXv//+8Aas6Y - 8/O/Xd3P//YZ23Eb4FF1/3/+tDcoiuyKb/9Pn/P7v3/Xt/86he/+WySsx22Afend/9mTX2Mo0k85/9+k - 6MV/laxP/40jl+E2wCLvzv/U/tdYFRkknfgvm/b1v27wPNwGGGbd/h/W8hKnIv3Uy/81fKfhNkAn7cZ/ - v+qHeBWpeEzAbYBT7pX/IAV4FQ1CwMAAAPB2wKul5ZpwAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= @@ -746,11 +746,11 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC2SURBVDhPYxg6ILz9wX8ok3QQ3/3gf3DDNfIMiO95+H/p - /v///asvkG5ARPt9sObMWf//e5WeIM2A0NZ7YM2t64C2d/7975J/gHgDglvu/l+09///DqDmjDk//9vV - /fxvn7GdNBfYFd/+nz7n93//rm//dQrf/bdIWE96GOinnP9vUvTiv0rWp//GkctINwAEDJJO/JdN+/pf - N3geeQaAgH7q5f8avtPINwAEVDwmUGbAYAUMDADQFGCYBLpQVQAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -785,11 +785,11 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACjSURBVDhPYxh8oHDW8/9QJnkgd+az/wnd98g3JGPK0//z - 9v/+n9B1hzxDEnqe/J+979f/zq1//7uVXibdkMiuR/+nbPv1v2Tp3/8J0//+t8k9S5ohgc0P/7eufQ/W - bFzy5b909LX/xpHLiDfEo+r+/5K57+CaFV16SHOBfend/4Etz8jTDAIWeXf+2xRcIU8zCBhm3SZfMwjo - pN0gX/NQBAwMAKB+X6AHNEI4AAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= @@ -803,13 +803,13 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEsSURBVDhPYxhcoHDW8/9QJgYAyTUteP4/c+JjnGoYcmc+ - +5/QfQ+rApDcqiPv/4e3P8BtQMaUp//n7f/9P6HrDoYikNzCfR/+Bzdcw21AQs+T/7P3/frfufXvf7fS - yygKQXLTtrz/7199AbcBkV2P/k/Z9ut/ydK//xOm//1vk3sWrhgk17v6w3+v0hO4DQhsfvi/de17sGbj - ki//paOv/TeOXAbWAJKrm//uv0v+AdwGeFTd/18y9x1cs6JLD1wxSC5/2pv/9hnbcRtgX3r3f2DLMwzN - IACSy578+r9FwnrcBljk3flvU3AFQzMIgORS+1/DvYQVGGbdxqoZBEByYS0v/+sGz8NtgE7aDZySIDm/ - 6of/NXyn4TYAH3DKvfJfxWMCGEOFBgVgYAAAvtG/s7kMTpwAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== @@ -873,7 +873,7 @@ Top, Bottom, Left, Right - 894, 95 + 637, 95 265, 22 @@ -1024,7 +1024,7 @@ - 1043, 95 + 786, 95 215, 22 @@ -1257,7 +1257,7 @@ 2 - 1132, 17 + 17, 56 @@ -1769,40 +1769,34 @@ True - 17, 56 - - - 140, 56 - - - 392, 56 + 132, 56 - 638, 56 + 255, 56 - 834, 56 + 451, 56 - 1024, 56 + 641, 56 - 17, 95 + 904, 56 - 274, 95 + 17, 95 - 519, 95 + 262, 95 - 759, 95 + 502, 95 True - 117 + 208 9, 19 @@ -2257,6 +2251,66 @@ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + bindsourcegrid + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorCountItem + + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMoveFirstItem + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMovePreviousItem + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorPositionItem + + + System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator1 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMoveNextItem + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMoveLastItem + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator2 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + CMGroupStart @@ -2329,18 +2383,6 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - VWPM_PROFILE_USERBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - VWPM_PROFILE_USERTableAdapter - - - DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_PROFILE_USERTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - TBPM_USERBindingSource @@ -2383,66 +2425,6 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - BindingNavigatorMoveFirstItem - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorMovePreviousItem - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorSeparator - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorPositionItem - - - System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorCountItem - - - System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorSeparator1 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorMoveNextItem - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorMoveLastItem - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorSeparator2 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - bindsourcegrid - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - frmMain diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index c0a86e7..7a53eae 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -170,7 +170,6 @@ Public Class frmMain TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString TBPM_PROFILETableAdapter.Connection.ConnectionString = MyConnectionString TBPM_USERTableAdapter.Connection.ConnectionString = MyConnectionString - VWPM_PROFILE_USERTableAdapter.Connection.ConnectionString = MyConnectionString TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = MyConnectionString Return True @@ -953,11 +952,11 @@ Public Class frmMain lblViewType.Text = "Gesamtübersicht" Cursor = Cursors.WaitCursor Try - Me.VWPM_PROFILE_USERTableAdapter.FillByActive(Me.DD_DMSLiteDataSet.VWPM_PROFILE_USER, Environment.UserName) - Dim DT As DataTable = DD_DMSLiteDataSet.Tables("VWPM_PROFILE_USER") + Dim sel = String.Format("SELECT * FROM VWPM_PROFILE_USER WHERE USER_ID ={0}", CURRENT_USER_ID) + CURRENT_DT_VW_PROFILE_USER = ClassDatabase.Return_Datatable(sel, True) tslblmessage.Text = "" - If DT.Rows.Count = 0 Then + If CURRENT_DT_VW_PROFILE_USER.Rows.Count = 0 Then ClassLogger.Add(" >> no profiles for user: '" & Environment.UserName & "' configured!", False) tslblmessage.Text = "Keine Profile für Ihren User hinterlegt" diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index cb41b3d..5ab1058 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -36,7 +36,6 @@ Partial Class frmValidator Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateieigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TITLELabel1 = New System.Windows.Forms.Label() - Me.VWPM_PROFILE_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() Me.btnSave = New System.Windows.Forms.Button() Me.DESCRIPTIONLabel = New System.Windows.Forms.Label() @@ -46,7 +45,6 @@ Partial Class frmValidator Me.txtErstellt = New System.Windows.Forms.TextBox() Me.txtDateipfad = New System.Windows.Forms.TextBox() Me.pnldesigner = New System.Windows.Forms.Panel() - Me.VWPM_PROFILE_USERTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_PROFILE_USERTableAdapter() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBDD_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.TBPM_CONTROL_TABLETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() @@ -145,7 +143,6 @@ Partial Class frmValidator Me.StatusStrip1.SuspendLayout() Me.Panel1.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() - CType(Me.VWPM_PROFILE_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox1.SuspendLayout() CType(Me.VWPM_CONTROL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -246,14 +243,8 @@ Partial Class frmValidator 'TITLELabel1 ' resources.ApplyResources(Me.TITLELabel1, "TITLELabel1") - Me.TITLELabel1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPM_PROFILE_USERBindingSource, "TITLE", True)) Me.TITLELabel1.Name = "TITLELabel1" ' - 'VWPM_PROFILE_USERBindingSource - ' - Me.VWPM_PROFILE_USERBindingSource.DataMember = "VWPM_PROFILE_USER" - Me.VWPM_PROFILE_USERBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' 'DD_DMSLiteDataSet ' Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" @@ -269,7 +260,6 @@ Partial Class frmValidator 'DESCRIPTIONLabel ' resources.ApplyResources(Me.DESCRIPTIONLabel, "DESCRIPTIONLabel") - Me.DESCRIPTIONLabel.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPM_PROFILE_USERBindingSource, "DESCRIPTION", True)) Me.DESCRIPTIONLabel.Name = "DESCRIPTIONLabel" ' 'GroupBox1 @@ -316,10 +306,6 @@ Partial Class frmValidator Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnldesigner.Name = "pnldesigner" ' - 'VWPM_PROFILE_USERTableAdapter - ' - Me.VWPM_PROFILE_USERTableAdapter.ClearBeforeFill = True - ' 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False @@ -900,7 +886,6 @@ Partial Class frmValidator Me.StatusStrip1.PerformLayout() Me.Panel1.ResumeLayout(False) Me.ContextMenuStrip1.ResumeLayout(False) - CType(Me.VWPM_PROFILE_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() @@ -952,8 +937,6 @@ Partial Class frmValidator Friend WithEvents txtDateipfad As System.Windows.Forms.TextBox Friend WithEvents pnldesigner As System.Windows.Forms.Panel Friend WithEvents DD_DMSLiteDataSet As DD_PM_WINDREAM.DD_DMSLiteDataSet - Friend WithEvents VWPM_PROFILE_USERBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents VWPM_PROFILE_USERTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_PROFILE_USERTableAdapter Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents VWPM_CONTROL_INDEXBindingSource As System.Windows.Forms.BindingSource Friend WithEvents VWPM_CONTROL_INDEXTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_CONTROL_INDEXTableAdapter diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index d5c3f7c..2fcc2b8 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -184,7 +184,7 @@ 3 - 533, 212 + 790, 212 175, 22 @@ -210,12 +210,6 @@ Top, Left, Right - - 887, 17 - - - 725, 17 - Segoe UI Symbol, 12pt, style=Bold @@ -525,29 +519,29 @@ 0 - - 17, 56 + + 725, 17 - 263, 56 + 17, 56 17, 134 - 278, 212 + 535, 212 17, 95 - 1003, 173 + 17, 212 604, 95 - 501, 134 + 500, 134 17, 173 @@ -556,13 +550,13 @@ 534, 173 - 436, 56 + 190, 56 - 704, 56 + 458, 56 - 966, 56 + 720, 56 325, 95 @@ -571,10 +565,10 @@ 877, 95 - 256, 134 + 255, 134 - 741, 134 + 740, 134 322, 173 @@ -583,7 +577,7 @@ 740, 173 - 17, 212 + 274, 212 Top, Right @@ -595,7 +589,7 @@ 0, 141 - 955, 212 + 17, 251 Top @@ -694,7 +688,7 @@ 962, 643 - 134, 251 + 407, 251 Segoe UI, 9.75pt @@ -796,7 +790,7 @@ 0 - 17, 251 + 290, 251 120, 17 @@ -1502,24 +1496,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - VWPM_PROFILE_USERBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - DD_DMSLiteDataSet DD_PM_WINDREAM.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - VWPM_PROFILE_USERTableAdapter - - - DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_PROFILE_USERTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - TableAdapterManager @@ -2010,7 +1992,7 @@ 0 - 690, 212 + 947, 212 Segoe UI Semibold, 9pt, style=Bold, Italic @@ -2100,9 +2082,9 @@ 1 - 807, 212 + 1064, 212 - 1080, 212 + 142, 251 \ No newline at end of file