AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jj: filter indicies, dont switch to props tab on control click

Browse Source
This commit is contained in:
Jonathan Jenne 2018-04-04 11:48:51 +02:00
parent c98135429f
commit 6f69efda4d
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb generated
View File

@ -400,7 +400,7 @@ Partial Class frmFormDesigner
' '
'btnrefresh '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.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.arrow_refresh
Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnrefresh.Location = New System.Drawing.Point(828, 514) Me.btnrefresh.Location = New System.Drawing.Point(828, 514)

3
app/DD_PM_WINDREAM/frmFormDesigner.resx
View File

@ -132,9 +132,6 @@
<metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="TBPM_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TBPM_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1021, 17</value> <value>1021, 17</value>
</metadata> </metadata>

19
app/DD_PM_WINDREAM/frmFormDesigner.vb
View File

@ -16,8 +16,9 @@ Public Class frmFormDesigner
' Windream List Data ' Windream List Data
Private Windream_ChoiceLists As List(Of String) 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_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 Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load
@ -30,9 +31,10 @@ Public Class frmFormDesigner
clsWindream.Create_Session() clsWindream.Create_Session()
'Windream Abfragen, sollten einmal beim Start des Formulars geladen werden '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_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 Catch ex As Exception
MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
End Try End Try
@ -475,9 +477,6 @@ Public Class frmFormDesigner
Private Sub OnControl_MouseUp(sender As Control, e As MouseEventArgs) Private Sub OnControl_MouseUp(sender As Control, e As MouseEventArgs)
Mouse_IsPressed = False Mouse_IsPressed = False
' Ersten Tab anzeigen
TabControlEigenschaften.SelectTab(0)
' Control Eigenschaften laden ' Control Eigenschaften laden
LoadControlProperties(sender) LoadControlProperties(sender)
@ -629,19 +628,19 @@ Public Class frmFormDesigner
props = labelProps props = labelProps
ElseIf TypeOf sender Is CheckBox Then ElseIf TypeOf sender Is CheckBox Then
Dim check As CheckBox = sender 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 checkProps.Text = check.Text
props = checkProps props = checkProps
ElseIf TypeOf sender Is TextBox Then ElseIf TypeOf sender Is TextBox Then
Dim txt As TextBox = sender 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 props = txtProps
ElseIf TypeOf sender Is ComboBox Then ElseIf TypeOf sender Is ComboBox Then
Dim cmb As ComboBox = sender 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.ChoiceLists = Windream_ChoiceLists
cmbProps.ChoiceList = NotNull(row.Item("CHOICE_LIST"), "") cmbProps.ChoiceList = NotNull(row.Item("CHOICE_LIST"), "")
@ -649,7 +648,7 @@ Public Class frmFormDesigner
ElseIf TypeOf sender Is DateTimePicker Then ElseIf TypeOf sender Is DateTimePicker Then
Dim dtp As DateTimePicker = sender 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 props = dtpProps
ElseIf TypeOf sender Is DataGridView Then ElseIf TypeOf sender Is DataGridView Then