MS_23052016

2016-05-23 16:54:06 +02:00
parent b141e20f58
commit 6c8cfaa371
3 changed files with 29 additions and 77 deletions
--- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
@@ -68,7 +68,6 @@ Partial Class frmConstructor_Main
        Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator()
        Me.PropertiesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.AxObjectListControl = New AxOBJECTLISTCONTROLLib.AxObjectListControl()
        Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip()
        Me.tslblWindreamView = New System.Windows.Forms.ToolStripLabel()
        Me.ToolStripDropDownButton2 = New System.Windows.Forms.ToolStripDropDownButton()
@@ -172,7 +171,6 @@ Partial Class frmConstructor_Main
        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ContextMenuStripResultFiles.SuspendLayout()
        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.AxObjectListControl, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ToolStripDokumente.SuspendLayout()
        Me.TabFollowUp.SuspendLayout()
        Me.grpbxFU_Profile.SuspendLayout()
@@ -440,7 +438,6 @@ Partial Class frmConstructor_Main
        '
        Me.TabWindream.AllowDrop = True
        Me.TabWindream.Controls.Add(Me.GridControlDocSearch)
-        Me.TabWindream.Controls.Add(Me.AxObjectListControl)
        Me.TabWindream.Controls.Add(Me.ToolStripDokumente)
        Me.TabWindream.Image = Global.DD_Record_Organiser.My.Resources.Resources.Files_7954
        Me.TabWindream.Name = "TabWindream"
@@ -511,14 +508,6 @@ Partial Class frmConstructor_Main
        Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False]
        Me.GridViewDoc_Search.OptionsView.ShowIndicator = False
        '
-        'AxObjectListControl
-        '
-        Me.AxObjectListControl.AllowDrop = True
-        resources.ApplyResources(Me.AxObjectListControl, "AxObjectListControl")
-        Me.AxObjectListControl.Name = "AxObjectListControl"
-        Me.AxObjectListControl.OcxState = CType(resources.GetObject("AxObjectListControl.OcxState"), System.Windows.Forms.AxHost.State)
-        Me.AxObjectListControl.TabStop = False
-        '
        'ToolStripDokumente
        '
        Me.ToolStripDokumente.AllowDrop = True
@@ -1093,7 +1082,6 @@ Partial Class frmConstructor_Main
        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ContextMenuStripResultFiles.ResumeLayout(False)
        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.AxObjectListControl, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ToolStripDokumente.ResumeLayout(False)
        Me.ToolStripDokumente.PerformLayout()
        Me.TabFollowUp.ResumeLayout(False)
@@ -1190,7 +1178,6 @@ Partial Class frmConstructor_Main
    Friend WithEvents tslblWindreamView As System.Windows.Forms.ToolStripLabel
    Friend WithEvents ToolStripDropDownButton2 As System.Windows.Forms.ToolStripDropDownButton
    Friend WithEvents KonfigurationToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents AxObjectListControl As AxOBJECTLISTCONTROLLib.AxObjectListControl
    Friend WithEvents DD_DMSDataSet As DD_Record_Organiser.DD_DMSDataSet
    Friend WithEvents VWPMO_WF_USER_ACTIVEBindingSource As System.Windows.Forms.BindingSource
    Friend WithEvents VWPMO_WF_USER_ACTIVETableAdapter As DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter
--- a/app/DD-Record-Organiser/frmConstructor_Main.resx
+++ b/app/DD-Record-Organiser/frmConstructor_Main.resx
@@ -486,41 +486,6 @@
  <data name="&gt;&gt;GridControlDocSearch.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
