merge

GUIs.Common/Common.vbproj

@@ -61,7 +61,6 @@
     <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="GdPicture.NET.14">

GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb

@@ -1,14 +1,14 @@
 Imports System.Windows.Forms
 Imports DevExpress.XtraEditors.Repository
+Imports DevExpress.XtraSplashScreen
+Imports DevExpress.XtraEditors
+Imports DevExpress.XtraLayout
 Imports DigitalData.GUIs.Common.Base
 Imports DigitalData.Modules.EDMI.API
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.ZooFlow
-Imports DevExpress.XtraSplashScreen
-Imports DevExpress.XtraEditors
 Imports DigitalData.Modules.Base.IDB
-Imports DevExpress.XtraLayout
 
 Public Class ctrlObjectPropertyDialog
     Implements IBaseForm
@@ -21,7 +21,7 @@ Public Class ctrlObjectPropertyDialog
     Private Property Environment As Environment
     Private Property ObjectId As Long
     Private Property HostForm As Form
-    Private Property FormHelper As FormHelper
+    Private Property Helper As FormHelper
 
     Private ReadOnly Changes As New Dictionary(Of String, Object)
 
@@ -43,6 +43,7 @@ Public Class ctrlObjectPropertyDialog
         Logger = pLogConfig.GetLogger()
         HostForm = pHostForm
         ControlManager = New AttributeControls(pLogConfig, pEnv, pClient)
+        Helper = New FormHelper(pLogConfig, pHostForm)
 
         GridBuilder = New GridBuilder(ViewObjectHistory, ViewValueHistory)
         GridBuilder.
@@ -56,7 +57,7 @@ Public Class ctrlObjectPropertyDialog
         Environment = pEnv
     End Sub
 
-    Public Async Function SaveChanges() As Task
+    Public Async Function SaveChanges() As Task(Of Boolean)
         Try
             For Each oChange As KeyValuePair(Of String, Object) In Changes
                 Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString)
@@ -66,10 +67,13 @@ Public Class ctrlObjectPropertyDialog
                 })
             Next
 
-            FormHelper.ShowInfoMessage($"{Changes.Count} Änderungen gespeichert!", "SaveChanges")
+            Helper.ShowInfoMessage($"{Changes.Count} Änderungen gespeichert!", "SaveChanges")
             Changes.Clear()
+
+            Return True
         Catch ex As Exception
-            FormHelper.ShowErrorMessage(ex, "SaveChanges")
+            Helper.ShowErrorMessage(ex, "SaveChanges")
+            Return False
         End Try
     End Function
 

GUIs.Common/SQLEditor/SQLSyntaxHighlightService.vb

@@ -15,7 +15,7 @@ Namespace SQLEditor
 
         Private _keywords As Regex
         Private _quotedString As New Regex("'([^']|'')*'")
-        Private _commentedString As New Regex("(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/)")
+        Private _commentedString As New Regex("(\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/)")
         Private _placeholderString As New Regex("{#(\w+)#([\:\.\w\s_/-]+)}")
 
         Private ReadOnly keywords As New List(Of String) From {
@@ -35,12 +35,14 @@ Namespace SQLEditor
             "GO",
             "DECLARE",
             "EXECUTE",
-            "NVARCHAR",
             "FROM",
             "INTO",
             "VALUES",
             "WHERE",
-            "AND"
+            "AND",
+            "INNER",
+            "AS",
+            "IN"
         }
 
         Public Sub New(ByVal document As Document)
@@ -60,6 +62,15 @@ Namespace SQLEditor
             Dim oTokens As New List(Of SyntaxHighlightToken)()
             Dim oRanges As IEnumerable(Of DocumentRange) = Nothing
 
