diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
index f62360b..1ec2b91 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
@@ -400,7 +400,7 @@ Partial Class frmFormDesigner
'
'btnrefresh
'
- Me.btnrefresh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.btnrefresh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnrefresh.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.arrow_refresh
Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnrefresh.Location = New System.Drawing.Point(828, 514)
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx
index a227075..20ee88e 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.resx
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx
@@ -132,9 +132,6 @@
17, 17
-
- 17, 17
-
1021, 17
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb
index 539bdd4..109a51b 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb
@@ -16,8 +16,9 @@ Public Class frmFormDesigner
' Windream List Data
Private Windream_ChoiceLists As List(Of String)
- Private Windream_Indicies As List(Of String)
+ Private Windream_AllIndicies As List(Of String)
Private Windream_VectorIndicies As List(Of String)
+ Private Windream_SimpleIndicies As List(Of String)
Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load
@@ -30,9 +31,10 @@ Public Class frmFormDesigner
clsWindream.Create_Session()
'Windream Abfragen, sollten einmal beim Start des Formulars geladen werden
- Windream_Indicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
+ Windream_AllIndicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
Windream_ChoiceLists = clsWD_GET.GetChoiceLists()
- Windream_VectorIndicies = Windream_Indicies.FindAll(AddressOf IsVectorIndex)
+ Windream_VectorIndicies = Windream_AllIndicies.FindAll(AddressOf IsVectorIndex)
+ Windream_SimpleIndicies = Windream_AllIndicies.Except(Windream_VectorIndicies).ToList()
Catch ex As Exception
MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
End Try
@@ -475,9 +477,6 @@ Public Class frmFormDesigner
Private Sub OnControl_MouseUp(sender As Control, e As MouseEventArgs)
Mouse_IsPressed = False
- ' Ersten Tab anzeigen
- TabControlEigenschaften.SelectTab(0)
-
' Control Eigenschaften laden
LoadControlProperties(sender)
@@ -629,19 +628,19 @@ Public Class frmFormDesigner
props = labelProps
ElseIf TypeOf sender Is CheckBox Then
Dim check As CheckBox = sender
- Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, row, Windream_Indicies)
+ Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, row, Windream_AllIndicies)
checkProps.Text = check.Text
props = checkProps
ElseIf TypeOf sender Is TextBox Then
Dim txt As TextBox = sender
- Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, row, Windream_Indicies)
+ Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, row, Windream_AllIndicies)
props = txtProps
ElseIf TypeOf sender Is ComboBox Then
Dim cmb As ComboBox = sender
- Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, row, Windream_Indicies)
+ Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, row, Windream_AllIndicies)
cmbProps.ChoiceLists = Windream_ChoiceLists
cmbProps.ChoiceList = NotNull(row.Item("CHOICE_LIST"), "")
@@ -649,7 +648,7 @@ Public Class frmFormDesigner
ElseIf TypeOf sender Is DateTimePicker Then
Dim dtp As DateTimePicker = sender
- Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, row, Windream_Indicies)
+ Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, row, Windream_AllIndicies)
props = dtpProps
ElseIf TypeOf sender Is DataGridView Then