-  <data name="AxObjectListControl.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left, Right</value>
-  </data>
-  <data name="AxObjectListControl.Enabled" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="AxObjectListControl.Location" type="System.Drawing.Point, System.Drawing">
-    <value>560, 50</value>
-  </data>
-  <data name="AxObjectListControl.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAJQAAAAIB
-        AAAAAQAAAAAAAAAAAAAAABAAAAAAAAEAIS8AAJwMAAAAAAAACw==
-</value>
-  </data>
-  <data name="AxObjectListControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>456, 122</value>
-  </data>
-  <data name="AxObjectListControl.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="&gt;&gt;AxObjectListControl.Name" xml:space="preserve">
-    <value>AxObjectListControl</value>
-  </data>
-  <data name="&gt;&gt;AxObjectListControl.Type" xml:space="preserve">
-    <value>AxOBJECTLISTCONTROLLib.AxObjectListControl, AxInterop.OBJECTLISTCONTROLLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;AxObjectListControl.Parent" xml:space="preserve">
-    <value>TabWindream</value>
-  </data>
-  <data name="&gt;&gt;AxObjectListControl.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
  <metadata name="ToolStripDokumente.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 56</value>
  </metadata>
@@ -583,7 +548,7 @@
    <value>TabWindream</value>
  </data>
  <data name="&gt;&gt;ToolStripDokumente.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>1</value>
  </data>
  <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
    <value>1072, 338</value>
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@@ -221,8 +221,8 @@ Public Class frmConstructor_Main
            Me.VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
            Dim SQL = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & _
                        "FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {2} AND  CONSTRUCT_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_SCREEN_ID, CONSTRUCTORID)
-            sd()
            DT_VWPMO_CONSTRUCTOR_FORMS = ClassDatabase.Return_Datatable(SQL)
+
            DT_CONSTRUCT_VIEW = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM_CONSTRUCTOR WHERE GUID = " & CONSTRUCTORID)
            If DT_CONSTRUCT_VIEW.Rows.Count = 1 Then
                'Load Input Grid
@@ -3276,14 +3276,14 @@ Public Class frmConstructor_Main
                    End If
                    TabWindream.Text = stg & " (" & windreamSucheErgebnisse.Count & ")"

-                    AxObjectListControl.SetIconMode(True)
-                    AxObjectListControl.RemoveAllColumnHeader()
-                    Me.AxObjectListControl.SetSession(ClassWindream.oSession, "", "")
+                    ' AxObjectListControl.SetIconMode(True)
+                    ' AxObjectListControl.RemoveAllColumnHeader()
+                    '   Me.AxObjectListControl.SetSession(ClassWindream.oSession, "", "")
                    'Change the status icon
                    'ICON STATES:
-                    Me.AxObjectListControl.SetStatusIcon(0)
+                    ' Me.AxObjectListControl.SetStatusIcon(0)
                    'Change the icon
-                    Me.AxObjectListControl.SetStatusIcon(2)
+                    ' Me.AxObjectListControl.SetStatusIcon(2)

                    Try
                        Dim sql_ResultList = "select * from TBPMO_WINDREAM_RESULTLIST_CONFIG where guid = 1"
@@ -3305,7 +3305,7 @@ Public Class frmConstructor_Main
                                            'You need to use the column name here
                                            'Please note that some attributes or indices will not be displayed
                                            'Try not to add the same header twice, it will throw cause problems if you do that
-                                            Me.AxObjectListControl.AddColumnHeader(ColumnName, Width)
+                                            ' Me.AxObjectListControl.AddColumnHeader(ColumnName, Width)
                                            anzparam += 1
                                        End If
                                    End If
@@ -3343,7 +3343,7 @@ Public Class frmConstructor_Main
                                'You need to use the column name here
                                'Please note that some attributes or indices will not be displayed
                                'Try not to add the same header twice, it will throw cause problems if you do that
-                                Me.AxObjectListControl.AddColumnHeader(spar, width)
+                                '  Me.AxObjectListControl.AddColumnHeader(spar, width)
                            Next

                        End If
@@ -3355,22 +3355,22 @@ Public Class frmConstructor_Main
                    Dim results As WINDREAMLib.WMObjects = windreamSucheErgebnisse
                    If LogErrorsOnly = False Then ClassLogger.Add(" >> results loaded ", False)
                    'Set the contents without displaying them
-                    AxObjectListControl.SetContentsEx(results)
+                    '  AxObjectListControl.SetContentsEx(results)
                    'Change the icon
