MS

2022-04-07 17:04:35 +02:00 · 2022-04-07 17:04:35 +02:00 · 376111f208
commit 376111f208
parent 61ca23373a
4 changed files with 69 additions and 16 deletions
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@ -1311,7 +1311,8 @@ Public Class frmMain
                End If

                Dim oExpression = $"GUID = {CURRENT_ProfilGUID}"
-                CURRENT_DT_PROFILE.Clear()
+                CURRENT_DT_PROFILE = Nothing '.Clear()
+                CURRENT_DT_PROFILE = CURRENT_DT_PROFILES.Clone
                CURRENT_DT_PROFILES.Select(oExpression).CopyToDataTable(CURRENT_DT_PROFILE, LoadOption.PreserveChanges)
                If CURRENT_DT_PROFILE.Rows.Count = 1 Then
                    CURRENT_ProfilName = CURRENT_DT_PROFILE.Rows(0).Item("NAME")
@ -1321,10 +1322,12 @@ Public Class frmMain
                End If


-                BASEDATA_DT_PROFILE_SEARCHES_DOC.Clear()
+                BASEDATA_DT_PROFILE_SEARCHES_DOC = Nothing
+                BASEDATA_DT_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Copy
                oExpression = $"PROFILE_ID = {CURRENT_ProfilGUID}"
                BASEDATA_DT_PROFILES_SEARCHES_DOC.Select(oExpression, "TAB_INDEX").CopyToDataTable(BASEDATA_DT_PROFILE_SEARCHES_DOC, LoadOption.PreserveChanges)
-                BASEDATA_DT_PROFILE_SEARCHES_SQL.Clear()
+                BASEDATA_DT_PROFILE_SEARCHES_SQL = Nothing
+                BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Copy
                BASEDATA_DT_PROFILES_SEARCHES_SQL.Select(oExpression, "TAB_INDEX").CopyToDataTable(BASEDATA_DT_PROFILE_SEARCHES_SQL, LoadOption.PreserveChanges)

                Try
@ -2747,7 +2750,8 @@ Public Class frmMain
                    .SortByColumn = "SEQUENCE"
                })

-                CURRENT_DT_PROFILE.Clear()
+                CURRENT_DT_PROFILE = Nothing '.Clear
+                CURRENT_DT_PROFILE = CURRENT_DT_PROFILES.Clone
                Dim oExpression = $"GUID = {CURRENT_ProfilGUID}"
                CURRENT_DT_PROFILES.Select(oExpression).CopyToDataTable(CURRENT_DT_PROFILE, LoadOption.PreserveChanges)
                If CURRENT_DT_PROFILE.Rows.Count = 1 Then
--- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb
@ -111,6 +111,7 @@ Partial Class frmValidator
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
+        Me.BarCheckItemLoadOnClick = New DevExpress.XtraBars.BarCheckItem()
        CType(Me.SplitContainer2_DV_Chat, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainer2_DV_Chat.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer2_DV_Chat.Panel1.SuspendLayout()
@ -463,9 +464,9 @@ Partial Class frmValidator
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem2, Me.BarLinkContainerItem1, Me.btnitemConversationEnd, Me.bbtnitem_ConversationNew, Me.BarLinkContainerItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarEditItem3, Me.btnitemConversation_reload, Me.BarButtonItem5, Me.BarButtonItemAttmt, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem2, Me.BarLinkContainerItem1, Me.btnitemConversationEnd, Me.bbtnitem_ConversationNew, Me.BarLinkContainerItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarEditItem3, Me.btnitemConversation_reload, Me.BarButtonItem5, Me.BarButtonItemAttmt, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.BarCheckItemLoadOnClick})
        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 31
+        Me.RibbonControl1.MaxItemId = 32
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageConversations})
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
@ -761,7 +762,7 @@ Partial Class frmValidator
        '
        Me.RibbonPageCust.AllowTextClipping = False
        Me.RibbonPageCust.ItemLinks.Add(Me.BarButtonItemAttmt)
-        Me.RibbonPageCust.ItemLinks.Add(Me.ToggleSwitchItemLoadonClick)
+        Me.RibbonPageCust.ItemLinks.Add(Me.BarCheckItemLoadOnClick)
        Me.RibbonPageCust.ItemLinks.Add(Me.barbtnitmExport)
        Me.RibbonPageCust.Name = "RibbonPageCust"
        resources.ApplyResources(Me.RibbonPageCust, "RibbonPageCust")
@ -791,6 +792,21 @@ Partial Class frmValidator
        Me.RibbonPage2.Name = "RibbonPage2"
        resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
        '