+            ' This is deactivated for now because it times out finding big comment in a sql
+            'Find all comments
+            'oRanges = TryCast(document.FindAll(_commentedString).GetAsFrozen(), DocumentRange())
+            'For Each oRange In oRanges
+            '    If Not IsRangeInTokens(oRange, oTokens) Then
+            '        oTokens.Add(CreateToken(oRange.Start.ToInt(), oRange.End.ToInt(), Color.Green))
+            '    End If
+            'Next
+
             ' search for quoted strings
             oRanges = document.FindAll(_quotedString).GetAsFrozen()
             For Each oRange In oRanges
@@ -82,14 +93,6 @@ Namespace SQLEditor
                 End If
             Next
 
-            'Find all comments
-            oRanges = TryCast(document.FindAll(_commentedString).GetAsFrozen(), DocumentRange())
-            For Each oRange In oRanges
-                If Not IsRangeInTokens(oRange, oTokens) Then
-                    oTokens.Add(CreateToken(oRange.Start.ToInt(), oRange.End.ToInt(), Color.Green))
-                End If
-            Next
-
             ' order tokens by their start position
             oTokens.Sort(New SyntaxHighlightTokenComparer())
 

GUIs.Common/frmDialog.Designer.vb

@@ -26,7 +26,7 @@ Partial Class frmDialog
         Me.btnPositive = New DevExpress.XtraEditors.SimpleButton()
         Me.btnNegative = New DevExpress.XtraEditors.SimpleButton()
         Me.pnlContent = New DevExpress.XtraEditors.PanelControl()
-        Me.txtContent2 = New DevExpress.XtraEditors.LabelControl()
+        Me.txtContent = New DevExpress.XtraEditors.LabelControl()
         Me.SvgImageBox1 = New DevExpress.XtraEditors.SvgImageBox()
         Me.pnlHeader = New DevExpress.XtraEditors.PanelControl()
         Me.txtTitle = New DevExpress.XtraEditors.LabelControl()
@@ -68,7 +68,7 @@ Partial Class frmDialog
         '
         'pnlContent
         '
-        Me.pnlContent.Controls.Add(Me.txtContent2)
+        Me.pnlContent.Controls.Add(Me.txtContent)
         Me.pnlContent.Controls.Add(Me.SvgImageBox1)
         Me.pnlContent.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlContent.Location = New System.Drawing.Point(0, 40)
@@ -76,19 +76,19 @@ Partial Class frmDialog
         Me.pnlContent.Size = New System.Drawing.Size(498, 131)
         Me.pnlContent.TabIndex = 3
         '
-        'txtContent2
+        'txtContent
         '
-        Me.txtContent2.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtContent2.Appearance.Options.UseFont = True
-        Me.txtContent2.Appearance.Options.UseTextOptions = True
-        Me.txtContent2.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Top
-        Me.txtContent2.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap
-        Me.txtContent2.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None
-        Me.txtContent2.Location = New System.Drawing.Point(71, 6)
-        Me.txtContent2.Name = "txtContent2"
-        Me.txtContent2.Size = New System.Drawing.Size(415, 119)
-        Me.txtContent2.TabIndex = 3
-        Me.txtContent2.Text = "LabelControl1"
+        Me.txtContent.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtContent.Appearance.Options.UseFont = True
+        Me.txtContent.Appearance.Options.UseTextOptions = True
+        Me.txtContent.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Top
+        Me.txtContent.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap
+        Me.txtContent.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None
+        Me.txtContent.Location = New System.Drawing.Point(71, 6)
+        Me.txtContent.Name = "txtContent"
+        Me.txtContent.Size = New System.Drawing.Size(415, 119)
+        Me.txtContent.TabIndex = 3
+        Me.txtContent.Text = "LabelControl1"
         '
         'SvgImageBox1
         '
@@ -182,5 +182,5 @@ Partial Class frmDialog
     Friend WithEvents SvgImageBox1 As DevExpress.XtraEditors.SvgImageBox
     Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
     Friend WithEvents txtTitle As DevExpress.XtraEditors.LabelControl
-    Friend WithEvents txtContent2 As DevExpress.XtraEditors.LabelControl
+    Friend WithEvents txtContent As DevExpress.XtraEditors.LabelControl
 End Class