-                    AxObjectListControl.SetStatusIcon(5)
+                    'AxObjectListControl.SetStatusIcon(5)
                    'Display the results...
                    'The Previous Object Count
                    Dim poc As Integer = 0
                    'Display new objects, as long as the objectcount changes after displaying the objects

-                    Do Until (poc <> AxObjectListControl.GetObjectCount)
-                        poc = AxObjectListControl.GetObjectCount
-                        'If you want, you can display more items at a timeRefresh_FollowUp_TabHeader
-                        'But do not display to many at a time or the user interface could freeze
-                        'Maybe try 50
-                        AxObjectListControl.DisplayResults(WDResultListCount)
-                    Loop
-                    AxObjectListControl.SetStatusIcon(3)
+                    'Do Until (poc <> AxObjectListControl.GetObjectCount)
+                    '    poc = AxObjectListControl.GetObjectCount
+                    '    'If you want, you can display more items at a timeRefresh_FollowUp_TabHeader
+                    '    'But do not display to many at a time or the user interface could freeze
+                    '    'Maybe try 50
+                    '    AxObjectListControl.DisplayResults(WDResultListCount)
+                    'Loop
+                    '  AxObjectListControl.SetStatusIcon(3)
                Else
                    Dim msg = "Windream-Dokumente für Record: " & RECORD_ID & " - Keine Dateien gefunden"
                    If USER_LANGUAGE <> "de-DE" Then
@@ -3905,7 +3905,7 @@ Public Class frmConstructor_Main
                ClassLogger.Add(" >> Undefined Search-pattern in windream-search config: " & content, True)
        End Select
    End Function
-    Private Sub AxObjectListControl_ItemClicked(sender As Object, e As EventArgs) Handles AxObjectListControl.ItemClicked
+    Private Sub AxObjectListControl_ItemClicked(sender As Object, e As EventArgs)
        CheckDocView()
    End Sub

@@ -3914,8 +3914,8 @@ Public Class frmConstructor_Main
            Dim sw As New Stopwatch
            sw.Start()

-            AxObjectListControl.RemoveAllColumnHeader()
-            Me.AxObjectListControl.ClearResultList()
+            ' AxObjectListControl.RemoveAllColumnHeader()
+            ' Me.AxObjectListControl.ClearResultList()
            Dim stg As String = "windream-Dateien"
            If USER_LANGUAGE <> "de-DE" Then
                stg = "windream-files"
@@ -3932,10 +3932,10 @@ Public Class frmConstructor_Main

    End Sub
    Sub CheckDocView()
-        Dim _index = AxObjectListControl.GetFirstSelectedObject
-        Dim path As String = AxObjectListControl.GetObjectPath(_index)
-        path = path.Replace("?", vWLaufwerk)
-        DocViewString = path
+        ' Dim _index = AxObjectListControl.GetFirstSelectedObject
+        ' Dim path As String = AxObjectListControl.GetObjectPath(_index)
+        ' path = path.Replace("?", vWLaufwerk)
+        ' DocViewString = path

        If WD_ShowDocs = True Then
            CloseWDDocview()
@@ -4987,15 +4987,15 @@ Public Class frmConstructor_Main
        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
    End Sub

-    Private Sub AxObjectListControl_CausesValidationChanged(sender As Object, e As EventArgs) Handles AxObjectListControl.CausesValidationChanged
+    Private Sub AxObjectListControl_CausesValidationChanged(sender As Object, e As EventArgs)
        Console.WriteLine("CausesValidationChanged")
    End Sub

-    Private Sub AxObjectListControl_SettingFlagChanged(sender As Object, e As EventArgs) Handles AxObjectListControl.SettingFlagChanged
+    Private Sub AxObjectListControl_SettingFlagChanged(sender As Object, e As EventArgs)
        Console.WriteLine("SettingFlagChanged")
    End Sub

-    Private Sub AxObjectListControl_Validated(sender As Object, e As EventArgs) Handles AxObjectListControl.Validated
+    Private Sub AxObjectListControl_Validated(sender As Object, e As EventArgs)
        Console.WriteLine("Validated")
    End Sub