AppCustom/Monitor
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monitor: version 1.7.1.0 - Anzeige von Caption und Comment

Browse Source
This commit is contained in:
PitzM
2026-05-08 10:13:11 +02:00
parent d1308d8b78
commit 4ffebf147a
6 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
GUIs.Monitor/Data/Search.vb
View File

@@ -2,6 +2,7 @@
Public Id As Integer
Public Title As String
Public Caption As String
Public Comment As String
Public SQLCommand As String
Public ReturnType As Constants.ReturnTypeEnum
Public ExpectedParameterCount As Integer

5
GUIs.Monitor/Forms/frmMonitor.Designer.vb generated
View File

@@ -356,6 +356,7 @@ Partial Class frmMonitor
Me.DocumentViewer1.Name = "DocumentViewer1"
Me.DocumentViewer1.Size = New System.Drawing.Size(388, 562)
Me.DocumentViewer1.TabIndex = 0
Me.DocumentViewer1.Viewer_ForceTemporaryMode = False
'
'XtraTabPageFile2
'
@@ -372,6 +373,7 @@ Partial Class frmMonitor
Me.DocumentViewer2.Name = "DocumentViewer2"
Me.DocumentViewer2.Size = New System.Drawing.Size(388, 562)
Me.DocumentViewer2.TabIndex = 1
Me.DocumentViewer2.Viewer_ForceTemporaryMode = False
'
'XtraTabPageHtml1
'
@@ -492,6 +494,7 @@ Partial Class frmMonitor
Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Top
Me.LayoutControl2.Location = New System.Drawing.Point(0, 0)
Me.LayoutControl2.Name = "LayoutControl2"
Me.LayoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(249, 90, 650, 400)
Me.LayoutControl2.Root = Me.LayoutControlGroup1
Me.LayoutControl2.Size = New System.Drawing.Size(235, 83)
Me.LayoutControl2.TabIndex = 1
@@ -514,7 +517,7 @@ Partial Class frmMonitor
Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
Me.LayoutControlGroup1.GroupBordersVisible = False
Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.lbParams, Me.EmptySpaceItem1})
Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
Me.LayoutControlGroup1.Name = "Root"
Me.LayoutControlGroup1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 0)
Me.LayoutControlGroup1.Size = New System.Drawing.Size(235, 83)
Me.LayoutControlGroup1.TextVisible = False

10
GUIs.Monitor/Forms/frmMonitor.resx
View File

@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="ApplicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>362, 17</value>
<value>359, 17</value>
</metadata>
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="btnExportChart2PDF.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -207,18 +207,18 @@
</value>
</data>
<metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>196, 17</value>
<value>193, 17</value>
</metadata>
<metadata name="XtraSaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>514, 17</value>
<value>511, 17</value>
</metadata>
<metadata name="AdornerUIManager2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>673, 17</value>
<value>668, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>35</value>
</metadata>
<metadata name="WorkspaceManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>836, 17</value>
<value>829, 17</value>
</metadata>
</root>

38
GUIs.Monitor/Helper/ParameterLoader.vb
View File

@@ -1,4 +1,5 @@
Imports DevExpress.Utils
Imports DevExpress.Data.ExpressionEditor
Imports DevExpress.Utils
Imports DevExpress.XtraEditors
Imports DevExpress.XtraEditors.Controls
Imports DevExpress.XtraLayout
@@ -42,9 +43,11 @@ Public Class ParameterLoader
End Function
Public Sub LoadParameters(pSearch As Search)
For Each oParam As SearchParameter In pSearch.Parameters
Dim oControl As Control
Dim oControl As Control
For Each oParam As SearchParameter In pSearch.Parameters
oControl = Nothing
Select Case oParam.DataType
Case Constants.DataTypeEnum.Boolean
Dim oDefaultValue As Boolean = GetDefaultValue(oParam)
@@ -52,7 +55,6 @@ Public Class ParameterLoader
.Text = oParam.Title,
.Checked = oDefaultValue
}
oControl = oCheckbox
@@ -127,9 +129,33 @@ Public Class ParameterLoader
oItem.TextLocation = Locations.Top
oItem.TextToControlDistance = 3
oItem.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 10, 0)
Next
If String.IsNullOrEmpty(pSearch.Caption) = False Then
' Beschreibung anzeigen
Dim oMemoEdit = New MemoEdit() With {
.EditValue = pSearch.Caption,
.ReadOnly = True,
.BorderStyle = BorderStyles.NoBorder
}
oMemoEdit.Name = "SearchCaption"
oMemoEdit.Tag = "SearchCaption"
oMemoEdit.Properties.ScrollBars = ScrollBars.None
If String.IsNullOrEmpty(pSearch.Comment) = False Then
oMemoEdit.ToolTip = pSearch.Comment
End If
Dim oItem1 As LayoutControlItem = LayoutControl.AddItem()
oItem1.Text = "Beschreibung:"
oItem1.Control = oMemoEdit
oItem1.TextLocation = Locations.Top
oItem1.TextToControlDistance = 3
oItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 5, 0)
End If
End Sub
Private Function GetClearButtonForControl(pControl As Control) As EditorButton

1
GUIs.Monitor/Helper/SearchLoader.vb
View File

@@ -39,6 +39,7 @@ Public Class SearchLoader
.Id = oSearchId,
.Title = oRow.ItemEx("TITLE", String.Empty),
.Caption = oRow.ItemEx("CAPTION", String.Empty),
.Comment = oRow.ItemEx("COMMENT", String.Empty),
.ReturnType = GetReturnType(oRow.ItemEx("RETURN_TYPE", String.Empty)),
.SQLCommand = oRow.ItemEx("EXEC_SQL", String.Empty),
.UseMOTLogic = GetMOTLogicType(oRow.ItemEx("RETURN_TYPE", String.Empty)),

6
GUIs.Monitor/My Project/AssemblyInfo.vb
View File

@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("Monitor")>
<Assembly: AssemblyCopyright("Copyright © 2026")>
<Assembly: AssemblyTrademark("1.7.0.0")>
<Assembly: AssemblyTrademark("1.7.1.0")>
<Assembly: AssemblyCulture("")>
' Setting ComVisible to false makes the types in this assembly not visible
@@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:
' [assembly: AssemblyVersion("1.0.*")]
<Assembly: AssemblyVersion("1.7.0.0")>
<Assembly: AssemblyFileVersion("1.7.0.0")>
<Assembly: AssemblyVersion("1.7.1.0")>
<Assembly: AssemblyFileVersion("1.7.1.0")>