From 83880a82880c082430edf3a39f6106a6a8656c43 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 27 Aug 2020 17:12:44 +0200 Subject: [PATCH] MS Further Configs --- .../DD_DMSLiteDataSet.Designer.vb | 8 +- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 60 +-- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 20 +- app/DD_PM_WINDREAM/clsPatterns.vb | 30 +- app/DD_PM_WINDREAM/frmAdmin2.Designer.vb | 12 +- app/DD_PM_WINDREAM/frmAdmin2.resx | 348 +++++-------- app/DD_PM_WINDREAM/frmAdmin2.vb | 45 +- .../frmAdministration.Designer.vb | 12 +- app/DD_PM_WINDREAM/frmAdministration.resx | 6 +- app/DD_PM_WINDREAM/frmMain.Designer.vb | 137 ++--- app/DD_PM_WINDREAM/frmMain.resx | 471 ++++++------------ app/DD_PM_WINDREAM/frmMain.vb | 147 ++++-- app/DD_PM_WINDREAM/frmValidator.vb | 66 ++- 13 files changed, 592 insertions(+), 770 deletions(-) diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index a3d58c6..b9053d1 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -7905,8 +7905,8 @@ Partial Public Class DD_DMSLiteDataSet Me.columnEMAIL_BODY3.DefaultValue = CType("",String) Me.columnEMAIL_BODY3.MaxLength = 2147483647 Me.columnADDED_WHO.AllowDBNull = false - Me.columnADDED_WHO.MaxLength = 30 - Me.columnCHANGED_WHO.MaxLength = 30 + Me.columnADDED_WHO.MaxLength = 100 + Me.columnCHANGED_WHO.MaxLength = 100 End Sub - + @@ -2115,7 +2115,7 @@ ORDER BY Netto DESC - + @@ -2211,7 +2211,7 @@ ORDER BY Netto DESC - + @@ -2276,7 +2276,7 @@ ORDER BY Netto DESC - + @@ -2306,7 +2306,7 @@ ORDER BY Netto DESC - + @@ -2329,7 +2329,7 @@ ORDER BY Netto DESC - + @@ -2403,7 +2403,7 @@ ORDER BY Netto DESC - + @@ -2452,7 +2452,7 @@ ORDER BY Netto DESC - + @@ -2467,7 +2467,7 @@ ORDER BY Netto DESC - + @@ -2589,7 +2589,7 @@ ORDER BY Netto DESC - + @@ -2662,7 +2662,7 @@ ORDER BY Netto DESC - + @@ -2713,7 +2713,7 @@ ORDER BY Netto DESC - + @@ -2860,7 +2860,7 @@ ORDER BY Netto DESC - + @@ -2938,7 +2938,7 @@ ORDER BY Netto DESC - + @@ -2979,7 +2979,7 @@ ORDER BY Netto DESC - + @@ -3017,7 +3017,7 @@ ORDER BY Netto DESC - + @@ -3074,7 +3074,7 @@ ORDER BY Netto DESC - + @@ -3116,7 +3116,7 @@ ORDER BY Netto DESC - + @@ -3124,7 +3124,7 @@ ORDER BY Netto DESC - + @@ -3132,7 +3132,7 @@ ORDER BY Netto DESC - + @@ -3209,7 +3209,7 @@ ORDER BY Netto DESC - + @@ -3217,7 +3217,7 @@ ORDER BY Netto DESC - + @@ -3233,7 +3233,7 @@ ORDER BY Netto DESC - + @@ -3286,7 +3286,7 @@ ORDER BY Netto DESC - + @@ -3302,7 +3302,7 @@ ORDER BY Netto DESC - + @@ -3399,11 +3399,11 @@ ORDER BY Netto DESC - - - - - + + + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index 7dc43f9..f615167 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -14,18 +14,18 @@ - + - - + + - + - - - - - + + + + + diff --git a/app/DD_PM_WINDREAM/clsPatterns.vb b/app/DD_PM_WINDREAM/clsPatterns.vb index bace8b0..b399dba 100644 --- a/app/DD_PM_WINDREAM/clsPatterns.vb +++ b/app/DD_PM_WINDREAM/clsPatterns.vb @@ -61,8 +61,11 @@ Public Class clsPatterns If IDB_ACTIVE = True Then result = ReplaceIDBAttributes(result, is_SQL) End If - result = ReplaceUserValues(result, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) - LOGGER.Debug($"input AFTER replacing: [{result}]") + If Not IsNothing(result) Then + result = ReplaceUserValues(result, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + LOGGER.Debug($"input AFTER replacing: [{result}]") + End If + Return result Catch ex As Exception LOGGER.Error(ex) @@ -246,21 +249,32 @@ Public Class clsPatterns End If If IsNothing(oIDBValue) And oTryCounter = MAX_TRY_COUNT Then - LOGGER.Warn("Max tries in ReplaceIDBAttributes exceeded - Replacing with [0]!") + LOGGER.Warn($"Max tries for [{indexName}] in ReplaceIDBAttributes exceeded - Replacing with [0]!") Dim oReplaceValue = "{" + $"#{PATTERN_IDBA}#{indexName}" + "}" result = result.Replace(oReplaceValue, 0) Throw New Exception("Max tries in ReplaceIDBAttributes exceeded.") End If - If oIDBValue IsNot Nothing Then + If oIDBValue IsNot Nothing Or Not IsDBNull(oIDBValue) Then Dim oReplaceValue = "{" + $"#{PATTERN_IDBA}#{indexName}" + "}" If IS_SQL = True Then - LOGGER.Debug($"IS_SQL = True - oReplaceValue = {oIDBValue}") - oIDBValue = oIDBValue.Replace("'", "''") - LOGGER.Debug($"oReplaceValue = {oIDBValue}") + LOGGER.Debug($"IS_SQL = True - oReplaceValue = [{oReplaceValue}]") + If indexName <> "ObjectID" And indexName <> "OBJID" And indexName <> "DocID" Then + Try + oIDBValue = oIDBValue.Replace("'", "''") + Catch ex As Exception + LOGGER.Warn($"Invalid IDBValue for [{indexName}] in ReplaceIDBAttributes [{ex.Message}] - Replacing with [0]!") + oIDBValue = 0 + End Try + + End If + LOGGER.Debug($"oIDBValue = {oIDBValue}") End If result = result.Replace(oReplaceValue, oIDBValue) - 'result = ReplacePattern(result, oReplaceValue, oIDBValue) + Else + LOGGER.Warn($"IDBValue for [{indexName}] in ReplaceIDBAttributes is nothing or dbnull - Replacing with [0]!") + Dim oReplaceValue = "{" + $"#{PATTERN_IDBA}#{indexName}" + "}" + result = result.Replace(oReplaceValue, 0) End If oTryCounter += 100 End While diff --git a/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb b/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb index 6258a9e..e61483d 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb @@ -158,6 +158,7 @@ Partial Class frmAdmin2 Me.TBDD_GUI_LANGUAGE_PHRASETableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_GUI_LANGUAGE_PHRASETableAdapter() Me.LayoutConverter1 = New DevExpress.XtraLayout.Converter.LayoutConverter(Me.components) Me.XtraSaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() CType(Me.spcontwKonfMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.spcontwKonfMain.SuspendLayout() CType(Me.spcontwKonfleft, System.ComponentModel.ISupportInitialize).BeginInit() @@ -302,9 +303,9 @@ Partial Class frmAdmin2 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BbitemplateAdd, Me.BbitemplateSave, Me.BbitemplateDelete, Me.BarButtonItem1, Me.labelStatus, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BbitemplateAdd, Me.BbitemplateSave, Me.BbitemplateDelete, Me.BarButtonItem1, Me.labelStatus, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarStaticItem1}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 15 + Me.RibbonControl1.MaxItemId = 16 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -1422,6 +1423,12 @@ Partial Class frmAdmin2 ' resources.ApplyResources(Me.XtraSaveFileDialog1, "XtraSaveFileDialog1") ' + 'BarStaticItem1 + ' + resources.ApplyResources(Me.BarStaticItem1, "BarStaticItem1") + Me.BarStaticItem1.Id = 15 + Me.BarStaticItem1.Name = "BarStaticItem1" + ' 'frmAdmin2 ' resources.ApplyResources(Me, "$this") @@ -1669,4 +1676,5 @@ Partial Class frmAdmin2 Friend WithEvents BarButtonItem10 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents XtraSaveFileDialog1 As SaveFileDialog + Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem End Class diff --git a/app/DD_PM_WINDREAM/frmAdmin2.resx b/app/DD_PM_WINDREAM/frmAdmin2.resx index 4d6b72b..5a66d14 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.resx +++ b/app/DD_PM_WINDREAM/frmAdmin2.resx @@ -583,9 +583,21 @@ 5gfi7zm7378N/3+C2X8Bg3DBnOf3rOsAAAAASUVORK5CYII= + + BarStaticItem1 + 0, 0 + + Vorlagen Verwaltung + + + Phrasen Verwaltung + + + Export + Start @@ -651,7 +663,7 @@ 0, 0 - Grid 1 + Grid 3 486, 253 @@ -708,7 +720,7 @@ 0, 0 - Grid 1 + Grid 2 559, 257 @@ -738,7 +750,7 @@ 0, 0 - Grid 1 + Grid 4 559, 254 @@ -800,15 +812,6 @@ 0 - - Vorlagen Verwaltung - - - Phrasen Verwaltung - - - Export - RibbonPage2 @@ -818,162 +821,9 @@ 0, 146 - - 767, 56 - True - - BindingNavigator1 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 0 - - - DataLayoutControl1 - - - DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage1 - - - 1 - - - GridControl1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage1 - - - 2 - - - 1057, 523 - - - Email Phrasen - - - XtraTabPage1 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 0 - - - 1059, 548 - - - 2 - - - 921, 56 - - - True - - - DataLayoutControl2 - - - DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage2 - - - 0 - - - BindingNavigator2 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 1 - - - GridControl2 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage2 - - - 2 - - - 1057, 523 - - - GUI Phrasen - - - XtraTabPage2 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 1 - - - 1057, 523 - - - Weitere Konfigurationen - - - XtraTabPage3 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 2 - - - XtraTabControl1 - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 0 - 767, 56 @@ -1119,9 +969,6 @@ 0 - - 17, 17 - Top, Bottom, Left, Right @@ -1360,27 +1207,6 @@ 359, 28 - - 698, 491 - - - 22 - - - DataLayoutControl1 - - - DataLayoutControl1 - - - DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage1 - - - 1 - ID @@ -1411,6 +1237,27 @@ Geändert wann + + 698, 491 + + + 22 + + + DataLayoutControl1 + + + DataLayoutControl1 + + + DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage1 + + + 1 + Left @@ -1459,6 +1306,33 @@ 2 + + 1057, 523 + + + Email Phrasen + + + XtraTabPage1 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 0 + + + 1059, 548 + + + 2 + + + True + 17, 56 @@ -1853,27 +1727,6 @@ 509, 25 - - 544, 479 - - - 25 - - - DataLayoutControl2 - - - DataLayoutControl2 - - - DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage2 - - - 0 - ID @@ -1925,6 +1778,27 @@ Objekt + + 544, 479 + + + 25 + + + DataLayoutControl2 + + + DataLayoutControl2 + + + DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage2 + + + 0 + 921, 56 @@ -2127,6 +2001,54 @@ 2 + + 1057, 523 + + + GUI Phrasen + + + XtraTabPage2 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 1 + + + 1057, 523 + + + Weitere Konfigurationen + + + XtraTabPage3 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 2 + + + XtraTabControl1 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 + 442, 17 @@ -2699,6 +2621,12 @@ System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + BarStaticItem1 + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmAdmin2 diff --git a/app/DD_PM_WINDREAM/frmAdmin2.vb b/app/DD_PM_WINDREAM/frmAdmin2.vb index 9a314f1..119d78a 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.vb +++ b/app/DD_PM_WINDREAM/frmAdmin2.vb @@ -123,6 +123,15 @@ Public Class frmAdmin2 Load_More_Konfig_Grids() End Select End Sub + Private Sub SET_GRID_DESCRIPTION(pGridView As Views.Grid.GridView, pDT As DataTable) + Dim objectCount_Descr = $"{pGridView.Tag} [{pDT.Rows.Count}] " + If USER_LANGUAGE <> "de-DE" Then + objectCount_Descr &= " records" + Else + objectCount_Descr &= " Datensätze" + End If + pGridView.ViewCaption = objectCount_Descr + End Sub Private Sub Load_More_Konfig_Grids() Try @@ -135,7 +144,8 @@ Public Class frmAdmin2 Dim oDTGRID1 As DataTable = ClassDatabase.Return_Datatable(oSQL, "FurtherConfig-Load_Grid_Data1") GridControlWK1.DataSource = oDTGRID1 GRID1_TITLE = DT_FURTHER_KONFIG_VIEW.Rows(0).Item("GRID_TITLE") - GridViewWK1.ViewCaption = GRID1_TITLE + GridViewWK1.Tag = GRID1_TITLE + SET_GRID_DESCRIPTION(GridViewWK1, oDTGRID1) spcontwKonfleft.Collapsed = False spcontwKonfRight.Collapsed = False Select Case DT_FURTHER_KONFIG_VIEW.Rows.Count @@ -150,31 +160,38 @@ Public Class frmAdmin2 If DT_FURTHER_KONFIG_VIEW.Rows.Count > 1 Then GRID2_TITLE = DT_FURTHER_KONFIG_VIEW.Rows(1).Item("GRID_TITLE") GRID2_SQL = DT_FURTHER_KONFIG_VIEW.Rows(1).Item("GRID_SQL") - GridViewWK2.ViewCaption = GRID2_TITLE + + GridViewWK2.Tag = GRID1_TITLE GridViewWK2.Columns.Clear() Dim oDTGRID2 As DataTable = ClassDatabase.Return_Datatable(GRID2_SQL, "FurtherConfig-Load_Grid_Data2") GridControlWK2.DataSource = oDTGRID2 + SET_GRID_DESCRIPTION(GridViewWK2, oDTGRID2) Select Case DT_FURTHER_KONFIG_VIEW.Rows.Count Case 3 GRID3_TITLE = DT_FURTHER_KONFIG_VIEW.Rows(2).Item("GRID_TITLE") GRID3_SQL = DT_FURTHER_KONFIG_VIEW.Rows(2).Item("GRID_SQL") - GridViewWK3.ViewCaption = GRID3_TITLE + + GridViewWK3.Tag = GRID3_TITLE + GridViewWK3.Columns.Clear() Dim oDTGRID3 As DataTable = ClassDatabase.Return_Datatable(GRID3_SQL, "FurtherConfig-Load_Grid_Data3") GridControlWK3.DataSource = oDTGRID3 + SET_GRID_DESCRIPTION(GridViewWK3, oDTGRID3) Case 4 GRID3_TITLE = DT_FURTHER_KONFIG_VIEW.Rows(2).Item("GRID_TITLE") GRID3_SQL = DT_FURTHER_KONFIG_VIEW.Rows(2).Item("GRID_SQL") - GridViewWK3.ViewCaption = GRID3_TITLE + GridViewWK3.Tag = GRID3_TITLE GridViewWK3.Columns.Clear() Dim oDTGRID3 As DataTable = ClassDatabase.Return_Datatable(GRID3_SQL, "FurtherConfig-Load_Grid_Data3") GridControlWK3.DataSource = oDTGRID3 + SET_GRID_DESCRIPTION(GridViewWK3, oDTGRID3) GRID4_TITLE = DT_FURTHER_KONFIG_VIEW.Rows(3).Item("GRID_TITLE") GRID4_SQL = DT_FURTHER_KONFIG_VIEW.Rows(3).Item("GRID_SQL") - GridViewWK4.ViewCaption = GRID4_TITLE + GridViewWK4.Tag = GRID4_TITLE GridViewWK4.Columns.Clear() Dim oDTGRID4 As DataTable = ClassDatabase.Return_Datatable(GRID4_SQL, "FurtherConfig-Load_Grid_Data4") - GridControlWK4.DataSource = oDTGRID3 + GridControlWK4.DataSource = oDTGRID4 + SET_GRID_DESCRIPTION(GridViewWK4, oDTGRID4) End Select End If End If @@ -332,4 +349,20 @@ Public Class frmAdmin2 Return _ActiveGrid End Function + + Private Sub GridViewWK1_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewWK1.ColumnFilterChanged, GridViewWK2.ColumnFilterChanged, GridViewWK3.ColumnFilterChanged, GridViewWK4.ColumnFilterChanged + Try + Dim oMyGridView As Views.Grid.GridView = sender + Dim objectCount_Descr = $"{GridViewWK1.Tag} [{oMyGridView.RowCount.ToString}] " + If USER_LANGUAGE <> "de-DE" Then + objectCount_Descr &= " records (filtered)" + Else + objectCount_Descr &= " Datensätze (gefiltert)" + End If + oMyGridView.ViewCaption = objectCount_Descr + Catch ex As Exception + + End Try + End Sub + End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index 8b06b8f..697695b 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -143,6 +143,7 @@ Partial Class frmAdministration Me.TabPage8 = New System.Windows.Forms.TabPage() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.Label14 = New System.Windows.Forms.Label() Me.Button4 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() @@ -244,7 +245,6 @@ Partial Class frmAdministration Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.Label14 = New System.Windows.Forms.Label() GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() DESCRIPTIONLabel = New System.Windows.Forms.Label() @@ -1198,6 +1198,11 @@ Partial Class frmAdministration Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.TabStop = False ' + 'Label14 + ' + resources.ApplyResources(Me.Label14, "Label14") + Me.Label14.Name = "Label14" + ' 'Button4 ' Me.Button4.Image = Global.DD_ProcessManager.My.Resources.Resources.DeleteFilter_5563 @@ -1852,11 +1857,6 @@ Partial Class frmAdministration Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' - 'Label14 - ' - resources.ApplyResources(Me.Label14, "Label14") - Me.Label14.Name = "Label14" - ' 'frmAdministration ' Me.Appearance.Options.UseFont = True diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 15bea5d..112bea4 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -126,7 +126,7 @@ - 12, 9 + 7, 9 25, 16 @@ -1315,10 +1315,10 @@ 3 - 53, 6 + 38, 6 - 38, 23 + 53, 23 1 diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 0757eb4..ac9fe28 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -47,16 +47,8 @@ Partial Class frmMain Me.GridView_Docs = New DevExpress.XtraGrid.Views.Grid.GridView() 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.ToolStripLabelViewTape = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() - 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.NavBarControl1 = New DevExpress.XtraNavBar.NavBarControl() Me.NavBarGroupProfiles = New DevExpress.XtraNavBar.NavBarGroup() Me.cmsNavPane = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -100,6 +92,8 @@ Partial Class frmMain Me.bbtnitDashboardInv = New DevExpress.XtraBars.BarButtonItem() Me.bsiGeneralInfo = New DevExpress.XtraBars.BarStaticItem() Me.bbtnitmGhostMode = New DevExpress.XtraBars.BarButtonItem() + Me.bsi_GhostMode = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -178,8 +172,7 @@ Partial Class frmMain Me.PrintPreviewBarCheckItem17 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() Me.PrintPreviewBarCheckItem18 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() Me.PrintPreviewBarCheckItem19 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() - Me.bsi_GhostMode = New DevExpress.XtraBars.BarStaticItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.tslblObjectCount = New System.Windows.Forms.ToolStripLabel() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() @@ -352,23 +345,18 @@ Partial Class frmMain ' Me.BindingNavigator1.AddNewItem = Nothing Me.BindingNavigator1.BindingSource = Me.bindsourcegrid - Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem + Me.BindingNavigator1.CountItem = Nothing Me.BindingNavigator1.CountItemFormat = "von {0} Vorgängen" Me.BindingNavigator1.DeleteItem = Nothing Me.BindingNavigator1.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabelViewTape, Me.BindingNavigatorSeparator2, Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem}) + Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabelViewTape, Me.BindingNavigatorSeparator2, Me.tslblObjectCount}) resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1") - Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem - Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem - Me.BindingNavigator1.MoveNextItem = Me.BindingNavigatorMoveNextItem - Me.BindingNavigator1.MovePreviousItem = Me.BindingNavigatorMovePreviousItem + Me.BindingNavigator1.MoveFirstItem = Nothing + Me.BindingNavigator1.MoveLastItem = Nothing + Me.BindingNavigator1.MoveNextItem = Nothing + Me.BindingNavigator1.MovePreviousItem = Nothing Me.BindingNavigator1.Name = "BindingNavigator1" - Me.BindingNavigator1.PositionItem = Me.BindingNavigatorPositionItem - ' - 'BindingNavigatorCountItem - ' - Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem" - resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem") + Me.BindingNavigator1.PositionItem = Nothing ' 'ToolStripLabelViewTape ' @@ -380,45 +368,6 @@ Partial Class frmMain Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2" resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2") ' - '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" - ' 'NavBarControl1 ' Me.NavBarControl1.ActiveGroup = Me.NavBarGroupProfiles @@ -709,6 +658,34 @@ Partial Class frmMain Me.bbtnitmGhostMode.ImageOptions.LargeImage = CType(resources.GetObject("bbtnitmGhostMode.ImageOptions.LargeImage"), System.Drawing.Image) Me.bbtnitmGhostMode.Name = "bbtnitmGhostMode" ' + 'bsi_GhostMode + ' + resources.ApplyResources(Me.bsi_GhostMode, "bsi_GhostMode") + Me.bsi_GhostMode.Id = 20 + Me.bsi_GhostMode.ImageOptions.SvgImage = CType(resources.GetObject("bsi_GhostMode.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bsi_GhostMode.ItemAppearance.Normal.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.bsi_GhostMode.ItemAppearance.Normal.Font = CType(resources.GetObject("bsi_GhostMode.ItemAppearance.Normal.Font"), System.Drawing.Font) + Me.bsi_GhostMode.ItemAppearance.Normal.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) + Me.bsi_GhostMode.ItemAppearance.Normal.Options.UseBackColor = True + Me.bsi_GhostMode.ItemAppearance.Normal.Options.UseFont = True + Me.bsi_GhostMode.ItemAppearance.Normal.Options.UseForeColor = True + Me.bsi_GhostMode.Name = "bsi_GhostMode" + Me.bsi_GhostMode.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + Me.bsi_GhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + ' + 'BarButtonItem2 + ' + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") + Me.BarButtonItem2.Id = 21 + Me.BarButtonItem2.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem2.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem2.ItemAppearance.Normal.Font = CType(resources.GetObject("BarButtonItem2.ItemAppearance.Normal.Font"), System.Drawing.Font) + Me.BarButtonItem2.ItemAppearance.Normal.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) + Me.BarButtonItem2.ItemAppearance.Normal.Options.UseFont = True + Me.BarButtonItem2.ItemAppearance.Normal.Options.UseForeColor = True + Me.BarButtonItem2.Name = "BarButtonItem2" + Me.BarButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf}) @@ -1361,33 +1338,10 @@ Partial Class frmMain Me.PrintPreviewBarCheckItem19.Id = 58 Me.PrintPreviewBarCheckItem19.Name = "PrintPreviewBarCheckItem19" ' - 'bsi_GhostMode + 'tslblObjectCount ' - resources.ApplyResources(Me.bsi_GhostMode, "bsi_GhostMode") - Me.bsi_GhostMode.Id = 20 - Me.bsi_GhostMode.ImageOptions.SvgImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.bsi_GhostMode.ItemAppearance.Normal.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.bsi_GhostMode.ItemAppearance.Normal.Font = CType(resources.GetObject("BarStaticItem1.ItemAppearance.Normal.Font"), System.Drawing.Font) - Me.bsi_GhostMode.ItemAppearance.Normal.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) - Me.bsi_GhostMode.ItemAppearance.Normal.Options.UseBackColor = True - Me.bsi_GhostMode.ItemAppearance.Normal.Options.UseFont = True - Me.bsi_GhostMode.ItemAppearance.Normal.Options.UseForeColor = True - Me.bsi_GhostMode.Name = "bsi_GhostMode" - Me.bsi_GhostMode.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph - Me.bsi_GhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - ' - 'BarButtonItem2 - ' - resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") - Me.BarButtonItem2.Id = 21 - Me.BarButtonItem2.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItem2.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItem2.ItemAppearance.Normal.Font = CType(resources.GetObject("BarButtonItem2.ItemAppearance.Normal.Font"), System.Drawing.Font) - Me.BarButtonItem2.ItemAppearance.Normal.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) - Me.BarButtonItem2.ItemAppearance.Normal.Options.UseFont = True - Me.BarButtonItem2.ItemAppearance.Normal.Options.UseForeColor = True - Me.BarButtonItem2.Name = "BarButtonItem2" - Me.BarButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing + Me.tslblObjectCount.Name = "tslblObjectCount" + resources.ApplyResources(Me.tslblObjectCount, "tslblObjectCount") ' 'frmMain ' @@ -1462,14 +1416,6 @@ Partial Class frmMain Friend WithEvents GridControl_Docs As DevExpress.XtraGrid.GridControl Friend WithEvents GridView_Docs As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents BindingNavigator1 As BindingNavigator - Friend WithEvents BindingNavigatorCountItem As ToolStripLabel - Friend WithEvents BindingNavigatorMoveFirstItem As ToolStripButton - Friend WithEvents BindingNavigatorMovePreviousItem As ToolStripButton - Friend WithEvents BindingNavigatorSeparator As ToolStripSeparator - Friend WithEvents BindingNavigatorPositionItem As ToolStripTextBox - Friend WithEvents BindingNavigatorSeparator1 As ToolStripSeparator - Friend WithEvents BindingNavigatorMoveNextItem As ToolStripButton - Friend WithEvents BindingNavigatorMoveLastItem As ToolStripButton Friend WithEvents BindingNavigatorSeparator2 As ToolStripSeparator Friend WithEvents bindsourcegrid As BindingSource Friend WithEvents ToolStripLabelViewTape As ToolStripLabel @@ -1590,4 +1536,5 @@ Partial Class frmMain Friend WithEvents DateiAlsLinkVersendenToolStripMenuItem As ToolStripMenuItem Friend WithEvents bsi_GhostMode As DevExpress.XtraBars.BarStaticItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents tslblObjectCount As ToolStripLabel End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 0b521d1..2241795 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAawBBgGsAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAbQBBgG0AQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -178,114 +178,10 @@ 597, 17 - - 138, 95 - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - - - BindingNavigator1 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 1 - - - NavBarControl1 - - - DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 2 - - - - Fill - - - - Tahoma, 9pt - - - 0, 146 - - - 1347, 360 - - - - 4 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 1347, 56 - - 270, 230 - - - ContextMenuGrid - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - 233, 27 - - - 1114, 333 - - - 8 - - - False - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - + 269, 26 @@ -314,6 +210,7 @@ Metadaten Datei anzeigen + False @@ -369,150 +266,84 @@ 266, 6 - - 269, 26 - - - Aktionen - 200, 22 Datei als Link versenden - - 138, 95 - - - 292, 95 - - - 104, 24 - - - von {0} Vorgängen - - - Die Gesamtanzahl der Elemente. - - - Segoe UI, 9pt, style=Bold - - - 61, 24 - - - ViewType - - - 6, 27 - - - - 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= - - - - True + + 269, 26 - - 24, 24 + + Aktionen - - Erste verschieben + + 270, 230 - - - 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 - + + ContextMenuGrid - - True + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 24, 24 + + + Fill - - Vorherige verschieben + + 233, 25 - - 6, 27 + + 1114, 335 - - Position + + 8 - + False - - Segoe UI, 9pt - - - 50, 23 - - - 0 - - - Aktuelle Position + + GridControl_Docs - - 6, 27 + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - + + Panel1 - - True + + 0 - - 24, 24 + + 138, 95 + + + 292, 95 + + + Segoe UI, 9pt, style=Bold - - Nächste verschieben + + 61, 22 - - - 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== - + + ViewType - - True + + 6, 25 - - 24, 24 + + 88, 22 - - Letzte verschieben + + ToolStripLabel1 233, 0 - 1114, 27 + 1114, 25 9 @@ -587,6 +418,12 @@ 17, 95 + + 219, 26 + + + Starte Validierung für Profil + 220, 30 @@ -740,11 +577,32 @@ 2 - - 219, 26 + + Fill - - Starte Validierung für Profil + + Tahoma, 9pt + + + 0, 146 + + + 1347, 360 + + + 4 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 908, 17 @@ -752,6 +610,27 @@ 640, 95 + + 234, 22 + + + Popup Erinnerung inaktivieren + + + 231, 6 + + + 234, 22 + + + Bring to Front + + + 234, 22 + + + Out of Range - PM fixieren + 235, 76 @@ -933,27 +812,6 @@ True - - 234, 22 - - - Popup Erinnerung inaktivieren - - - 231, 6 - - - 234, 22 - - - Bring to Front - - - 234, 22 - - - Out of Range - PM fixieren - 1023, 17 @@ -1398,7 +1256,7 @@ GhostMode active - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -1423,7 +1281,7 @@ dmc+Cw== - + Tahoma, 9.75pt, style=Bold @@ -1431,31 +1289,30 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAEHRFWHRUaXRsZQBNYXNrO1Jv - bGU7urHsswAAAN5JREFUOE+dkr0NgmAURYmtE7gAhdHKMWyxdQILwwCULuAEhugAroCNO1CZWCr2FHqP - eR/5QEiE4kTuz7vBhOB5iUvxHkjJQNEw+1AwkDfMPuQMZCZOYinG9ot2xa4sYyA1MRNoB9oNdGUpIjEx - 5A0SBiITQ4gYCMXLM/+Fm9D9p7OZfeAmcANbM/vATTUwFe57WJjXBhkdutxUA7AThHsxMs8Hj4wO3a/v - F+biKigcxUpMDJ7xyOjQ/RmAtXgIim2Q0alu/GPHRtxF8xiPrNavCQ++toO4GTzjNXpx8AFGzsQFb2mX - gAAAAABJRU5ErkJggg== + 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 + auQPQiXhdkHlGrsAAAAASUVORK5CYII= @@ -1921,12 +1778,6 @@ 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 - ToolStripLabelViewTape @@ -1939,48 +1790,6 @@ System.Windows.Forms.ToolStripSeparator, 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 - NavBarGroupProfiles @@ -2215,6 +2024,18 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + bsi_GhostMode + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -2653,17 +2474,11 @@ DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - bsi_GhostMode - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarButtonItem2 + + tslblObjectCount - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 frmMain @@ -2877,9 +2692,6 @@ &Ansicht - - &Hintergrund - &Seiten Layout @@ -2892,6 +2704,9 @@ Bars + + &Hintergrund + PDF Dokument diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 895b173..57f312d 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -408,18 +408,22 @@ Public Class frmMain GridView_Docs.Columns.Item("ICON").MinWidth = 24 GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White GridView_Docs.Columns.Item("ICON").Fixed = FixedStyle.Left - Try - GridView_Docs.Columns.Item("CONV_YN").Visible = False - Catch ex As Exception - LOGGER.Warn("Check wether Column CONV_YN is part of select/view") - End Try - Try - GridView_Docs.Columns.Item("CONVERSATION").MaxWidth = 24 - GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24 - GridView_Docs.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left - Catch ex As Exception - LOGGER.Warn("Check wether Column CONVERSATION is part of select/view") - End Try + + If IDB_ACTIVE = True Then + Try + GridView_Docs.Columns.Item("CONV_YN").Visible = False + Catch ex As Exception + LOGGER.Warn("ResetLayout - Check wether Column CONV_YN is part of select/view") + End Try + Try + GridView_Docs.Columns.Item("CONVERSATION").MaxWidth = 24 + GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24 + GridView_Docs.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left + Catch ex As Exception + LOGGER.Warn("ResetLayout - Column CONVERSATION obviously is not part of GridView_Docs") + End Try + End If + Try GridView_Docs.Columns("Last edited").DisplayFormat.FormatType = FormatType.DateTime @@ -515,6 +519,7 @@ Public Class frmMain NavBarControl1.Groups(1).Expanded = True End If Else + LOGGER.Debug("NavBarControl - No Detail Profiles") NavBarControl1.Visible = False End If @@ -654,21 +659,44 @@ Public Class frmMain row.Item("ICON") = My.Resources.ampel_gruen End Select Next + If IDB_ACTIVE = True Then + ' Spalte für Conversation erstellen + Dim columnConvIcon As New DataColumn() + columnConvIcon.DataType = GetType(Image) + columnConvIcon.ColumnName = "CONVERSATION" + columnConvIcon.Caption = "" + CURR_DT_OVERVIEW.Columns.Add(columnConvIcon) + End If For Each oRow As DataRow In CURR_DT_OVERVIEW.Rows Try - Dim oCONVYN As Boolean = oRow.Item("CONV_YN") + Dim oCONVYN As Boolean + Try + oCONVYN = oRow.Item("CONV_YN") + Catch ex As Exception + LOGGER.Warn($"Please check Your select/view Config - Column CONV_YN is missing [{ex.Message}]") + Exit For + End Try + Select Case oCONVYN Case True oRow.Item("CONVERSATION") = My.Resources.conversation End Select Catch ex As Exception - LOGGER.Warn($"Please check Your select/view Config - Column CONV_YN is missing [{ex.Message}]") + LOGGER.Warn("Create_Basic_View1 - Column CONVERSATION obviously is not part of GridView_Docs") End Try Next bindsourcegrid.DataSource = CURR_DT_OVERVIEW GridControl_Docs.DataSource = bindsourcegrid + Dim objectCount_Descr = GridView_Docs.RowCount.ToString + If USER_LANGUAGE = "de-DE" Then + objectCount_Descr &= " Vorgänge" + Else + objectCount_Descr &= " objects" + End If + tslblObjectCount.Text = objectCount_Descr + tslblObjectCount.ForeColor = Color.DarkBlue 'GridControlDocRow.ForceInitialize() RestoreLayout() @@ -685,15 +713,20 @@ Public Class frmMain Try GridView_Docs.Columns.Item("CONV_YN").Visible = False Catch ex As Exception - LOGGER.Warn("Check wether Column CONV_YN is part of select/view") - End Try - Try - GridView_Docs.Columns.Item("CONVERSATION").MaxWidth = 24 - GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24 - GridView_Docs.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left - Catch ex As Exception - LOGGER.Warn("Check wether Column CONVERSATION is part of select/view") + LOGGER.Warn("Create_Basic_View - Check wether Column CONV_YN is part of select/view") End Try + If IDB_ACTIVE = True Then + Try + GridView_Docs.Columns.Item("CONVERSATION").MaxWidth = 24 + GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24 + GridView_Docs.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left + Catch ex As Exception + LOGGER.Warn("Create_Basic_View2 - Column CONVERSATION obviously is not part of GridView_Docs - Trying to Rest Layout") + ResetLayout() + Exit Sub + End Try + End If + ' GridView_Docs.OptionsView.ShowIndicator = False Try @@ -1470,29 +1503,41 @@ Public Class frmMain columnConvIcon.ColumnName = "CONVERSATION" columnConvIcon.Caption = "" CURR_DT_OVERVIEW.Columns.Add(columnConvIcon) + For Each oRow As DataRow In CURR_DT_OVERVIEW.Rows + Try + Dim oCONVYN As Boolean + Try + oCONVYN = oRow.Item("CONV_YN") + Catch ex As Exception + LOGGER.Warn("Load_Grid_Overview - Column CONV_YN obviously is not part of CURR_DT_OVERVIEW") + Exit For + End Try + Select Case oCONVYN + Case True + oRow.Item("CONVERSATION") = My.Resources.conversation + End Select + Catch ex As Exception + LOGGER.Warn("Load_Grid_Overview - Column CONVERSATION obviously is not part of GridView_Docs") + Exit For + End Try + + Next End If - For Each oRow As DataRow In CURR_DT_OVERVIEW.Rows - Try - Dim oCONVYN As Boolean = oRow.Item("CONV_YN") - Select Case oCONVYN - Case True - ' RedDocuments += 1 - oRow.Item("CONVERSATION") = My.Resources.conversation - End Select - Catch ex As Exception - LOGGER.Warn("Check wether Column CONVERSATION is part of select/view") - End Try - Next bindsourcegrid.DataSource = CURR_DT_OVERVIEW GridControl_Docs.DataSource = bindsourcegrid + Dim objectCount_Descr = CURR_DT_OVERVIEW.Rows.Count.ToString If USER_LANGUAGE = "de-DE" Then ToolStripLabelViewTape.Text = "Gesamtübersicht" + objectCount_Descr &= " Vorgänge" Else ToolStripLabelViewTape.Text = "Overview" + objectCount_Descr &= " objects" End If + tslblObjectCount.Text = objectCount_Descr + tslblObjectCount.ForeColor = Color.DarkBlue Dim oColNotPartofLayout As Boolean oColNotPartofLayout = False 'GridControlDocRow.ForceInitialize() @@ -1551,13 +1596,16 @@ Public Class frmMain Catch ex As Exception LOGGER.Warn("LoadGridOverview - Check wether Column CONV_YN is part of select/view") End Try - Try - GridView_Docs.Columns.Item("CONVERSATION").MaxWidth = 24 - GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24 - GridView_Docs.Columns.Item("CONVERSATION").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left - Catch ex As Exception - LOGGER.Warn("LoadGridOverview - Check wether Column CONVERSATION is part of select/view") - End Try + If IDB_ACTIVE = True Then + Try + GridView_Docs.Columns.Item("CONVERSATION").MaxWidth = 24 + GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24 + GridView_Docs.Columns.Item("CONVERSATION").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left + Catch ex As Exception + LOGGER.Warn("LoadGridOverview - Column CONVERSATION obviously not part of GridView_Docs") + End Try + End If + 'GridView_Docs.OptionsView.ShowIndicator = False LOGGER.Debug(" GridView_Docs.Columns loaded...") @@ -1590,6 +1638,8 @@ Public Class frmMain BindingNavigator1.Visible = False BindingNavigator1.Dock = DockStyle.None GridControl_Docs.DataSource = Nothing + tslblObjectCount.Text = "No objects" + Try GridView_Docs.Columns.Clear() Catch ex As Exception @@ -2141,4 +2191,19 @@ Public Class frmMain Decide_Load(False) If GridControl_Docs.Visible = True And formopenClose = False Then RefreshHelper.LoadViewInfo() End Sub + + Private Sub GridView_Docs_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridView_Docs.ColumnFilterChanged + Try + Dim objectCount_Descr = GridView_Docs.RowCount.ToString + If USER_LANGUAGE <> "de-DE" Then + objectCount_Descr &= " objects (filtered)" + Else + objectCount_Descr &= " Vorgänge (gefiltert)" + End If + tslblObjectCount.Text = objectCount_Descr + tslblObjectCount.ForeColor = Color.DarkOrange + Catch ex As Exception + + End Try + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index fc2b74f..6083cbb 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -3336,7 +3336,7 @@ Public Class frmValidator End Try End If Case "System.Windows.Forms.CheckBox" - LOGGER.Debug("Loading checkbox.") + LOGGER.Debug("Loading checkbox...") oControlType = "CheckBox" If oSourceIndexName = "" Then MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) @@ -3344,25 +3344,14 @@ Public Class frmValidator End If If oSourceIndexName Is Nothing = False Then - Dim chk As CheckBox = oControl + Dim myCheckBox As CheckBox = oControl If oLoadIndex = False Or oSourceIndexName = "DD PM-ONLY FOR DISPLAY" Then LOGGER.Debug("Indexwert soll nicht geladen werden.") - Else - - If oDefaultValue <> String.Empty Then - Dim result = False - _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue - If Boolean.TryParse(oDefaultValue, result) Then - chk.Checked = result - Exit Select - End If - End If - End If - LOGGER.Debug("Loading Bool-Value from Windream.") + LOGGER.Debug("Loading Bool-Value from Source...") If oSourceIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then oValueFromSource = ReturnVektor_IndexValue(oSourceIndexName) @@ -3378,11 +3367,23 @@ Public Class frmValidator If oValueFromSource Is Nothing Then - LOGGER.Info(">> Zurückgegebener Wert des Wertes für Checkbox mit Indexname '" & oIndexName & "' ist nothing. Check defaultvalue") + LOGGER.Info(">> Zurückgegebener Wert des Wertes für Checkbox mit Indexname '" & oIndexName & "' ist nothing. Checking defaultvalue") + LOGGER.Debug(">> Zurückgegebener Wert des Wertes für Checkbox mit Indexname '" & oIndexName & "' ist nothing. Checking defaultvalue") + If oDefaultValue <> String.Empty Then + _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue + LOGGER.Info($"Using Default value [{oDefaultValue}]") + LOGGER.Debug($"Using Default value [{oDefaultValue}]") + myCheckBox.Checked = CBool(oDefaultValue) + Exit Select + Else + LOGGER.Debug("No Default Value for Checkbox - so using false!") + myCheckBox.Checked = False + myCheckBox.CheckState = CheckState.Unchecked + End If + - chk.Checked = False Else - LOGGER.Debug("Index value loaded: " & oValueFromSource.ToString) + LOGGER.Debug("oValueFromSource: " & oValueFromSource.ToString) _CURRENT_INDEX_ARRAY(oCount, 1) = oValueFromSource.ToString If oValueFromSource.ToString = "" Then LOGGER.Info(">> Versuch, default Value zu laden") @@ -3390,13 +3391,21 @@ Public Class frmValidator Dim result = False If Boolean.TryParse(oDefaultValue, result) Then LOGGER.Info(">> defaultValue wurde geladen") - chk.Checked = result + myCheckBox.Checked = result + If result = False Then + myCheckBox.CheckState = CheckState.Unchecked + Else + myCheckBox.CheckState = CheckState.Checked + End If + Else - chk.Checked = False + myCheckBox.Checked = False + myCheckBox.CheckState = CheckState.Unchecked End If Else LOGGER.Info(">> defaultValue war leer") - chk.Checked = False + myCheckBox.Checked = False + myCheckBox.CheckState = CheckState.Unchecked End If Else Dim _value @@ -3409,22 +3418,25 @@ Public Class frmValidator _value = oValueFromSource(0) End If Else - LOGGER.Debug("Value is not nothing and also not System.Object[]...") _value = oValueFromSource + LOGGER.Debug($"Value is not nothing and also not System.Object: [{_value}]") End If Try Select Case CBool(_value) Case True - LOGGER.Info(">> CBool(_value) = True") - chk.Checked = True - Case Else - LOGGER.Info(">> CBool(_value) = False") - chk.Checked = False + LOGGER.Debug(">> CBool(_value) = True") + myCheckBox.Checked = True + myCheckBox.CheckState = CheckState.Checked + Case False + LOGGER.Debug(">> CBool(_value) = False") + myCheckBox.Checked = False + myCheckBox.CheckState = CheckState.Unchecked End Select Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Unexpected error in CBool(wertWD) - CheckBox: " & ex.Message & vbNewLine & "Wert WD: " & oValueFromSource.ToString, True) - chk.Checked = False + myCheckBox.Checked = False + myCheckBox.CheckState = CheckState.Unchecked End Try End If End If