GUIs.Common/frmDialog.vb

@@ -28,7 +28,7 @@ Public Class frmDialog
         InitializeComponent()
 
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
-        txtContent2.Text = pMessageText
+        txtContent.Text = pMessageText
         txtTitle.Text = pTitle
 
         Select Case pDialogType
@@ -64,11 +64,12 @@ Public Class frmDialog
 
         End Select
 
-        Dim oLineBreaks = txtContent2.Text.Split(vbNewLine).Count
+        Dim oLineBreaks = txtContent.Text.Split(vbNewLine).Count
 
         If oLineBreaks > 6 Then
             Dim oHeightOffset = oLineBreaks * 20
             Height += oHeightOffset
+            txtContent.Height += oHeightOffset
         End If
 
         btnPositive.Focus()

GUIs.Common/frmDocumentResultList.Designer.vb

@@ -100,6 +100,9 @@ Partial Class frmDocumentResultList
         Me.DockPanelFileList = New DevExpress.XtraBars.Docking.DockPanel()
         Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer()
         Me.panelContainerStatus = New DevExpress.XtraBars.Docking.DockPanel()
+        Me.DockPanelMetadata = New DevExpress.XtraBars.Docking.DockPanel()
+        Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer()
+        Me.CtrlObjectPropertyDialog = New DigitalData.GUIs.Common.ctrlObjectPropertyDialog()
         Me.DockPanelStatus = New DevExpress.XtraBars.Docking.DockPanel()
         Me.ControlContainer1 = New DevExpress.XtraBars.Docking.ControlContainer()
         Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
@@ -110,9 +113,6 @@ Partial Class frmDocumentResultList
         Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem()
-        Me.DockPanelMetadata = New DevExpress.XtraBars.Docking.DockPanel()
-        Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer()
-        Me.CtrlObjectPropertyDialog = New DigitalData.GUIs.Common.ctrlObjectPropertyDialog()
         Me.DockPanelPreview = New DevExpress.XtraBars.Docking.DockPanel()
         Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -143,6 +143,8 @@ Partial Class frmDocumentResultList
         Me.DockPanelFileList.SuspendLayout()
         Me.DockPanel2_Container.SuspendLayout()
         Me.panelContainerStatus.SuspendLayout()
+        Me.DockPanelMetadata.SuspendLayout()
+        Me.DockPanel3_Container.SuspendLayout()
         Me.DockPanelStatus.SuspendLayout()
         Me.ControlContainer1.SuspendLayout()
         CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -155,8 +157,6 @@ Partial Class frmDocumentResultList
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.DockPanelMetadata.SuspendLayout()
-        Me.DockPanel3_Container.SuspendLayout()
         Me.DockPanelPreview.SuspendLayout()
         Me.DockPanel1_Container.SuspendLayout()
         Me.SuspendLayout()
@@ -224,7 +224,6 @@ Partial Class frmDocumentResultList
         resources.ApplyResources(Me.RibbonControl, "RibbonControl")
         Me.RibbonControl.MaxItemId = 59
         Me.RibbonControl.Name = "RibbonControl"
-        Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1)
         Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPage2})
         Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemSearchControl1, Me.cmbGridFontSize})
         Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -764,9 +763,9 @@ Partial Class frmDocumentResultList
         '
         'panelContainerStatus
         '
-        Me.panelContainerStatus.ActiveChild = Me.DockPanelStatus
-        Me.panelContainerStatus.Controls.Add(Me.DockPanelStatus)
+        Me.panelContainerStatus.ActiveChild = Me.DockPanelMetadata
         Me.panelContainerStatus.Controls.Add(Me.DockPanelMetadata)
+        Me.panelContainerStatus.Controls.Add(Me.DockPanelStatus)
         Me.panelContainerStatus.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right
         Me.panelContainerStatus.ID = New System.Guid("3d77391e-21ef-4574-8521-d9f3b7468ebe")
         resources.ApplyResources(Me.panelContainerStatus, "panelContainerStatus")
