diff --git a/GUIs.Monitor/Data/Search.vb b/GUIs.Monitor/Data/Search.vb
index 5231d31..a450684 100644
--- a/GUIs.Monitor/Data/Search.vb
+++ b/GUIs.Monitor/Data/Search.vb
@@ -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
diff --git a/GUIs.Monitor/Forms/frmMonitor.Designer.vb b/GUIs.Monitor/Forms/frmMonitor.Designer.vb
index 890c69a..5896699 100644
--- a/GUIs.Monitor/Forms/frmMonitor.Designer.vb
+++ b/GUIs.Monitor/Forms/frmMonitor.Designer.vb
@@ -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
diff --git a/GUIs.Monitor/Forms/frmMonitor.resx b/GUIs.Monitor/Forms/frmMonitor.resx
index c01d24c..31593cc 100644
--- a/GUIs.Monitor/Forms/frmMonitor.resx
+++ b/GUIs.Monitor/Forms/frmMonitor.resx
@@ -118,7 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- 362, 17
+ 359, 17
@@ -207,18 +207,18 @@
- 196, 17
+ 193, 17
- 514, 17
+ 511, 17
- 673, 17
+ 668, 17
35
- 836, 17
+ 829, 17
\ No newline at end of file
diff --git a/GUIs.Monitor/Helper/ParameterLoader.vb b/GUIs.Monitor/Helper/ParameterLoader.vb
index 6d40aa5..b3d5c9a 100644
--- a/GUIs.Monitor/Helper/ParameterLoader.vb
+++ b/GUIs.Monitor/Helper/ParameterLoader.vb
@@ -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
diff --git a/GUIs.Monitor/Helper/SearchLoader.vb b/GUIs.Monitor/Helper/SearchLoader.vb
index 9efe636..0496ef5 100644
--- a/GUIs.Monitor/Helper/SearchLoader.vb
+++ b/GUIs.Monitor/Helper/SearchLoader.vb
@@ -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)),
diff --git a/GUIs.Monitor/My Project/AssemblyInfo.vb b/GUIs.Monitor/My Project/AssemblyInfo.vb
index a0732ea..aef1138 100644
--- a/GUIs.Monitor/My Project/AssemblyInfo.vb
+++ b/GUIs.Monitor/My Project/AssemblyInfo.vb
@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
-
+
' 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.*")]
-
-
+
+