+        'BarCheckItemLoadOnClick
+        '
+        resources.ApplyResources(Me.BarCheckItemLoadOnClick, "BarCheckItemLoadOnClick")
+        Me.BarCheckItemLoadOnClick.Id = 31
+        Me.BarCheckItemLoadOnClick.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarCheckItemLoadOnClick.ItemAppearance.Pressed.Font = CType(resources.GetObject("BarCheckItem1.ItemAppearance.Pressed.Font"), System.Drawing.Font)
+        Me.BarCheckItemLoadOnClick.ItemAppearance.Pressed.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Information
+        Me.BarCheckItemLoadOnClick.ItemAppearance.Pressed.Options.UseFont = True
+        Me.BarCheckItemLoadOnClick.ItemAppearance.Pressed.Options.UseForeColor = True
+        Me.BarCheckItemLoadOnClick.ItemInMenuAppearance.Pressed.Font = CType(resources.GetObject("BarCheckItem1.ItemInMenuAppearance.Pressed.Font"), System.Drawing.Font)
+        Me.BarCheckItemLoadOnClick.ItemInMenuAppearance.Pressed.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Information
+        Me.BarCheckItemLoadOnClick.ItemInMenuAppearance.Pressed.Options.UseFont = True
+        Me.BarCheckItemLoadOnClick.ItemInMenuAppearance.Pressed.Options.UseForeColor = True
+        Me.BarCheckItemLoadOnClick.Name = "BarCheckItemLoadOnClick"
+        '
        'frmValidator
        '
        Me.Appearance.Options.UseFont = True
@ -921,4 +937,5 @@ Partial Class frmValidator
    Friend WithEvents barbtnitmExport As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
    Friend WithEvents ToggleSwitchItemLoadonClick As DevExpress.XtraBars.BarToggleSwitchItem
+    Friend WithEvents BarCheckItemLoadOnClick As DevExpress.XtraBars.BarCheckItem
 End Class
--- a/app/DD_PM_WINDREAM/frmValidator.resx
+++ b/app/DD_PM_WINDREAM/frmValidator.resx
@ -319,7 +319,7 @@
    <value>DocumentViewerValidator</value>
  </data>
  <data name="&gt;&gt;DocumentViewerValidator.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.7.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.8.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;DocumentViewerValidator.Parent" xml:space="preserve">
    <value>SplitContainer1.Panel2</value>
@ -999,6 +999,33 @@
        Ny0zLjEsNy03VjEwSDIyeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
  </data>
+  <data name="BarCheckItemLoadOnClick.Caption" xml:space="preserve">
+    <value>Suche nur auf Click laden</value>
+  </data>
+  <data name="BarCheckItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHICAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkNoZWNrQ2lyY2xlZCI+DQogICAgPHBhdGggZD0iTTE2
+        LDRDOS40LDQsNCw5LjQsNCwxNmMwLDYuNiw1LjQsMTIsMTIsMTJzMTItNS40LDEyLTEyQzI4LDkuNCwy
+        Mi42LDQsMTYsNHogTTE0LDIybC02LTZsMi0ybDQsNGw4LThsMiwyICAgTDE0LDIyeiIgY2xhc3M9Ikdy
+        ZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="BarCheckItem1.ItemAppearance.Pressed.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Bold</value>
+  </data>
+  <data name="BarCheckItem1.ItemInMenuAppearance.Pressed.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Bold</value>
+  </data>
  <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
@ -1729,6 +1756,12 @@
  <data name="&gt;&gt;FolderBrowserDialog1.Type" xml:space="preserve">
    <value>System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="&gt;&gt;BarCheckItemLoadOnClick.Name" xml:space="preserve">
+    <value>BarCheckItemLoadOnClick</value>
+  </data>
+  <data name="&gt;&gt;BarCheckItemLoadOnClick.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmValidator</value>
  </data>
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@ -128,7 +128,7 @@ Public Class frmValidator
            'sumatra = False
            FormLoaded = False
            BarButtonItemAttmt.Visibility = BarItemVisibility.Never
-            ToggleSwitchItemLoadonClick.Visibility = BarItemVisibility.Never
+            BarCheckItemLoadOnClick.Visibility = BarItemVisibility.Never
        Catch ex As Exception
            LOGGER.Warn($"Error in frmValidation_load1: {ex.Message}")
        End Try
@ -3631,12 +3631,11 @@ Public Class frmValidator
                If RibbonPageCustItm1 <> "" Then
                    BarButtonItemAttmt.Caption = RibbonPageCustItm1
                    BarButtonItemAttmt.Visibility = BarItemVisibility.Always
-                    Dim toggleLink As BarToggleSwitchItem = TryCast(ToggleSwitchItemLoadonClick, BarToggleSwitchItem)
-                    toggleLink.Checked = CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK
-                    ToggleSwitchItemLoadonClick.Visibility = BarItemVisibility.Always
+                    BarCheckItemLoadOnClick.Checked = CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK
+                    BarCheckItemLoadOnClick.Visibility = BarItemVisibility.Always
                Else
                    BarButtonItemAttmt.Visibility = BarItemVisibility.Never
-                    ToggleSwitchItemLoadonClick.Visibility = BarItemVisibility.Never
+                    BarCheckItemLoadOnClick.Visibility = BarItemVisibility.Never
                End If

                ' If Searches should be loaded automatically, not only on click
@ -5765,12 +5764,12 @@ Public Class frmValidator



-    Private Sub ToggleSwitchItemLoadonClick_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles ToggleSwitchItemLoadonClick.CheckedChanged
+
+    Private Sub BarCheckItemLoadOnClick_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles BarCheckItemLoadOnClick.CheckedChanged
        If FormLoaded = False Then
            Exit Sub
        End If
-        Dim toggle As BarToggleSwitchItem = sender
-        CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK = toggle.Checked
+        CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK = BarCheckItemLoadOnClick.Checked
        CONFIG.Save()
    End Sub
 End Class