diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 81dd4f5..edbceb1 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -120,4 +120,7 @@ Module ModuleRuntimeVariables Public CONFIG As ConfigManager(Of ClassConfig) Public GDPICTURE_LICENSE As String + + Public MyIndicies As List(Of String) + Public MyIndicies_Types As List(Of Integer) End Module diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 9308743..95fd7b3 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -264,6 +264,24 @@ 0 + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Benutzer: + + + MiddleLeft + Label20 @@ -414,6 +432,24 @@ 0 + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Benutzer: + + + MiddleLeft + Label19 @@ -483,66 +519,6 @@ 0 - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Benutzer: - - - MiddleLeft - - - Label20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Benutzer: - - - MiddleLeft - - - Label19 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel2 - - - 0 - Fill @@ -606,6 +582,27 @@ 0 + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Gruppen: + + + MiddleLeft + Label22 @@ -708,6 +705,27 @@ 0 + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Gruppen: + + + MiddleLeft + Label23 @@ -777,72 +795,6 @@ 0 - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Gruppen: - - - MiddleLeft - - - Label22 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel3 - - - 0 - - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Gruppen: - - - MiddleLeft - - - Label23 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel4 - - - 0 - False @@ -3500,6 +3452,15 @@ 0, 0 + + Profil-Verwaltung + + + Finale Indexe + + + Grundeinstellungen + Start @@ -3536,15 +3497,6 @@ 3 - - Profil-Verwaltung - - - Finale Indexe - - - Grundeinstellungen - RibbonPage2 diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index c561035..c5412f4 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -13,8 +13,7 @@ Public Class frmAdministration Dim formloaded As Boolean Private INSERT_ACTIVE As Boolean = False - Dim MyIndicies As List(Of String) - Dim MyIndicies_Types As List(Of Integer) + Private Sub frmFormDesigner_Load(sender As Object, e As System.EventArgs) Handles Me.Load formloaded = False UNSAVED_CHANGES_PROFILE = False @@ -83,11 +82,19 @@ Public Class frmAdministration Exit Sub End If Try - Dim indexe = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text) - If indexe IsNot Nothing Then - For Each index As String In indexe + MyIndicies_Types = New List(Of Integer) + MyIndicies = New List(Of String) + MyIndicies = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text).ToList() + + + If MyIndicies IsNot Nothing Then + Dim i As Integer = 0 + For Each index As String In MyIndicies Dim _vektorString As Boolean = False - Select Case WINDREAM.GetTypeOfIndex(index) + Dim oIndexType = WINDREAM.GetTypeOfIndex(i) + i += 1 + MyIndicies_Types.Add(oIndexType) + Select Case oIndexType Case 4097 _vektorString = True Case 36865 @@ -102,12 +109,12 @@ Public Class frmAdministration Next End If - MyIndicies_Types = New List(Of Integer) - MyIndicies = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text).ToList() - For Each i In MyIndicies - Dim type = WINDREAM.GetTypeOfIndex(i) - MyIndicies_Types.Add(type) - Next + 'MyIndicies_Types = New List(Of Integer) + 'MyIndicies = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text).ToList() + 'For Each i In MyIndicies + ' Dim type = WINDREAM.GetTypeOfIndex(i) + ' MyIndicies_Types.Add(type) + 'Next Catch ex As Exception LOGGER.Error(ex) MsgBox("Error in GetIndices windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")