V 2.4.0.1 FormDesigner Verbesserungen, Monitoring Bug Objektverweis bei 4. Grid

This commit is contained in:
Developer01 2025-04-01 08:19:42 +02:00
parent a16308c1cd
commit f9ae01b631
8 changed files with 210 additions and 77 deletions

View File

@ -158,6 +158,24 @@ Public Class ClassParamRefresh
Catch ex As Exception Catch ex As Exception
LAST_ADDED_COLUMN = "" LAST_ADDED_COLUMN = ""
End Try
ElseIf oMode.StartsWith("PM.MON_COL_CHANGED_WHEN") Then
Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_CHANGED_WHEN=", "")
Try
MON_EDITED_COLUMN = oLEDITEDCOL
LOGGER.Debug($"MON_EDITED_COLUMN: {oLEDITEDCOL}")
Catch ex As Exception
End Try
ElseIf oMode.StartsWith("PM.MON_COL_ADDED_WHEN") Then
Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_ADDED_WHEN=", "")
Try
MON_ADDED_COLUMN = oLEDITEDCOL
LOGGER.Debug($"MON_COL_ADDED_WHEN: {oLEDITEDCOL}")
Catch ex As Exception
End Try End Try
ElseIf oMode.StartsWith("PM.USE_APPSERVER") Then ElseIf oMode.StartsWith("PM.USE_APPSERVER") Then
Dim oUSE_APPSERVER = oMode.Replace("PM.USE_APPSERVER=", "") Dim oUSE_APPSERVER = oMode.Replace("PM.USE_APPSERVER=", "")

View File

@ -91,6 +91,8 @@ Module ModuleRuntimeVariables
Public Property INACTIVITYRecognized As Boolean = False Public Property INACTIVITYRecognized As Boolean = False
Public Property LAST_EDITED_COLUMN As String = "NONE" Public Property LAST_EDITED_COLUMN As String = "NONE"
Public Property LAST_ADDED_COLUMN As String = "NONE" Public Property LAST_ADDED_COLUMN As String = "NONE"
Public Property MON_EDITED_COLUMN As String = "NONE"
Public Property MON_ADDED_COLUMN As String = "NONE"
Public Property USE_APPSERVER As Boolean = False Public Property USE_APPSERVER As Boolean = False
Public Property SEARCH1 As String = "" Public Property SEARCH1 As String = ""
Public Property SEARCH2 As String = "" Public Property SEARCH2 As String = ""

View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.5.4.0")> <Assembly: AssemblyVersion("2.5.4.1")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguage("")> <Assembly: NeutralResourcesLanguage("")>

View File

@ -155,8 +155,9 @@
<Reference Include="DigitalData.Controls.LookupGrid"> <Reference Include="DigitalData.Controls.LookupGrid">
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Controls.SnapPanel"> <Reference Include="DigitalData.Controls.SnapPanel, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.GUIs.Common, Version=2.6.2.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.GUIs.Common, Version=2.6.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DigitalData.GUIs.Common.2.6.2\lib\net462\DigitalData.GUIs.Common.dll</HintPath> <HintPath>..\packages\DigitalData.GUIs.Common.2.6.2\lib\net462\DigitalData.GUIs.Common.dll</HintPath>

View File

