diff --git a/app/DD_PM_WINDREAM/App.config b/app/DD_PM_WINDREAM/App.config index bf84d37..b19b3c9 100644 --- a/app/DD_PM_WINDREAM/App.config +++ b/app/DD_PM_WINDREAM/App.config @@ -6,7 +6,8 @@ - + @@ -46,6 +47,12 @@ 0, 0 + + 0, 0 + + + 0, 0 + diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 0c3edd9..f0ef7a0 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -5,9 +5,11 @@ Imports DLLLicenseManager Public Class ClassInit Public _lizenzManager As ClassLicenseManager + Public Sub New() End Sub + Public Sub InitLogger() ClassLogger.Init("", Environment.UserName) ClassLogger.Add("## ProcessManager für Windream gestartet - " & Now, False) @@ -18,9 +20,11 @@ Public Class ClassInit End If 'Throw New Exception("Dummy Fehler!") End Sub + Public Sub InitUserConfig() Settings_Load() End Sub + Public Function InitDatabase() Dim dbResult As Boolean @@ -53,6 +57,7 @@ Public Class ClassInit ' Return False ' End Try 'End Function + Sub Refresh_Licence() Try Me._lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "") @@ -79,6 +84,7 @@ Public Class ClassInit MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Fehler bei Licensemanager:") End Try End Sub + Public Sub InitUserLogin() Try USER_USERNAME = Environment.UserName @@ -102,6 +108,7 @@ Public Class ClassInit End Try ClassLogger.Add(">> Username: " & USER_USERNAME, False) + Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", Environment.UserName, CLIENT_SELECTED) @@ -166,6 +173,7 @@ Public Class ClassInit End Try End Sub + Public Shared Sub InitBasics() Try Dim sql = String.Format("select * from TBPM_KONFIGURATION WHERE GUID = 1") @@ -179,6 +187,7 @@ Public Class ClassInit ERROR_STATE = "Basics not initialized" End Try End Sub + Private Shared Function Settings_LoadBasicConfig() Try Dim sql As String = "select * from tbdd_Modules where SHORT_NAME = 'PM'" @@ -204,61 +213,5 @@ Public Class ClassInit End Try Return True End Function - Private Function Check_User_Exists_in_Group(ByVal Groupname As String) - Try - Dim sel = String.Format("select T1.* from TBDD_GROUPS T, TBDD_GROUPS_USER T1 WHERE T.GUID = T1.GROUP_ID AND T1.USER_ID = {0} AND UPPER(T.NAME) = '{1}'", USER_ID, Groupname) - Dim DT As DataTable = ClassDatabase.Return_Datatable(sel) - If Not IsNothing(DT) Then - If DT.Rows.Count = 1 Then - Return True - Else - Return False - End If - Else - Return False - End If - Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in CheckUserExistsinGroup:") - Return False - End Try - End Function - 'Private Function Check_User_Exists_in_PMGroups() - ' Try - ' Dim sel = String.Format("select T1.* from TBDD_GROUPS T, TBDD_GROUPS_USER T1 WHERE T.GUID = T1.GROUP_ID AND T1.USER_ID = {0} AND UPPER(T.NAME) = 'PM_USER'", USER_ID) - ' Dim DT As DataTable = ClassDatabase.Return_Datatable(sel) - ' If Not IsNothing(DT) Then - ' If DT.Rows.Count = 1 Then - ' If LogErrorsOnly = False Then ClassLogger.Add(" >> User is in PM_USER-Group....", False) - ' USER_IN_MODULE = True - ' Else - ' If LogErrorsOnly = False Then ClassLogger.Add(" >> User is NOT in PM_USER-Group...." & sel, False) - ' sel = String.Format("select T.* from TBDD_USER_MODULES T WHERE T.USER_ID = {0} AND T.MODULE_ID = 3", USER_ID) - ' DT = ClassDatabase.Return_Datatable(sel) - ' If Not IsNothing(DT) Then - ' If DT.Rows.Count = 1 Then - ' If LogErrorsOnly = False Then ClassLogger.Add(" >> Singe User-relation defined for user....", False) - ' USER_IN_MODULE = True - ' USER_IS_ADMIN = DT.Rows(0).Item("IS_ADMIN") - ' USER_RIGHT_FILE_DELETE = DT.Rows(0).Item("RIGHT1") - ' End If - ' End If - ' End If - ' End If - ' sel = String.Format("select T1.* from TBDD_GROUPS T, TBDD_GROUPS_USER T1 WHERE T.GUID = T1.GROUP_ID AND T1.USER_ID = {0} AND UPPER(T.NAME) = 'PM_ADMINS'", USER_ID) - ' DT = ClassDatabase.Return_Datatable(sel) - ' If Not IsNothing(DT) Then - ' If DT.Rows.Count = 1 Then - ' If LogErrorsOnly = False Then ClassLogger.Add(" >> User is in PM_ADMINS-Group....", False) - ' USER_IS_ADMIN = True - ' USER_IN_MODULE = True - ' Else - ' If LogErrorsOnly = False Then ClassLogger.Add(" >> User is NOT in PM_ADMINS-Group...." & sel, False) - ' End If - ' End If - - ' Catch ex As Exception - ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Check_User_Exists_in_PMGroups:") - ' End Try - 'End Function End Class diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index bd51b96..09d4311 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -311,6 +311,12 @@ Form + + frmValidatorSearch.vb + + + Form + @@ -402,6 +408,9 @@ frmValidator.vb Designer + + frmValidatorSearch.vb + VbMyResourcesResXFileCodeGenerator diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index d91655a..e274d94 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -62,6 +62,8 @@ Module ModuleRuntimeVariables Public CURRENT_DT_FINAL_INDEXING As DataTable Public CURRENT_DT_PROFILE As DataTable + Public CURRENT_DT_PROFILE_SEARCHES_RT As DataTable + Public CURRENT_INDEX_ARRAY(100, 250) As String Public CURRENT_DT_VW_PROFILE_USER As DataTable Public CURRENT_CONTROL_ID As Integer diff --git a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb index e404cf5..90cf50c 100644 --- a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb +++ b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb @@ -204,6 +204,30 @@ Namespace My Me("frmMassValidatorposition") = value End Set End Property + + _ + Public Property frmValidatorSearchSize() As Global.System.Drawing.Size + Get + Return CType(Me("frmValidatorSearchSize"),Global.System.Drawing.Size) + End Get + Set + Me("frmValidatorSearchSize") = value + End Set + End Property + + _ + Public Property frmValidatorSearchPosition() As Global.System.Drawing.Point + Get + Return CType(Me("frmValidatorSearchPosition"),Global.System.Drawing.Point) + End Get + Set + Me("frmValidatorSearchPosition") = value + End Set + End Property End Class End Namespace diff --git a/app/DD_PM_WINDREAM/My Project/Settings.settings b/app/DD_PM_WINDREAM/My Project/Settings.settings index a31be12..4cb429d 100644 --- a/app/DD_PM_WINDREAM/My Project/Settings.settings +++ b/app/DD_PM_WINDREAM/My Project/Settings.settings @@ -43,5 +43,11 @@ 0, 0 + + 0, 0 + + + 0, 0 + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 5d568ba..d15336c 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -155,6 +155,9 @@ Public Class frmMain End Try If LogErrorsOnly = False Then ClassLogger.Add(" >> MainForm initialized!", False) + + MsgBox(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData)) + End If End Sub @@ -241,20 +244,22 @@ Public Class frmMain GridView_Docs.Columns.Clear() GridView_Docs.PopulateColumns() + If GridView_Docs.Columns.Count > 0 Then + GridView_Docs.Columns.Item("PROFILE_ID").Visible = False + GridView_Docs.Columns.Item("GUID").Visible = False + GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False + GridView_Docs.Columns.Item("DOC_ID").Visible = False + GridView_Docs.Columns.Item("TL_STATE").Visible = False + GridView_Docs.Columns.Item("ICON").MaxWidth = 24 + GridView_Docs.Columns.Item("ICON").MinWidth = 24 + GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White + GridView_Docs.Columns.Item("ICON").Fixed = FixedStyle.Left + GridView_Docs.Columns("Last edited").DisplayFormat.FormatType = FormatType.DateTime + GridView_Docs.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + GridView_Docs.Columns.Item("PROFILE_GROUP_TEXT").Visible = False + GridView_Docs.Columns.Item("PROFILE_GROUP_COLOR").Visible = False + End If - GridView_Docs.Columns.Item("PROFILE_ID").Visible = False - GridView_Docs.Columns.Item("GUID").Visible = False - GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False - GridView_Docs.Columns.Item("DOC_ID").Visible = False - GridView_Docs.Columns.Item("TL_STATE").Visible = False - GridView_Docs.Columns.Item("ICON").MaxWidth = 24 - GridView_Docs.Columns.Item("ICON").MinWidth = 24 - GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White - GridView_Docs.Columns.Item("ICON").Fixed = FixedStyle.Left - GridView_Docs.Columns("Last edited").DisplayFormat.FormatType = FormatType.DateTime - GridView_Docs.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" - GridView_Docs.Columns.Item("PROFILE_GROUP_TEXT").Visible = False - GridView_Docs.Columns.Item("PROFILE_GROUP_COLOR").Visible = False Catch ex As Exception ClassLogger.Add("Error while resetting layout: " & ex.Message) End Try @@ -611,6 +616,7 @@ Public Class frmMain GridView_Docs.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" GridView_Docs.Columns.Item("PROFILE_GROUP_TEXT").Visible = False GridView_Docs.Columns.Item("PROFILE_GROUP_COLOR").Visible = False + End Sub Private Function GridView_CheckInvalidColumns() As Boolean Dim Columns_Removed = False @@ -695,6 +701,10 @@ Public Class frmMain Dim Columns_Removed = GridView_CheckInvalidColumns() RestoreLayout() + If GridView_Docs.Columns.Count <= 2 Then + ClassLogger.Add("GridView_Docs.Columns.Count <= 2 - Reset_Gridlayout will be forced...", False) + Reset_GridLayout() + End If Else GridControl_Docs.DataSource = Nothing @@ -813,8 +823,9 @@ Public Class frmMain CURRENT_ProfilGUID = ID CURRENT_ProfilName = ClassDatabase.Execute_Scalar("SELECT NAME FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID, MyConnectionString) CURRENT_DT_PROFILE = ClassDatabase.Return_Datatable(String.Format("select * from TBPM_PROFILE where GUID = {0}", CURRENT_ProfilGUID)) - + CURRENT_DT_PROFILE_SEARCHES_RT = ClassDatabase.Return_Datatable(String.Format("select * from TBPM_PROFILE_SEARCH where PROFILE_ID = {0} AND ACTIVE = 1", CURRENT_ProfilGUID)) My.Settings.Save() + If TimerRefresh.Enabled Then TimerRefresh.Stop() End If @@ -1058,9 +1069,8 @@ Public Class frmMain If CURRENT_DT_VW_PROFILE_USER.Rows.Count = 0 Then ClassLogger.Add(" >> no profiles for user: '" & Environment.UserName & "' configured!", False) - + NO_WORKFLOWITEMS = True tslblmessage.Text = "Keine Profile für Ihren User hinterlegt" - Cursor = Cursors.Default Exit Sub End If @@ -1203,6 +1213,11 @@ Public Class frmMain 'GridView_Docs.SaveLayoutToXml(GetXML_LayoutName()) SaveGridLayout() + If GridView_Docs.Columns.Count <= 2 Then + ClassLogger.Add("GridView_Docs.Columns.Count <= 2 - Reset_Gridlayout will be forced...", False) + Reset_GridLayout() + End If + Else GridControl_Docs.Visible = False pnlNavigator.Visible = False @@ -1242,6 +1257,10 @@ Public Class frmMain End Sub Private Sub TabellenlayoutZurücksetzenToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles TabellenlayoutZurücksetzenToolStripMenuItem.Click + Reset_GridLayout + + End Sub + Sub Reset_GridLayout() ' Layout zurücksetzen ResetLayout() SaveGridLayout() @@ -1252,7 +1271,6 @@ Public Class frmMain End Sub - Private Sub GridView1_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Try Dim info As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo) diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index 5a04b01..9b64c2c 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -133,6 +133,7 @@ Partial Class frmValidator Me.ToolStripButtonJumpFile = New System.Windows.Forms.ToolStripButton() Me.ToolStripButtonDeleteFile = New System.Windows.Forms.ToolStripButton() Me.ToolStripButtonAnnotation = New System.Windows.Forms.ToolStripButton() + Me.RefreshAdditionalSearchToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.BarAndDockingController3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarAndDockingController2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarAndDockingController1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -168,20 +169,17 @@ Partial Class frmValidator 'BarAndDockingController3 ' Me.BarAndDockingController3.PropertiesBar.AllowLinkLighting = False - Me.BarAndDockingController3.PropertiesBar.DefaultGlyphSize = New System.Drawing.Size(16, 16) - Me.BarAndDockingController3.PropertiesBar.DefaultLargeGlyphSize = New System.Drawing.Size(32, 32) + Me.BarAndDockingController3.PropertiesDocking.ViewStyle = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Classic ' 'BarAndDockingController2 ' Me.BarAndDockingController2.PropertiesBar.AllowLinkLighting = False - Me.BarAndDockingController2.PropertiesBar.DefaultGlyphSize = New System.Drawing.Size(16, 16) - Me.BarAndDockingController2.PropertiesBar.DefaultLargeGlyphSize = New System.Drawing.Size(32, 32) + Me.BarAndDockingController2.PropertiesDocking.ViewStyle = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Classic ' 'BarAndDockingController1 ' Me.BarAndDockingController1.PropertiesBar.AllowLinkLighting = False - Me.BarAndDockingController1.PropertiesBar.DefaultGlyphSize = New System.Drawing.Size(16, 16) - Me.BarAndDockingController1.PropertiesBar.DefaultLargeGlyphSize = New System.Drawing.Size(32, 32) + Me.BarAndDockingController1.PropertiesDocking.ViewStyle = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Classic ' 'StatusStrip1 ' @@ -218,7 +216,7 @@ Partial Class frmValidator ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.DateiInfoToolStripMenuItem, Me.DateieigenschaftenToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.DateiInfoToolStripMenuItem, Me.DateieigenschaftenToolStripMenuItem, Me.RefreshAdditionalSearchToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") ' @@ -395,21 +393,25 @@ Partial Class frmValidator ' Me.barDockControlTop.CausesValidation = False resources.ApplyResources(Me.barDockControlTop, "barDockControlTop") + Me.barDockControlTop.Manager = Me.BarManager1 ' 'barDockControlBottom ' Me.barDockControlBottom.CausesValidation = False resources.ApplyResources(Me.barDockControlBottom, "barDockControlBottom") + Me.barDockControlBottom.Manager = Me.BarManager1 ' 'barDockControlLeft ' Me.barDockControlLeft.CausesValidation = False resources.ApplyResources(Me.barDockControlLeft, "barDockControlLeft") + Me.barDockControlLeft.Manager = Me.BarManager1 ' 'barDockControlRight ' Me.barDockControlRight.CausesValidation = False resources.ApplyResources(Me.barDockControlRight, "barDockControlRight") + Me.barDockControlRight.Manager = Me.BarManager1 ' 'PdfFileOpenBarItem1 ' @@ -828,6 +830,11 @@ Partial Class frmValidator resources.ApplyResources(Me.ToolStripButtonAnnotation, "ToolStripButtonAnnotation") Me.ToolStripButtonAnnotation.Name = "ToolStripButtonAnnotation" ' + 'RefreshAdditionalSearchToolStripMenuItem + ' + Me.RefreshAdditionalSearchToolStripMenuItem.Name = "RefreshAdditionalSearchToolStripMenuItem" + resources.ApplyResources(Me.RefreshAdditionalSearchToolStripMenuItem, "RefreshAdditionalSearchToolStripMenuItem") + ' 'frmValidator ' resources.ApplyResources(Me, "$this") @@ -991,4 +998,5 @@ Partial Class frmValidator Friend WithEvents ToolStripButtonDeleteFile As ToolStripButton Friend WithEvents ToolStripButtonAnnotation As ToolStripButton Friend WithEvents DateiInfoToolStripMenuItem As ToolStripMenuItem + Friend WithEvents RefreshAdditionalSearchToolStripMenuItem As ToolStripMenuItem End Class diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index c53ee91..00f8c0a 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -130,6 +130,31 @@ 608, 17 + + Segoe UI, 9pt, style=Bold + + + 22, 17 + + + sss + + + + False + + + 89, 17 + + + Anzahl Dateien: + + + 82, 17 + + + Document-ID: + 0, 621 @@ -140,7 +165,6 @@ 962, 22 - 4 @@ -159,41 +183,17 @@ 3 - - Segoe UI, 9pt, style=Bold - - - 22, 17 - - - sss - - - False - - - 89, 17 - - - Anzahl Dateien: - - - 82, 17 - - - Document-ID: - - 790, 212 + 790, 173 - 175, 22 + 206, 22 Datei öffnen - 180, 22 + 206, 22 Datei-Info @@ -209,13 +209,19 @@ - 175, 22 + 206, 22 Dateieigenschaften + + 206, 22 + + + Refresh AdditionalSearch + - 181, 92 + 207, 114 ContextMenuStrip1 @@ -383,61 +389,61 @@ 725, 17 - 17, 56 + 887, 17 - 17, 134 + 534, 95 - 535, 212 + 535, 173 - 17, 95 + 593, 56 - 17, 212 - - - 604, 95 - - - 500, 134 - - 17, 173 + + 17, 95 + + + 1017, 95 + + + 327, 134 + - 534, 173 + 844, 134 - 190, 56 + 1060, 17 - 458, 56 + 17, 56 - 720, 56 + 279, 56 - 325, 95 + 901, 56 - 877, 95 + 290, 95 - 255, 134 + 772, 95 - 740, 134 + 17, 134 - 322, 173 + 632, 134 - 740, 173 + 1050, 134 - 274, 212 + 274, 173 Top, Right @@ -449,7 +455,7 @@ 0, 141 - 17, 251 + 1212, 173 Top @@ -464,7 +470,7 @@ barDockControlTop - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -485,7 +491,7 @@ barDockControlBottom - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -506,7 +512,7 @@ barDockControlLeft - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -527,7 +533,7 @@ barDockControlRight - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -548,11 +554,38 @@ 962, 643 - 407, 251 + 282, 212 Segoe UI, 9.75pt + + Magenta + + + 165, 22 + + + Datei überspringen (F4) + + + Magenta + + + 106, 22 + + + Datei löschen + + + Magenta + + + 105, 22 + + + Annotationen + 0, 0 @@ -595,9 +628,21 @@ 0 - - 290, 251 - + + Fill + + + 3, 21 + + + 20, 20 + + + 194, 54 + + + 2 + WebBrowser @@ -610,6 +655,27 @@ 0 + + 165, 212 + + + 120, 17 + + + ToolStripStatusLabel1 + + + 3, 75 + + + 194, 22 + + + 0 + + + StatusStrip3 + StatusStrip3 @@ -646,6 +712,21 @@ 0 + + Fill + + + Segoe UI, 9.75pt, style=Italic + + + 3, 21 + + + 194, 25 + + + 0 + txtBetreff @@ -1237,19 +1318,19 @@ BarAndDockingController3 - DevExpress.XtraBars.BarAndDockingController, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarAndDockingController, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarAndDockingController2 - DevExpress.XtraBars.BarAndDockingController, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarAndDockingController, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarAndDockingController1 - DevExpress.XtraBars.BarAndDockingController, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarAndDockingController, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a tstrplblError @@ -1411,151 +1492,151 @@ BarManager1 - DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfFileOpenBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfFileSaveAsBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfFileSaveAsBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFileSaveAsBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfFilePrintBarItem2 - DevExpress.XtraPdfViewer.Bars.PdfFilePrintBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFilePrintBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfPreviousPageBarItem2 - DevExpress.XtraPdfViewer.Bars.PdfPreviousPageBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfPreviousPageBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfNextPageBarItem2 - DevExpress.XtraPdfViewer.Bars.PdfNextPageBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfNextPageBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfFindTextBarItem2 - DevExpress.XtraPdfViewer.Bars.PdfFindTextBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFindTextBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoomOutBarItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoomOutBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoomOutBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoomInBarItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoomInBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoomInBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfExactZoomListBarSubItem2 - DevExpress.XtraPdfViewer.Bars.PdfExactZoomListBarSubItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfExactZoomListBarSubItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom10CheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoom10CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom10CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom25CheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoom25CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom25CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom50CheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoom50CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom50CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom75CheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoom75CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom75CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom100CheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoom100CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom100CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom125CheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoom125CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom125CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom150CheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoom150CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom150CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom200CheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoom200CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom200CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom400CheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoom400CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom400CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom500CheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfZoom500CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom500CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetActualSizeZoomModeCheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfSetActualSizeZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetActualSizeZoomModeCheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetPageLevelZoomModeCheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfSetPageLevelZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetPageLevelZoomModeCheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetFitWidthZoomModeCheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetFitVisibleZoomModeCheckItem2 - DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem1 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pdfstatuslblPageNumber @@ -1573,163 +1654,163 @@ PdfFilePrintBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfFilePrintBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFilePrintBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfPreviousPageBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfPreviousPageBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfPreviousPageBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfNextPageBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfNextPageBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfNextPageBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfFindTextBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfFindTextBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFindTextBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoomOutBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoomOutBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoomOutBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoomInBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoomInBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoomInBarItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfExactZoomListBarSubItem1 - DevExpress.XtraPdfViewer.Bars.PdfExactZoomListBarSubItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfExactZoomListBarSubItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom10CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom10CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom10CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom25CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom25CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom25CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom50CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom50CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom50CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom75CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom75CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom75CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom100CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom100CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom100CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom125CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom125CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom125CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom150CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom150CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom150CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom200CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom200CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom200CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom400CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom400CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom400CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom500CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom500CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom500CheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetActualSizeZoomModeCheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfSetActualSizeZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetActualSizeZoomModeCheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetPageLevelZoomModeCheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfSetPageLevelZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetPageLevelZoomModeCheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetFitWidthZoomModeCheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetFitVisibleZoomModeCheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfRibbonPage1 - DevExpress.XtraPdfViewer.Bars.PdfRibbonPage, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfRibbonPage, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfFileRibbonPageGroup1 - DevExpress.XtraPdfViewer.Bars.PdfFileRibbonPageGroup, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFileRibbonPageGroup, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfNavigationRibbonPageGroup1 - DevExpress.XtraPdfViewer.Bars.PdfNavigationRibbonPageGroup, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfNavigationRibbonPageGroup, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoomRibbonPageGroup1 - DevExpress.XtraPdfViewer.Bars.PdfZoomRibbonPageGroup, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoomRibbonPageGroup, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfBarController1 - DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfBarController2 - DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a tslblWebbrowser @@ -1755,6 +1836,12 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + RefreshAdditionalSearchToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmValidator @@ -1774,7 +1861,7 @@ PdfViewer1 - DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlpdf @@ -1783,8 +1870,26 @@ 0 - 947, 212 + 947, 173 + + Segoe UI Semibold, 9pt, style=Bold, Italic + + + 139, 16 + + + ToolStripStatusLabel1 + + + Magenta + + + 153, 20 + + + Seitenansicht Minimal + 0, 340 @@ -1819,7 +1924,7 @@ RibbonControl1 - DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlpdf @@ -1854,142 +1959,10 @@ 1 - - Segoe UI Semibold, 9pt, style=Bold, Italic - - - 139, 16 - - - ToolStripStatusLabel1 - - - Magenta - - - 153, 20 - - - Seitenansicht Minimal - - 1064, 212 + 1064, 173 - 142, 251 + 17, 212 - - Fill - - - 3, 21 - - - 20, 20 - - - 194, 54 - - - 2 - - - WebBrowser - - - System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxMailBody - - - 0 - - - 290, 251 - - - 3, 75 - - - 194, 22 - - - 0 - - - StatusStrip3 - - - StatusStrip3 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxMailBody - - - 1 - - - 120, 17 - - - ToolStripStatusLabel1 - - - Fill - - - Segoe UI, 9.75pt, style=Italic - - - 3, 21 - - - 194, 25 - - - 0 - - - txtBetreff - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpBetreff - - - 0 - - - Magenta - - - 165, 22 - - - Datei überspringen (F4) - - - Magenta - - - 106, 22 - - - Datei löschen - - - Magenta - - - 105, 22 - - - Annotationen - \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 8dafae9..592ed7d 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -52,6 +52,11 @@ Public Class frmValidator Dim viewer_string As String Dim pdfxchange As Boolean = False Dim sumatra As Boolean = False + + Private _CURRENT_INDEX_ARRAY(100, 250) As String + + + Private _ValidatorSearch As frmValidatorSearch 'You need a reference to Form1 Private _dependingControl_in_action As Boolean = False @@ -290,6 +295,8 @@ Public Class frmValidator sumatra = False RibbonControl1.Minimized = True + + If My.Settings.frmValidatorPosition.IsEmpty = False Then If My.Settings.frmValidatorPosition.X > 0 And My.Settings.frmValidatorPosition.Y > 0 Then Location = My.Settings.frmValidatorPosition @@ -404,6 +411,15 @@ Public Class frmValidator End If End If + If Not IsNothing(CURRENT_DT_PROFILE_SEARCHES_RT) Then + If CURRENT_DT_PROFILE_SEARCHES_RT.Rows.Count > 0 Then + For Each _searchRow As DataRow In CURRENT_DT_PROFILE_SEARCHES_RT.Rows + + Next + End If + + End If + Catch ex As Exception MsgBox("Error LOADING Profile-Data1:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") @@ -447,6 +463,7 @@ Public Class frmValidator MsgBox($"SQL-Query for control {control.Name} is invalid.") Exit Sub End If + Dim oValue If TypeOf control Is TextBox Then Try @@ -454,6 +471,7 @@ Public Class frmValidator Dim value = firstRow.Item(0) control.Text = value + oValue = value Catch ex As Exception clsLogger.Add("Error in LoadSimpleData for TextBox: " & ex.Message) End Try @@ -594,15 +612,15 @@ Public Class frmValidator 'Dim dt As DataTable = DD_DMSLiteDataSet.VWPM_CONTROL_INDEX TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_ProfilGUID) - Dim dt As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS - - For Each dr As DataRow In dt.Rows + Dim oCount As Integer = 0 + Dim oDTProfileControl As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS + For Each oControlRow As DataRow In oDTProfileControl.Rows Dim ctrl As Control - Select Case dr.Item("CTRL_TYPE").ToString.ToUpper + Select Case oControlRow.Item("CTRL_TYPE").ToString.ToUpper Case "TXT" If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch TXT zu laden", False) - Dim txt As TextBox = ClassControlCreator.CreateExistingTextbox(dr, False) + Dim txt As TextBox = ClassControlCreator.CreateExistingTextbox(oControlRow, False) If LogErrorsOnly = False Then ClassLogger.Add(" >> TXT wurde geladen", False) AddHandler txt.GotFocus, AddressOf OnTextBoxFocus @@ -612,11 +630,11 @@ Public Class frmValidator ctrl = txt Case "LBL" If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch LBL zu laden", False) - ctrl = ClassControlCreator.CreateExistingLabel(dr, False) + ctrl = ClassControlCreator.CreateExistingLabel(oControlRow, False) Case "CMB" If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch CMB zu laden", False) - Dim cmb = ClassControlCreator.CreateExistingCombobox(dr, False) + Dim cmb = ClassControlCreator.CreateExistingCombobox(oControlRow, False) AddHandler cmb.SelectedValueChanged, AddressOf OnCmbselectedIndex @@ -749,12 +767,12 @@ Public Class frmValidator 'add_ComboBox(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), Case "DTP" If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch DTP zu laden", False) - ctrl = ClassControlCreator.CreateExistingDatepicker(dr, False) + ctrl = ClassControlCreator.CreateExistingDatepicker(oControlRow, False) 'add_DTP(dr.Item("GUID"), dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), Case "DGV" If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch DGV zu laden", False) - Dim dgv = ClassControlCreator.CreateExistingDataGridView(dr, False) + Dim dgv = ClassControlCreator.CreateExistingDataGridView(oControlRow, False) AddHandler dgv.RowValidating, AddressOf onDGVRowValidating @@ -762,14 +780,14 @@ Public Class frmValidator Case "LOOKUP" If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch LOOKUP zu laden", False) - Dim lookup As LookupControl = ClassControlCreator.CreateExistingLookupControl(dr, False) + Dim lookup As LookupControl = ClassControlCreator.CreateExistingLookupControl(oControlRow, False) - lookup.PreventDuplicates = dr.Item("VKT_PREVENT_MULTIPLE_VALUES") - lookup.AllowAddNewValues = dr.Item("VKT_ADD_ITEM") - lookup.MultiSelect = dr.Item("MULTISELECT") + lookup.PreventDuplicates = oControlRow.Item("VKT_PREVENT_MULTIPLE_VALUES") + lookup.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM") + lookup.MultiSelect = oControlRow.Item("MULTISELECT") - If NotNull(dr.Item("DEFAULT_VALUE"), "") <> "" Then - lookup.SelectedValues = New List(Of String) From {dr.Item("DEFAULT_VALUE")} + If NotNull(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then + lookup.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")} End If ctrl = lookup @@ -778,21 +796,21 @@ Public Class frmValidator Case "CHK" If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch Checkbox zu laden", False) - ctrl = ClassControlCreator.CreateExisingCheckbox(dr, False) + ctrl = ClassControlCreator.CreateExisingCheckbox(oControlRow, False) 'add_Checkbox(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) Case "TABLE" If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch Tabelle zu laden", False) Dim columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow) = (From r As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In DD_DMSLiteDataSet.TBPM_CONTROL_TABLE - Where r.CONTROL_ID = dr.Item("GUID") + Where r.CONTROL_ID = oControlRow.Item("GUID") Select r).ToList() - ctrl = ClassControlCreator.CreateExistingTable(dr, columns, False) + ctrl = ClassControlCreator.CreateExistingTable(oControlRow, columns, False) 'add_TABLE(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("WIDTH"), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY")) Case "LINE" If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch Linie zu laden", False) - ctrl = ClassControlCreator.CreateExistingLine(dr, False) + ctrl = ClassControlCreator.CreateExistingLine(oControlRow, False) End Select If TypeOf ctrl IsNot Label Then @@ -804,7 +822,7 @@ Public Class frmValidator pnldesigner.Controls.Add(ctrl) - LoadSimpleData(ctrl, dr.Item("GUID")) + LoadSimpleData(ctrl, oControlRow.Item("GUID")) Next If LogErrorsOnly = False Then ClassLogger.Add(" >> Controls geladen", False) ClassLogger.Add("", False) @@ -1854,59 +1872,67 @@ Public Class frmValidator Dim resultvalue Try If DD_DMSLiteDataSet.VWPM_CONTROL_INDEX.Rows.Count > 0 Then - For Each inctrl As Control In Me.pnldesigner.Controls - Dim CONTROL_ID = inctrl.Tag + Dim oCount As Integer = 0 + For Each oControl As Control In Me.pnldesigner.Controls + Dim CONTROL_ID = oControl.Tag Dim controlRow = (From form In DD_DMSLiteDataSet.VWPM_CONTROL_INDEX.AsEnumerable() Select form Where form.Item("GUID") = CONTROL_ID).Single() - Dim Type As String = inctrl.GetType.ToString + Dim Type As String = oControl.GetType.ToString Dim Typ As String = controlRow.Item("CTRL_TYPE") - Dim idxname As String = controlRow.Item("INDEX_NAME") + Dim oWMIndexName As String = controlRow.Item("INDEX_NAME") ' Wenn kein defaultValue existiert, leeren String setzen Dim defaultValue As String = NotNull(controlRow.Item("DEFAULT_VALUE"), String.Empty) - indexname = idxname - Dim LoadIDX As Boolean = controlRow.Item("LOAD_IDX_VALUE") - If LogErrorsOnly = False Then ClassLogger.Add(" >> INDEX: " & idxname & " - CONTROLNAME: " & inctrl.Name & " - LOAD IDXVALUES: " & LoadIDX.ToString, False) + indexname = oWMIndexName + Dim LoadIDX As Boolean = controlRow.Item("LOAD_IDX_VALUE") + If LogErrorsOnly = False Then ClassLogger.Add(" >> INDEX: " & oWMIndexName & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & LoadIDX.ToString, False) + + _CURRENT_INDEX_ARRAY(oCount, 0) = oWMIndexName Select Case Type Case "System.Windows.Forms.TextBox" Try controltype = "Textbox" - If idxname = "" Then - MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & inctrl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + If oWMIndexName = "" Then + MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) Exit For End If - If idxname Is Nothing = False Then - If LoadIDX = False Or idxname = "DD PM-ONLY FOR DISPLAY" Then + If oWMIndexName Is Nothing = False Then + If LoadIDX = False Or oWMIndexName = "DD PM-ONLY FOR DISPLAY" Then ' Wenn kein Index exisitiert, defaultValue laden - inctrl.Text = defaultValue + oControl.Text = defaultValue + _CURRENT_INDEX_ARRAY(oCount, 1) = defaultValue If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexwert soll nicht geladen werden.", False) Exit Select End If Dim wertWD - If idxname.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - wertWD = ReturnVektor_IndexValue(idxname) + If oWMIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then + wertWD = ReturnVektor_IndexValue(oWMIndexName) Else - wertWD = aktivesDokument.GetVariableValue(idxname) + wertWD = aktivesDokument.GetVariableValue(oWMIndexName) If wertWD Is Nothing Then wertWD = "" Else If wertWD.ToString = "System.Object[]" Then - If LogErrorsOnly = False Then ClassLogger.Add(" >> TextBox with VektorField: " & idxname, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> TextBox with VektorField: " & oWMIndexName, False) If wertWD.length = 1 Then wertWD = wertWD(0) + _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD(0) Else ' - ClassLogger.Add(" >> Vectorfield " & idxname & "' contains more then one value - First value will be used", False) + ClassLogger.Add(" >> Vectorfield " & oWMIndexName & "' contains more then one value - First value will be used", False) wertWD = wertWD(0) + _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD(0) End If End If End If End If - inctrl.Text = NotNull(wertWD, defaultValue) + oControl.Text = NotNull(wertWD, defaultValue) + _CURRENT_INDEX_ARRAY(oCount, 1) = NotNull(wertWD, defaultValue) + End If Catch ex As Exception errormessage = "Unvorhergesehener Fehler bei FillIndexValues TextBox:" & vbNewLine & ex.Message & vbNewLine & "Check Logfile" @@ -1920,47 +1946,49 @@ Public Class frmValidator Case "System.Windows.Forms.ComboBox" controltype = "ComboBox" - Dim cmb As ComboBox = inctrl + Dim cmb As ComboBox = oControl Try - If idxname = "" Then - MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & inctrl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + If oWMIndexName = "" Then + MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) Exit For End If - If idxname Is Nothing = False Then - If LoadIDX = False Or idxname = "DD PM-ONLY FOR DISPLAY" Then + If oWMIndexName Is Nothing = False Then + If LoadIDX = False Or oWMIndexName = "DD PM-ONLY FOR DISPLAY" Then If defaultValue = String.Empty Then cmb.SelectedIndex = -1 Else cmb.Text = defaultValue + _CURRENT_INDEX_ARRAY(oCount, 1) = defaultValue End If If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexwert soll nicht geladen werden.", False) Exit Select End If Dim wertWD - If idxname.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - wertWD = ReturnVektor_IndexValue(idxname) + If oWMIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then + wertWD = ReturnVektor_IndexValue(oWMIndexName) Else - wertWD = aktivesDokument.GetVariableValue(idxname) + wertWD = aktivesDokument.GetVariableValue(oWMIndexName) End If If wertWD Is Nothing Then - If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert aus index {idxname}: Nothing", False) + If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert aus index {oWMIndexName}: Nothing", False) If defaultValue = String.Empty Then If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert-defaultValue wurde nicht gefunden", False) cmb.SelectedIndex = -1 Else If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert-defaultValue wird geladen", False) cmb.Text = defaultValue + _CURRENT_INDEX_ARRAY(oCount, 1) = defaultValue 'cmb.SelectedIndex = cmb.FindStringExact(defaultValue) End If Else - If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert aus index {idxname}: {wertWD}", False) + If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert aus index {oWMIndexName}: {wertWD}", False) If LogErrorsOnly = False Then ClassLogger.Add($" >> Items in Combobox: {cmb.Items.Count}", False) If LogErrorsOnly = False Then ClassLogger.Add($" >> Index Wert wurde gesetzt", False) cmb.Text = wertWD - + _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD 'If cmb.Items.Count = 0 Then ' If LogErrorsOnly = False Then ClassLogger.Add($" >> Index Wert wurde gesetzt", False) ' cmb.Text = wertWD @@ -1982,18 +2010,18 @@ Public Class frmValidator Case "System.Windows.Forms.DataGridView" controltype = "DataGridView" - Dim dgv As DataGridView = inctrl - If idxname = "" Then - MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & inctrl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + Dim dgv As DataGridView = oControl + If oWMIndexName = "" Then + MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) Exit For End If - If idxname Is Nothing = False Then + If oWMIndexName Is Nothing = False Then If LoadIDX = False Then If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexwert soll nicht geladen werden.", False) Exit Select End If - Dim wertWD = aktivesDokument.GetVariableValue(idxname) + Dim wertWD = aktivesDokument.GetVariableValue(oWMIndexName) If wertWD Is Nothing = False Then 'Es wird gegen ein Vektorfeld nachindexiert @@ -2041,6 +2069,7 @@ Public Class frmValidator For Each obj As Object In wertWD If obj Is Nothing = False Then dgv.Rows.Add(New String() {obj.ToString}) + End If Next @@ -2053,21 +2082,23 @@ Public Class frmValidator Case "System.Windows.Forms.CheckBox" controltype = "CheckBox" - If idxname = "" Then - MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & inctrl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + If oWMIndexName = "" Then + MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) Exit For End If - If idxname Is Nothing = False Then + If oWMIndexName Is Nothing = False Then - Dim chk As CheckBox = inctrl + Dim chk As CheckBox = oControl - If LoadIDX = False Or idxname = "DD PM-ONLY FOR DISPLAY" Then + If LoadIDX = False Or oWMIndexName = "DD PM-ONLY FOR DISPLAY" Then If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexwert soll nicht geladen werden.", False) If defaultValue <> String.Empty Then Dim result = False + _CURRENT_INDEX_ARRAY(oCount, 1) = "False" If Boolean.TryParse(defaultValue, result) Then chk.Checked = result + End If End If @@ -2077,12 +2108,12 @@ Public Class frmValidator Dim wertWD - If idxname.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - wertWD = ReturnVektor_IndexValue(idxname) + If oWMIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then + wertWD = ReturnVektor_IndexValue(oWMIndexName) Else - wertWD = aktivesDokument.GetVariableValue(idxname) + wertWD = aktivesDokument.GetVariableValue(oWMIndexName) End If - + _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD.ToString If wertWD Is Nothing Then ClassLogger.Add(">> Zurückgegebener Wert des Wertes für Checkbox mit Indexname '" & indexname & "' ist nothing. Check defaultvalue", False) chk.Checked = False @@ -2104,11 +2135,11 @@ Public Class frmValidator Else Dim _value If wertWD.ToString = "System.Object[]" Then - If LogErrorsOnly = False Then ClassLogger.Add(" >> CheckBoxValue with VektorField: " & idxname, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> CheckBoxValue with VektorField: " & oWMIndexName, False) If wertWD.length = 1 Then _value = wertWD(0) Else ' - ClassLogger.Add(" >> Vectorfield " & idxname & "' contains more then one value - First value will be used", False) + ClassLogger.Add(" >> Vectorfield " & oWMIndexName & "' contains more then one value - First value will be used", False) _value = wertWD(0) End If Else @@ -2133,8 +2164,8 @@ Public Class frmValidator End If Case "DigitalData.Controls.LookupGrid.LookupControl" Try - Dim lookup As LookupControl = inctrl - Dim wertWD = aktivesDokument.GetVariableValue(idxname) + Dim lookup As LookupControl = oControl + Dim wertWD = aktivesDokument.GetVariableValue(oWMIndexName) If wertWD.GetType.ToString.Contains("System.Object") Then Dim oArrlist As New List(Of String) For Each oVectorRow As Object In wertWD @@ -2146,7 +2177,7 @@ Public Class frmValidator Else End If - + _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD.ToString Catch ex As Exception ClassLogger.Add(" - Unvorhergesehener Unexpected error in AddVorschlag_ComboBox - Indexname: " & indexname & " - Fehler: " & vbNewLine & ex.Message) MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in Add LookupControl:") @@ -2154,20 +2185,20 @@ Public Class frmValidator Case "System.Windows.Forms.DateTimePicker" controltype = "DateTimePicker" - Dim DTP As DateTimePicker = inctrl - If idxname = "" Then - MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & inctrl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + Dim DTP As DateTimePicker = oControl + If oWMIndexName = "" Then + MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) Exit For End If - If idxname Is Nothing = False Then + If oWMIndexName Is Nothing = False Then Dim wertWD Try - If idxname.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then + If oWMIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then If LogErrorsOnly = False Then ClassLogger.Add(" >> DATE über PM-Vektor holen", False) - wertWD = ReturnVektor_IndexValue(idxname) + wertWD = ReturnVektor_IndexValue(oWMIndexName) ClassLogger.Add(">> DTP is """, False) Else - wertWD = aktivesDokument.GetVariableValue(idxname) + wertWD = aktivesDokument.GetVariableValue(oWMIndexName) End If If wertWD Is Nothing Then wertWD = "" @@ -2186,13 +2217,13 @@ Public Class frmValidator ValueDTP = tempdate DTP.Text = tempdate End If - + _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD.ToString Catch ex As Exception errormessage = "Unvorhergesehener Fehler bei DTP: " & vbNewLine & ex.Message - ClassLogger.Add(">> Unvorhergesehener Fehler bei FillIndex DTP: " & ex.Message & vbNewLine & "Wert WD: " & wertWD.ToString & vbNewLine & "Indexname: " & idxname, True) + ClassLogger.Add(">> Unvorhergesehener Fehler bei FillIndex DTP: " & ex.Message & vbNewLine & "Wert WD: " & wertWD.ToString & vbNewLine & "Indexname: " & oWMIndexName, True) frmError.ShowDialog() ClassLogger.Add(">> Unvorhergesehener Fehler bei FillIndex DTP: " & ex.Message, True) End Try @@ -2204,6 +2235,7 @@ Public Class frmValidator 'Case Else ' MsgBox(Type) End Select + oCount += 1 Next set_foreground() If first_control Is Nothing = False Then first_control.Focus() @@ -3399,4 +3431,8 @@ Public Class frmValidator Private Sub DateiInfoToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiInfoToolStripMenuItem.Click frmFileInfo.ShowDialog() End Sub + + Private Sub RefreshAdditionalSearchToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RefreshAdditionalSearchToolStripMenuItem.Click + _ValidatorSearch.RefreshTab1() + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.Designer.vb b/app/DD_PM_WINDREAM/frmValidatorSearch.Designer.vb new file mode 100644 index 0000000..d592215 --- /dev/null +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.Designer.vb @@ -0,0 +1,123 @@ + _ +Partial Class frmValidatorSearch + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() + Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() + Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl1.SuspendLayout() + Me.XtraTabPage1.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'ToolStrip1 + ' + Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) + Me.ToolStrip1.Name = "ToolStrip1" + Me.ToolStrip1.Size = New System.Drawing.Size(1203, 25) + Me.ToolStrip1.TabIndex = 0 + Me.ToolStrip1.Text = "ToolStrip1" + ' + 'StatusStrip1 + ' + Me.StatusStrip1.Location = New System.Drawing.Point(0, 428) + Me.StatusStrip1.Name = "StatusStrip1" + Me.StatusStrip1.Size = New System.Drawing.Size(1203, 22) + Me.StatusStrip1.TabIndex = 1 + Me.StatusStrip1.Text = "StatusStrip1" + ' + 'XtraTabControl1 + ' + Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 25) + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 + Me.XtraTabControl1.Size = New System.Drawing.Size(1203, 403) + Me.XtraTabControl1.TabIndex = 2 + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) + ' + 'XtraTabPage1 + ' + Me.XtraTabPage1.Controls.Add(Me.GridControl1) + Me.XtraTabPage1.Name = "XtraTabPage1" + Me.XtraTabPage1.Size = New System.Drawing.Size(1197, 375) + Me.XtraTabPage1.Text = "Search Result1" + ' + 'GridControl1 + ' + Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl1.Location = New System.Drawing.Point(0, 0) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(1197, 375) + Me.GridControl1.TabIndex = 0 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'XtraTabPage2 + ' + Me.XtraTabPage2.Name = "XtraTabPage2" + Me.XtraTabPage2.Size = New System.Drawing.Size(1197, 375) + Me.XtraTabPage2.Text = "XtraTabPage2" + ' + 'frmValidatorSearch + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1203, 450) + Me.Controls.Add(Me.XtraTabControl1) + Me.Controls.Add(Me.StatusStrip1) + Me.Controls.Add(Me.ToolStrip1) + Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "frmValidatorSearch" + Me.Text = "Zusätzliche Suchen" + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl1.ResumeLayout(False) + Me.XtraTabPage1.ResumeLayout(False) + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ToolStrip1 As ToolStrip + Friend WithEvents StatusStrip1 As StatusStrip + Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage +End Class diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.resx b/app/DD_PM_WINDREAM/frmValidatorSearch.resx new file mode 100644 index 0000000..2b7c922 --- /dev/null +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 124, 17 + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.vb b/app/DD_PM_WINDREAM/frmValidatorSearch.vb new file mode 100644 index 0000000..6191d32 --- /dev/null +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.vb @@ -0,0 +1,31 @@ +Public Class frmValidatorSearch + Public Sub RefreshTab1() + If Me.InvokeRequired() Then + Me.Invoke(Sub() RefreshTab1()) + Else + 'Code to refresh your textbox here + End If + End Sub + + Private Sub frmValidatorSearch_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + Try + ' Position und Größe speichern + My.Settings.frmValidatorSearchSize = Me.Size + My.Settings.frmValidatorSearchPosition = Me.Location + My.Settings.Save() + Catch ex As Exception + ClassLogger.Add("Error in Save FormLayout: " & ex.Message) + End Try + End Sub + + Private Sub frmValidatorSearch_Load(sender As Object, e As EventArgs) Handles Me.Load + If My.Settings.frmValidatorSearchPosition.IsEmpty = False Then + If My.Settings.frmValidatorSearchPosition.X > 0 And My.Settings.frmValidatorSearchPosition.Y > 0 Then + Location = My.Settings.frmValidatorSearchPosition + End If + End If + If My.Settings.frmValidatorSearchSize.IsEmpty = False Then + Size = My.Settings.frmValidatorSearchSize + End If + End Sub +End Class \ No newline at end of file