@@ -774,6 +773,27 @@ Partial Class frmDocumentResultList
         Me.panelContainerStatus.OriginalSize = New System.Drawing.Size(275, 200)
         Me.panelContainerStatus.Tabbed = True
         '
+        'DockPanelMetadata
+        '
+        Me.DockPanelMetadata.Controls.Add(Me.DockPanel3_Container)
+        Me.DockPanelMetadata.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
+        Me.DockPanelMetadata.ID = New System.Guid("a7688cec-f13e-448b-82cf-a6bb020fb3f7")
+        resources.ApplyResources(Me.DockPanelMetadata, "DockPanelMetadata")
+        Me.DockPanelMetadata.Name = "DockPanelMetadata"
+        Me.DockPanelMetadata.Options.ShowCloseButton = False
+        Me.DockPanelMetadata.OriginalSize = New System.Drawing.Size(268, 413)
+        '
+        'DockPanel3_Container
+        '
+        Me.DockPanel3_Container.Controls.Add(Me.CtrlObjectPropertyDialog)
+        resources.ApplyResources(Me.DockPanel3_Container, "DockPanel3_Container")
+        Me.DockPanel3_Container.Name = "DockPanel3_Container"
+        '
+        'CtrlObjectPropertyDialog
+        '
+        resources.ApplyResources(Me.CtrlObjectPropertyDialog, "CtrlObjectPropertyDialog")
+        Me.CtrlObjectPropertyDialog.Name = "CtrlObjectPropertyDialog"
+        '
         'DockPanelStatus
         '
         Me.DockPanelStatus.Controls.Add(Me.ControlContainer1)
@@ -861,27 +881,6 @@ Partial Class frmDocumentResultList
         Me.EmptySpaceItem1.Size = New System.Drawing.Size(248, 321)
         Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
         '
-        'DockPanelMetadata
-        '
-        Me.DockPanelMetadata.Controls.Add(Me.DockPanel3_Container)
-        Me.DockPanelMetadata.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
-        Me.DockPanelMetadata.ID = New System.Guid("a7688cec-f13e-448b-82cf-a6bb020fb3f7")
-        resources.ApplyResources(Me.DockPanelMetadata, "DockPanelMetadata")
-        Me.DockPanelMetadata.Name = "DockPanelMetadata"
-        Me.DockPanelMetadata.Options.ShowCloseButton = False
-        Me.DockPanelMetadata.OriginalSize = New System.Drawing.Size(268, 413)
-        '
-        'DockPanel3_Container
-        '
-        Me.DockPanel3_Container.Controls.Add(Me.CtrlObjectPropertyDialog)
-        resources.ApplyResources(Me.DockPanel3_Container, "DockPanel3_Container")
-        Me.DockPanel3_Container.Name = "DockPanel3_Container"
-        '
-        'CtrlObjectPropertyDialog
-        '
-        resources.ApplyResources(Me.CtrlObjectPropertyDialog, "CtrlObjectPropertyDialog")
-        Me.CtrlObjectPropertyDialog.Name = "CtrlObjectPropertyDialog"
-        '
         'DockPanelPreview
         '
         Me.DockPanelPreview.Controls.Add(Me.DockPanel1_Container)
@@ -941,6 +940,8 @@ Partial Class frmDocumentResultList
         Me.DockPanelFileList.ResumeLayout(False)
         Me.DockPanel2_Container.ResumeLayout(False)
         Me.panelContainerStatus.ResumeLayout(False)
+        Me.DockPanelMetadata.ResumeLayout(False)
+        Me.DockPanel3_Container.ResumeLayout(False)
         Me.DockPanelStatus.ResumeLayout(False)
         Me.ControlContainer1.ResumeLayout(False)
         CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -953,8 +954,6 @@ Partial Class frmDocumentResultList
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.DockPanelMetadata.ResumeLayout(False)
-        Me.DockPanel3_Container.ResumeLayout(False)
         Me.DockPanelPreview.ResumeLayout(False)
         Me.DockPanel1_Container.ResumeLayout(False)
         Me.ResumeLayout(False)