@ -49,12 +49,12 @@ Partial Class frmFormDesigner
Me.bbtniheight_plus = New DevExpress.XtraBars.BarButtonItem() Me.bbtniheight_plus = New DevExpress.XtraBars.BarButtonItem()
Me.bbtniheight_min = New DevExpress.XtraBars.BarButtonItem() Me.bbtniheight_min = New DevExpress.XtraBars.BarButtonItem()
Me.tslblAenderungen = New DevExpress.XtraBars.BarStaticItem() Me.tslblAenderungen = New DevExpress.XtraBars.BarStaticItem()
Me.bstitmProfilID = New DevExpress.XtraBars.BarStaticItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonGroupControlFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroupControlFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonGroupControls = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroupControls = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibPGCtrlWidth = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibPGCtrlWidth = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibPGCtrlheight = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet()
@ -73,6 +73,8 @@ Partial Class frmFormDesigner
Me.RPGControlFunction = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RPGControlFunction = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibPGCtrlheight = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
CType(Me.SplitContainerDesigner, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerDesigner, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerDesigner.Panel1.SuspendLayout() Me.SplitContainerDesigner.Panel1.SuspendLayout()
Me.SplitContainerDesigner.Panel2.SuspendLayout() Me.SplitContainerDesigner.Panel2.SuspendLayout()
@ -125,9 +127,9 @@ Partial Class frmFormDesigner
'RibbonControl1 'RibbonControl1
' '
Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.RibbonControl1.ExpandCollapseItem.Id = 0
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.BarButtonItem4, Me.BarButtonItem5, Me.bbtnitLabel, Me.bbtnitTextBox, Me.bbtnitLU, Me.bbtnitTable, Me.bbtnitDatePicker, Me.bbtnitCheckBox, Me.bbtnitButton, Me.bbtnitLine, Me.bbtniwidth_plus, Me.bbtniwidth_min, Me.bbtniheight_plus, Me.bbtniheight_min, Me.tslblAenderungen}) Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.BarButtonItem4, Me.BarButtonItem5, Me.bbtnitLabel, Me.bbtnitTextBox, Me.bbtnitLU, Me.bbtnitTable, Me.bbtnitDatePicker, Me.bbtnitCheckBox, Me.bbtnitButton, Me.bbtnitLine, Me.bbtniwidth_plus, Me.bbtniwidth_min, Me.bbtniheight_plus, Me.bbtniheight_min, Me.tslblAenderungen, Me.bstitmProfilID})
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 21 Me.RibbonControl1.MaxItemId = 22
Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@ -283,9 +285,15 @@ Partial Class frmFormDesigner
Me.tslblAenderungen.Name = "tslblAenderungen" Me.tslblAenderungen.Name = "tslblAenderungen"
Me.tslblAenderungen.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.tslblAenderungen.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
' '
'bstitmProfilID
'
resources.ApplyResources(Me.bstitmProfilID, "bstitmProfilID")
Me.bstitmProfilID.Id = 21
Me.bstitmProfilID.Name = "bstitmProfilID"
'
'RibbonPage1 'RibbonPage1
' '
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonGroupControlFunctions, Me.RibbonGroupControls, Me.RibPGCtrlWidth, Me.RibPGCtrlheight}) Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonGroupControlFunctions, Me.RibbonGroupControls, Me.RibPGCtrlWidth, Me.RibbonPageGroup2})
Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Name = "RibbonPage1"
resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
' '
@ -318,20 +326,15 @@ Partial Class frmFormDesigner
' '
'RibPGCtrlWidth 'RibPGCtrlWidth
' '
Me.RibPGCtrlWidth.AllowTextClipping = False
Me.RibPGCtrlWidth.ItemLinks.Add(Me.bbtniwidth_plus) Me.RibPGCtrlWidth.ItemLinks.Add(Me.bbtniwidth_plus)
Me.RibPGCtrlWidth.ItemLinks.Add(Me.bbtniwidth_min) Me.RibPGCtrlWidth.ItemLinks.Add(Me.bbtniwidth_min)
Me.RibPGCtrlWidth.Name = "RibPGCtrlWidth" Me.RibPGCtrlWidth.Name = "RibPGCtrlWidth"
resources.ApplyResources(Me.RibPGCtrlWidth, "RibPGCtrlWidth") resources.ApplyResources(Me.RibPGCtrlWidth, "RibPGCtrlWidth")
' '
'RibPGCtrlheight
'
Me.RibPGCtrlheight.ItemLinks.Add(Me.bbtniheight_plus)
Me.RibPGCtrlheight.ItemLinks.Add(Me.bbtniheight_min)
Me.RibPGCtrlheight.Name = "RibPGCtrlheight"
resources.ApplyResources(Me.RibPGCtrlheight, "RibPGCtrlheight")
'
'RibbonStatusBar1 'RibbonStatusBar1
' '
Me.RibbonStatusBar1.ItemLinks.Add(Me.bstitmProfilID)
Me.RibbonStatusBar1.ItemLinks.Add(Me.tslblAenderungen) Me.RibbonStatusBar1.ItemLinks.Add(Me.tslblAenderungen)
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1") resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
@ -426,6 +429,22 @@ Partial Class frmFormDesigner
Me.RibbonPageGroup4.Name = "RibbonPageGroup4" Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
' '
'RibPGCtrlheight
'
Me.RibPGCtrlheight.AllowTextClipping = False
Me.RibPGCtrlheight.ItemLinks.Add(Me.bbtniheight_plus)
Me.RibPGCtrlheight.ItemLinks.Add(Me.bbtniheight_min)
Me.RibPGCtrlheight.Name = "RibPGCtrlheight"
resources.ApplyResources(Me.RibPGCtrlheight, "RibPGCtrlheight")
'
'RibbonPageGroup2
'
Me.RibbonPageGroup2.AllowTextClipping = False
Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniheight_plus)
Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniheight_min)
Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
'
'frmFormDesigner 'frmFormDesigner
' '
Me.Appearance.Options.UseFont = True Me.Appearance.Options.UseFont = True
@ -436,6 +455,7 @@ Partial Class frmFormDesigner
Me.Controls.Add(Me.RibbonControl1) Me.Controls.Add(Me.RibbonControl1)
Me.IconOptions.Icon = CType(resources.GetObject("frmFormDesigner.IconOptions.Icon"), System.Drawing.Icon) Me.IconOptions.Icon = CType(resources.GetObject("frmFormDesigner.IconOptions.Icon"), System.Drawing.Icon)
Me.IconOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.chartdesigner1 Me.IconOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.chartdesigner1
Me.KeyPreview = True
Me.MinimizeBox = False Me.MinimizeBox = False
Me.Name = "frmFormDesigner" Me.Name = "frmFormDesigner"
Me.Ribbon = Me.RibbonControl1 Me.Ribbon = Me.RibbonControl1
@ -503,8 +523,10 @@ Partial Class frmFormDesigner
Friend WithEvents bbtniheight_plus As DevExpress.XtraBars.BarButtonItem Friend WithEvents bbtniheight_plus As DevExpress.XtraBars.BarButtonItem
Friend WithEvents bbtniheight_min As DevExpress.XtraBars.BarButtonItem Friend WithEvents bbtniheight_min As DevExpress.XtraBars.BarButtonItem
Friend WithEvents RibPGCtrlWidth As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibPGCtrlWidth As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents RibPGCtrlheight As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents pnldesigner As DigitalData.Controls.SnapPanel.ClassSnapPanel Friend WithEvents pnldesigner As DigitalData.Controls.SnapPanel.ClassSnapPanel
Friend WithEvents tslblAenderungen As DevExpress.XtraBars.BarStaticItem Friend WithEvents tslblAenderungen As DevExpress.XtraBars.BarStaticItem
Friend WithEvents pgControlsNew As DevExpress.XtraVerticalGrid.PropertyGridControl Friend WithEvents pgControlsNew As DevExpress.XtraVerticalGrid.PropertyGridControl
Friend WithEvents bstitmProfilID As DevExpress.XtraBars.BarStaticItem
Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents RibPGCtrlheight As DevExpress.XtraBars.Ribbon.RibbonPageGroup
End Class End Class

View File

@ -125,6 +125,10 @@
<data name="SplitContainerDesigner.Location" type="System.Drawing.Point, System.Drawing"> <data name="SplitContainerDesigner.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 132</value> <value>0, 132</value>
</data> </data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pnldesigner.AutoScroll" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="pnldesigner.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="pnldesigner.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
@ -134,15 +138,14 @@
<data name="pnldesigner.Size" type="System.Drawing.Size, System.Drawing"> <data name="pnldesigner.Size" type="System.Drawing.Size, System.Drawing">
<value>820, 455</value> <value>820, 455</value>
</data> </data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pnldesigner.TabIndex" type="System.Int32, mscorlib"> <data name="pnldesigner.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>0</value>
</data> </data>
<data name="&gt;&gt;pnldesigner.Name" xml:space="preserve"> <data name="&gt;&gt;pnldesigner.Name" xml:space="preserve">
<value>pnldesigner</value> <value>pnldesigner</value>
</data> </data>
<data name="&gt;&gt;pnldesigner.Type" xml:space="preserve"> <data name="&gt;&gt;pnldesigner.Type" xml:space="preserve">
<value>DigitalData.Controls.SnapPanel.ClassSnapPanel, DigitalData.Controls.SnapPanel, Version=1.0.1.0, Culture=neutral, PublicKeyToken=null</value> <value>DigitalData.Controls.SnapPanel.ClassSnapPanel, DigitalData.Controls.SnapPanel, Version=2.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;pnldesigner.Parent" xml:space="preserve"> <data name="&gt;&gt;pnldesigner.Parent" xml:space="preserve">
<value>SplitContainerDesigner.Panel1</value> <value>SplitContainerDesigner.Panel1</value>
@ -197,7 +200,7 @@
</value> </value>
</data> </data>
<data name="BarButtonItem1.Caption" xml:space="preserve"> <data name="BarButtonItem1.Caption" xml:space="preserve">
<value>Control löschen</value> <value>Löschen (entf)</value>
</data> </data>
<data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
@ -221,7 +224,7 @@
</value> </value>
</data> </data>
<data name="BarButtonItem2.Caption" xml:space="preserve"> <data name="BarButtonItem2.Caption" xml:space="preserve">
<value>Aktualisieren</value> <value>Aktualisieren (F5)</value>
</data> </data>
<data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
@ -418,6 +421,9 @@
<data name="tslblAenderungen.Caption" xml:space="preserve"> <data name="tslblAenderungen.Caption" xml:space="preserve">
<value>Noch keine Änderungen</value> <value>Noch keine Änderungen</value>
</data> </data>
<data name="bstitmProfilID.Caption" xml:space="preserve">
<value>ProfilID: </value>
</data>
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing"> <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
@ -431,10 +437,10 @@
<value>Controls einfügen</value> <value>Controls einfügen</value>
</data> </data>
<data name="RibPGCtrlWidth.Text" xml:space="preserve"> <data name="RibPGCtrlWidth.Text" xml:space="preserve">
<value>Control - Breite</value> <value>Control - Breite (+/-)</value>
</data> </data>
<data name="RibPGCtrlheight.Text" xml:space="preserve"> <data name="RibbonPageGroup2.Text" xml:space="preserve">
<value>Control - Höhe</value> <value>Control-Höhe (Strg + +/-)</value>
</data> </data>
<data name="RibbonPage1.Text" xml:space="preserve"> <data name="RibbonPage1.Text" xml:space="preserve">
<value>Start</value> <value>Start</value>
@ -536,7 +542,7 @@
<value>820</value> <value>820</value>
</data> </data>
<data name="SplitContainerDesigner.TabIndex" type="System.Int32, mscorlib"> <data name="SplitContainerDesigner.TabIndex" type="System.Int32, mscorlib">
<value>25</value> <value>0</value>
</data> </data>
<data name="&gt;&gt;SplitContainerDesigner.Name" xml:space="preserve"> <data name="&gt;&gt;SplitContainerDesigner.Name" xml:space="preserve">
<value>SplitContainerDesigner</value> <value>SplitContainerDesigner</value>
@ -613,6 +619,9 @@
<data name="RibbonPageGroup4.Text" xml:space="preserve"> <data name="RibbonPageGroup4.Text" xml:space="preserve">
<value>RibbonPageGroup4</value> <value>RibbonPageGroup4</value>
</data> </data>
<data name="RibPGCtrlheight.Text" xml:space="preserve">
<value>Control - Höhe (Strg + +/-)</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@ -1176,6 +1185,12 @@
<data name="&gt;&gt;tslblAenderungen.Type" xml:space="preserve"> <data name="&gt;&gt;tslblAenderungen.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;bstitmProfilID.Name" xml:space="preserve">
<value>bstitmProfilID</value>
</data>
<data name="&gt;&gt;bstitmProfilID.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve"> <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
<value>RibbonPage1</value> <value>RibbonPage1</value>
</data> </data>
@ -1206,12 +1221,6 @@
<data name="&gt;&gt;RibPGCtrlWidth.Type" xml:space="preserve"> <data name="&gt;&gt;RibPGCtrlWidth.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;RibPGCtrlheight.Name" xml:space="preserve">
<value>RibPGCtrlheight</value>
</data>
<data name="&gt;&gt;RibPGCtrlheight.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;TBPM_PROFILE_CONTROLSBindingSource.Name" xml:space="preserve"> <data name="&gt;&gt;TBPM_PROFILE_CONTROLSBindingSource.Name" xml:space="preserve">
<value>TBPM_PROFILE_CONTROLSBindingSource</value> <value>TBPM_PROFILE_CONTROLSBindingSource</value>
</data> </data>
@ -1308,16 +1317,22 @@
<data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve"> <data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;RibPGCtrlheight.Name" xml:space="preserve">
<value>RibPGCtrlheight</value>
</data>
<data name="&gt;&gt;RibPGCtrlheight.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RibbonPageGroup2.Name" xml:space="preserve">
<value>RibbonPageGroup2</value>
</data>
<data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmFormDesigner</value> <value>frmFormDesigner</value>
</data> </data>
<data name="&gt;&gt;$this.Type" xml:space="preserve"> <data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="RibbonPageGroup3.Text">
<value>Steuerelement</value>
</data>
<data name="rpggrp_controls.Text">
<value>Steuerelement hinzufügen</value>
</data>
</root> </root>