GUIs.Common/frmDocumentResultList.resx

@@ -572,6 +572,72 @@
   <data name="&gt;&gt;DockPanelPreview.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="CtrlObjectPropertyDialog.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="CtrlObjectPropertyDialog.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="CtrlObjectPropertyDialog.Size" type="System.Drawing.Size, System.Drawing">
+    <value>268, 434</value>
+  </data>
+  <data name="CtrlObjectPropertyDialog.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;CtrlObjectPropertyDialog.Name" xml:space="preserve">
+    <value>CtrlObjectPropertyDialog</value>
+  </data>
+  <data name="&gt;&gt;CtrlObjectPropertyDialog.Type" xml:space="preserve">
+    <value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.12.1.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;CtrlObjectPropertyDialog.Parent" xml:space="preserve">
+    <value>DockPanel3_Container</value>
+  </data>
+  <data name="&gt;&gt;CtrlObjectPropertyDialog.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="DockPanel3_Container.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="DockPanel3_Container.Size" type="System.Drawing.Size, System.Drawing">
+    <value>268, 434</value>
+  </data>
+  <data name="DockPanel3_Container.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;DockPanel3_Container.Name" xml:space="preserve">
+    <value>DockPanel3_Container</value>
+  </data>
+  <data name="&gt;&gt;DockPanel3_Container.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;DockPanel3_Container.Parent" xml:space="preserve">
+    <value>DockPanelMetadata</value>
+  </data>
+  <data name="&gt;&gt;DockPanel3_Container.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="DockPanelMetadata.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 26</value>
+  </data>
+  <data name="DockPanelMetadata.Size" type="System.Drawing.Size, System.Drawing">
+    <value>268, 434</value>
+  </data>
+  <data name="DockPanelMetadata.Text" xml:space="preserve">
+    <value>Eigenschaften</value>
+  </data>
+  <data name="&gt;&gt;DockPanelMetadata.Name" xml:space="preserve">
+    <value>DockPanelMetadata</value>
+  </data>
+  <data name="&gt;&gt;DockPanelMetadata.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;DockPanelMetadata.Parent" xml:space="preserve">
+    <value>panelContainerStatus</value>
+  </data>
+  <data name="&gt;&gt;DockPanelMetadata.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="txtCheckedOutWho.Location" type="System.Drawing.Point, System.Drawing">
     <value>162, 45</value>
   </data>
@@ -699,72 +765,6 @@
     <value>panelContainerStatus</value>
   </data>
   <data name="&gt;&gt;DockPanelStatus.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="CtrlObjectPropertyDialog.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="CtrlObjectPropertyDialog.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="CtrlObjectPropertyDialog.Size" type="System.Drawing.Size, System.Drawing">
-    <value>268, 434</value>
-  </data>
-  <data name="CtrlObjectPropertyDialog.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;CtrlObjectPropertyDialog.Name" xml:space="preserve">
-    <value>CtrlObjectPropertyDialog</value>
-  </data>
-  <data name="&gt;&gt;CtrlObjectPropertyDialog.Type" xml:space="preserve">
-    <value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.12.1.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;CtrlObjectPropertyDialog.Parent" xml:space="preserve">
-    <value>DockPanel3_Container</value>
-  </data>
-  <data name="&gt;&gt;CtrlObjectPropertyDialog.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="DockPanel3_Container.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="DockPanel3_Container.Size" type="System.Drawing.Size, System.Drawing">
-    <value>268, 434</value>
-  </data>
-  <data name="DockPanel3_Container.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;DockPanel3_Container.Name" xml:space="preserve">
-    <value>DockPanel3_Container</value>
-  </data>
-  <data name="&gt;&gt;DockPanel3_Container.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;DockPanel3_Container.Parent" xml:space="preserve">
-    <value>DockPanelMetadata</value>
-  </data>
-  <data name="&gt;&gt;DockPanel3_Container.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="DockPanelMetadata.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 26</value>
-  </data>
-  <data name="DockPanelMetadata.Size" type="System.Drawing.Size, System.Drawing">
-    <value>268, 434</value>
-  </data>
-  <data name="DockPanelMetadata.Text" xml:space="preserve">
-    <value>Eigenschaften</value>
-  </data>
-  <data name="&gt;&gt;DockPanelMetadata.Name" xml:space="preserve">
-    <value>DockPanelMetadata</value>
-  </data>
-  <data name="&gt;&gt;DockPanelMetadata.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;DockPanelMetadata.Parent" xml:space="preserve">
-    <value>panelContainerStatus</value>
-  </data>
-  <data name="&gt;&gt;DockPanelMetadata.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
   <data name="panelContainerStatus.Location" type="System.Drawing.Point, System.Drawing">
@@ -1403,7 +1403,7 @@
     <value>Attribute</value>
   </data>
   <data name="RibbonPageGroupWorkspace.Text" xml:space="preserve">
-    <value>Workspaces</value>
+    <value>Arbeitsbereiche</value>
   </data>
   <data name="RibbonPageGroupSavedSearch.Text" xml:space="preserve">
     <value>Suche</value>
@@ -1418,10 +1418,10 @@
     <value>Allgemein</value>
   </data>
   <data name="RibbonPageGroupWorkspaceSettings.Text" xml:space="preserve">
-    <value>Workspaces</value>
+    <value>Arbeitsbereiche</value>
   </data>
   <data name="RibbonPage2.Text" xml:space="preserve">
-    <value>Layout</value>
+    <value>Ansicht</value>
   </data>
   <data name="RepositoryItemTextEdit1.AutoHeight" type="System.Boolean, mscorlib">
     <value>False</value>

GUIs.Common/frmDocumentResultList.vb

@@ -503,6 +503,10 @@ Public Class frmDocumentResultList
         Else
             IsLoading = True
             Try
+                ' Save current row handle and unset it
+                Dim oCurrentRowHandle As Integer = GridView1.FocusedRowHandle
+                GridView1.FocusedRowHandle = GridControl.InvalidRowHandle
+
                 ' Save the new results
                 ResultLists = pResults
 
@@ -513,6 +517,10 @@ Public Class frmDocumentResultList
                 UpdateTotalResults()
                 LoadGridDataAndLayout()
 
+                ' After the new results are loaded, set the old row handle
+                ' to trigger the row change events and load object properties
+                GridView1.FocusedRowHandle = oCurrentRowHandle
+
                 Return True
             Catch ex As Exception
                 Logger.Error(ex)
@@ -1033,7 +1041,9 @@ Public Class frmDocumentResultList
     End Sub
 
     Private Async Sub MenuItemSaveProperties_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemSaveProperties.ItemClick
-        Await CtrlObjectPropertyDialog.SaveChanges()
+        If Await CtrlObjectPropertyDialog.SaveChanges() Then
+            RaiseEvent NeedsRefresh(sender, Params.ProfileGuid)
+        End If
     End Sub
 
     Private Sub BarButtonItem11_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem11.ItemClick

GUIs.Common/frmSQLEditor.vb

@@ -43,6 +43,8 @@ Public Class frmSQLEditor
 
     Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         FormLoading = True
+        txtSQLCommand.BeginUpdate()
+
         Try
             If PlaceholdersAutomatic Is Nothing Then
                 PlaceholdersAutomatic = New Dictionary(Of String, String)
@@ -86,6 +88,7 @@ Public Class frmSQLEditor
             chkClearPlaceholders.Checked = ClearPlaceholdersAfterSuccessfulExecute
         Catch ex As Exception
         Finally
+            txtSQLCommand.EndUpdate()
             FormLoading = False
         End Try