View File

@ -11,6 +11,7 @@ Imports System.Drawing
Imports DigitalData.GUIs.Common Imports DigitalData.GUIs.Common
Imports DevExpress.Utils.Filtering.Internal Imports DevExpress.Utils.Filtering.Internal
Imports DevExpress.XtraEditors Imports DevExpress.XtraEditors
Imports DevExpress.Utils.Controls
Public Class frmFormDesigner Public Class frmFormDesigner
Public ProfileId As Integer Public ProfileId As Integer
@ -71,7 +72,7 @@ Public Class frmFormDesigner
' Setzt den typ des SQL-Befehls für frmSQL_DESIGNER ' Setzt den typ des SQL-Befehls für frmSQL_DESIGNER
CURRENT_DESIGN_TYPE = "INPUT_INDEX" CURRENT_DESIGN_TYPE = "INPUT_INDEX"
CHANGES_FORM_DESIGN = False CHANGES_FORM_DESIGN = False
bstitmProfilID.Caption = $"ProfilID: {ProfileId.ToString}"
' Profil Name in Fenstertitel setzen ' Profil Name in Fenstertitel setzen
Text = $"Validation Designer - Profil: {ProfileName}" Text = $"Validation Designer - Profil: {ProfileName}"
@ -320,6 +321,7 @@ Public Class frmFormDesigner
SetMovementHandlers(oButton) SetMovementHandlers(oButton)
End Select End Select
Next Next
Catch ex As Exception Catch ex As Exception
_Logger.Error(ex) _Logger.Error(ex)
MsgBox("Unexpected error in LoadControls " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") MsgBox("Unexpected error in LoadControls " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
@ -408,16 +410,12 @@ Public Class frmFormDesigner
Sub DeleteControl(controlName As String) Sub DeleteControl(controlName As String)
Try Try
Dim result As MsgBoxResult = MsgBox("Wollen Sie das Control: " & controlName & " wirklich löschen?", MsgBoxStyle.YesNo, "Bestätigung:")
' wenn Speichern ja
If result = MsgBoxResult.Yes Then
Dim controlId As Integer = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(ProfileId, controlName) Dim controlId As Integer = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(ProfileId, controlName)
If controlId > 0 Then If controlId > 0 Then
TBPM_CONTROL_TABLETableAdapter.DeleteColumnsByControlId(controlId) TBPM_CONTROL_TABLETableAdapter.DeleteColumnsByControlId(controlId)
TBPM_PROFILE_CONTROLSTableAdapter.Delete(controlId) TBPM_PROFILE_CONTROLSTableAdapter.Delete(controlId)
LoadControls() LoadControls()
End If End If
End If
Catch ex As Exception Catch ex As Exception
_Logger.Error(ex) _Logger.Error(ex)
MsgBox(ex.Message, MsgBoxStyle.Critical, "DeleteControl:") MsgBox(ex.Message, MsgBoxStyle.Critical, "DeleteControl:")
@ -1018,20 +1016,30 @@ Public Class frmFormDesigner
End Sub End Sub
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
Control_Delete()
End Sub
Sub Control_Delete()
If CurrentControl Is Nothing = False Then If CurrentControl Is Nothing = False Then
Dim result As MsgBoxResult = MsgBox("Wollen Sie das Control: " & CurrentControl.Name & " wirklich löschen?", MsgBoxStyle.YesNo, "Bestätigung:")
' wenn Speichern ja
If result = MsgBoxResult.Yes Then
DeleteControl(CurrentControl.Name) DeleteControl(CurrentControl.Name)
'pgControls.Enabled = False 'pgControls.Enabled = False
pgControlsNew.Enabled = False pgControlsNew.Enabled = False
tslblAenderungen.Caption = $"Control {CurrentControl.Name} deleted - " + Now.ToString
CurrentControl = Nothing CurrentControl = Nothing
RibPGCtrlheight.Enabled = False RibPGCtrlheight.Enabled = False
RibPGCtrlWidth.Enabled = False RibPGCtrlWidth.Enabled = False
Reload_ControlNameList() Reload_ControlNameList()
End If
End If End If
End Sub End Sub
Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
LoadControls() LoadControls()
tslblAenderungen.Caption = "Controls loaded - " + Now.ToString
End Sub End Sub
Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
@ -1092,13 +1100,31 @@ Public Class frmFormDesigner
End Sub End Sub
Private Sub frmFormDesigner_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp Private Sub frmFormDesigner_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp
If e.Control Then
If e.KeyCode = e.KeyCode.Delete Then
Control_Delete()
ElseIf e.KeyCode = e.KeyCode.F5 Then
LoadControls()
tslblAenderungen.Caption = "Controls loaded - " + Now.ToString
ElseIf e.KeyCode = e.KeyCode.Add Then
Height_plus()
ElseIf e.KeyCode = e.KeyCode.Subtract Then
Height_minus()
End If
Else
If e.KeyCode = Keys.Escape Then If e.KeyCode = Keys.Escape Then
If Me.Cursor = Cursors.Cross Then If Me.Cursor = Cursors.Cross Then
Mouse_IsPressed = False Mouse_IsPressed = False
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
End If End If
ElseIf e.KeyCode = e.KeyCode.Add Then
Width_More()
ElseIf e.KeyCode = e.KeyCode.Subtract Then
Width_min()
End If End If
End If
End Sub End Sub
Private Sub pnldesigner_MouseDown(sender As Object, e As MouseEventArgs) Handles pnldesigner.MouseDown Private Sub pnldesigner_MouseDown(sender As Object, e As MouseEventArgs) Handles pnldesigner.MouseDown
@ -1268,6 +1294,9 @@ Public Class frmFormDesigner
End Sub End Sub
Private Sub bbtniwidth_plus_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniwidth_plus.ItemClick Private Sub bbtniwidth_plus_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniwidth_plus.ItemClick
Width_More()
End Sub
Sub Width_More()
If CurrentControl Is Nothing = False Then If CurrentControl Is Nothing = False Then
CurrentControl.Size = New Size(CurrentControl.Width + 5, CurrentControl.Height) CurrentControl.Size = New Size(CurrentControl.Width + 5, CurrentControl.Height)
DirectCast(pgControlsNew.SelectedObject, BaseProperties).Size = CurrentControl.Size DirectCast(pgControlsNew.SelectedObject, BaseProperties).Size = CurrentControl.Size
@ -1276,8 +1305,10 @@ Public Class frmFormDesigner
UpdateSingleValue("WIDTH", CurrentControl.Size.Width) UpdateSingleValue("WIDTH", CurrentControl.Size.Width)
End If End If
End Sub End Sub
Private Sub bbtniwidth_min_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniwidth_min.ItemClick Private Sub bbtniwidth_min_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniwidth_min.ItemClick
Width_min()
End Sub
Sub Width_min()
If CurrentControl Is Nothing = False Then If CurrentControl Is Nothing = False Then
Dim newWidth = CurrentControl.Width - 5 Dim newWidth = CurrentControl.Width - 5
' Verhindert, dass das Control unsichtbar wird ' Verhindert, dass das Control unsichtbar wird
@ -1293,6 +1324,9 @@ Public Class frmFormDesigner
End Sub End Sub
Private Sub bbtniheight_min_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniheight_min.ItemClick Private Sub bbtniheight_min_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniheight_min.ItemClick
Height_minus()
End Sub
Sub Height_minus()
If CurrentControl Is Nothing = False Then If CurrentControl Is Nothing = False Then
Dim newHeight As Integer = CurrentControl.Height - 5 Dim newHeight As Integer = CurrentControl.Height - 5
@ -1313,8 +1347,11 @@ Public Class frmFormDesigner
UpdateSingleValue("HEIGHT", newHeight) UpdateSingleValue("HEIGHT", newHeight)
End If End If
End Sub End Sub
Private Sub bbtniheight_plus_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniheight_plus.ItemClick Private Sub bbtniheight_plus_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniheight_plus.ItemClick
Height_plus()
End Sub
Sub Height_plus()
If CurrentControl Is Nothing = False Then If CurrentControl Is Nothing = False Then
Dim newHeight As Integer = CurrentControl.Height + 5 Dim newHeight As Integer = CurrentControl.Height + 5
@ -1330,6 +1367,4 @@ Public Class frmFormDesigner
UpdateSingleValue("HEIGHT", newHeight) UpdateSingleValue("HEIGHT", newHeight)
End If End If
End Sub End Sub
End Class End Class

View File

@ -64,13 +64,7 @@ Public Class frmMonitor
LOGGER.Debug($"Found {oDT2.Rows.Count} rows for GridView2") LOGGER.Debug($"Found {oDT2.Rows.Count} rows for GridView2")
GridView2.Columns.Clear() GridView2.Columns.Clear()
GridControl2.DataSource = oDT2 GridControl2.DataSource = oDT2
Try Format_Datetime_Columns(GridView2, "Grid 2")
GridView2.Columns("Wann").DisplayFormat.FormatType = FormatType.DateTime
GridView2.Columns("Wann").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
Catch ex As Exception
GridView2.Columns("When").DisplayFormat.FormatType = FormatType.DateTime
GridView2.Columns("When").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
End Try
End If End If
If DT_MONITOR_KONFIG.Rows.Count > 2 Then If DT_MONITOR_KONFIG.Rows.Count > 2 Then
@ -86,6 +80,7 @@ Public Class frmMonitor
LOGGER.Debug($"Found {oDT3.Rows.Count} rows for GridView3") LOGGER.Debug($"Found {oDT3.Rows.Count} rows for GridView3")
GridView3.Columns.Clear() GridView3.Columns.Clear()
GridControl3.DataSource = oDT3 GridControl3.DataSource = oDT3
Format_Datetime_Columns(GridView3, "Grid 3")
End If End If
If DT_MONITOR_KONFIG.Rows.Count = 4 Then If DT_MONITOR_KONFIG.Rows.Count = 4 Then
LOGGER.Debug($"DT_MONITOR_KONFIG.Rows.Count = 4") LOGGER.Debug($"DT_MONITOR_KONFIG.Rows.Count = 4")
@ -100,13 +95,14 @@ Public Class frmMonitor
LOGGER.Debug($"Found {oDT4.Rows.Count} rows for GridView4") LOGGER.Debug($"Found {oDT4.Rows.Count} rows for GridView4")
GridView4.Columns.Clear() GridView4.Columns.Clear()
GridControl4.DataSource = oDT4 GridControl4.DataSource = oDT4
Try Format_Datetime_Columns(GridView4, "Grid 4")
GridView4.Columns("Geändert wann").DisplayFormat.FormatType = FormatType.DateTime 'Try
GridView4.Columns("Geändert wann").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" ' GridView4.Columns("Geändert wann").DisplayFormat.FormatType = FormatType.DateTime
Catch ex As Exception ' GridView4.Columns("Geändert wann").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
GridView4.Columns("Changed when").DisplayFormat.FormatType = FormatType.DateTime 'Catch ex As Exception
GridView4.Columns("Changed when").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" ' GridView4.Columns("Changed when").DisplayFormat.FormatType = FormatType.DateTime
End Try ' GridView4.Columns("Changed when").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
'End Try
End If End If
End If End If
End If End If
@ -125,6 +121,49 @@ Public Class frmMonitor
End Try End Try
End Sub End Sub
Sub Format_Datetime_Columns(pGridView As GridView, pWhichGridView As String)
Dim oColExists As Boolean = False
Try
If MON_ADDED_COLUMN <> "None" Then
MON_ADDED_COLUMN = MON_ADDED_COLUMN.Replace("[", "")
MON_ADDED_COLUMN = MON_ADDED_COLUMN.Replace("]", "")
For Each ocol As Columns.GridColumn In pGridView.Columns
If ocol.ToString = MON_ADDED_COLUMN Then
oColExists = True
Exit For
End If
Next
If oColExists Then
pGridView.Columns(MON_ADDED_COLUMN).DisplayFormat.FormatType = FormatType.DateTime
pGridView.Columns(MON_ADDED_COLUMN).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
End If
End If
Catch ex As Exception
LOGGER.Warn($"Error formatting column [{MON_ADDED_COLUMN}] {ex.Message} - Check wether it exists in columns of GridView [{pWhichGridView}]!")
End Try
Try
If MON_EDITED_COLUMN <> "None" Then
oColExists = False
For Each ocol As Columns.GridColumn In pGridView.Columns
If ocol.ToString = MON_EDITED_COLUMN Then
oColExists = True
Exit For
End If
Next
If oColExists Then
pGridView.Columns(MON_EDITED_COLUMN).DisplayFormat.FormatType = FormatType.DateTime
pGridView.Columns(MON_EDITED_COLUMN).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
End If
End If
Catch ex As Exception
LOGGER.Warn($"Error formatting column [{MON_EDITED_COLUMN}] {ex.Message} - Check wether it exists in columns of GridView [{pWhichGridView}]!")
End Try
End Sub
Sub Load_Doc(oDocPath As String) Sub Load_Doc(oDocPath As String)
Try Try
If SplitContainerControlMain.Collapsed = False And oDocPath <> String.Empty Then If SplitContainerControlMain.Collapsed = False And oDocPath <> String.Empty Then
@ -210,6 +249,7 @@ Public Class frmMonitor
GRID1_TITLE = DT_MONITOR_KONFIG.Rows(0).Item("GRID_TITLE") GRID1_TITLE = DT_MONITOR_KONFIG.Rows(0).Item("GRID_TITLE")
GridView1.ViewCaption = GRID1_TITLE GridView1.ViewCaption = GRID1_TITLE
Format_Datetime_Columns(GridView1, "Grid 1")
Try Try
'GridView1.Columns.Item("FULL_FILE_PATH").Visible = False 'GridView1.Columns.Item("FULL_FILE_PATH").Visible = False
Catch ex As Exception Catch ex As Exception