jj: bugfixes

2018-06-14 12:31:57 +02:00
parent e41e9cc575
commit 4c7092ec8d
9 changed files with 1844 additions and 813 deletions
--- a/app/DD_PM_WINDREAM/frmConnection.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmConnection.Designer.vb
@@ -27,7 +27,7 @@ Partial Class frmConnection
        Dim GEAENDERTWANNLabel As System.Windows.Forms.Label
        Dim GUIDLabel As System.Windows.Forms.Label
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConnection))
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.chkOR_ohne_TNS = New System.Windows.Forms.CheckBox()
        Me.Chckwin_aut = New System.Windows.Forms.CheckBox()
        Me.txtBezeichnung = New System.Windows.Forms.TextBox()
@@ -45,7 +45,6 @@ Partial Class frmConnection
        Me.lblDataSource = New System.Windows.Forms.Label()
        Me.cmbDbArt = New System.Windows.Forms.ComboBox()
        Me.lblDatenbanktyp = New System.Windows.Forms.Label()
-        Me.txtDatasource2 = New System.Windows.Forms.TextBox()
        Me.TBDD_CONNECTIONBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
        Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
        Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton()
@@ -75,6 +74,7 @@ Partial Class frmConnection
        Me.GUIDTextBox = New System.Windows.Forms.TextBox()
        Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager()
        Me.TBDD_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter()
+        Me.DATENBANKComboBox = New System.Windows.Forms.ComboBox()
        GEANDERTWERLabel = New System.Windows.Forms.Label()
        GEAENDERTWANNLabel = New System.Windows.Forms.Label()
        GUIDLabel = New System.Windows.Forms.Label()
@@ -297,17 +297,6 @@ Partial Class frmConnection
        Me.lblDatenbanktyp.TabIndex = 0
        Me.lblDatenbanktyp.Text = "Datenbanktyp*:"
        '
-        'txtDatasource2
-        '
-        Me.txtDatasource2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "DATENBANK", True))
-        Me.txtDatasource2.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtDatasource2.Location = New System.Drawing.Point(231, 103)
-        Me.txtDatasource2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
-        Me.txtDatasource2.Name = "txtDatasource2"
-        Me.txtDatasource2.Size = New System.Drawing.Size(259, 23)
-        Me.txtDatasource2.TabIndex = 3
-        Me.txtDatasource2.Visible = False
-        '
        'TBDD_CONNECTIONBindingNavigator
        '
        Me.TBDD_CONNECTIONBindingNavigator.AddNewItem = Nothing
@@ -323,7 +312,7 @@ Partial Class frmConnection
        Me.TBDD_CONNECTIONBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem
        Me.TBDD_CONNECTIONBindingNavigator.Name = "TBDD_CONNECTIONBindingNavigator"
        Me.TBDD_CONNECTIONBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem
-        Me.TBDD_CONNECTIONBindingNavigator.Size = New System.Drawing.Size(1154, 25)
+        Me.TBDD_CONNECTIONBindingNavigator.Size = New System.Drawing.Size(1165, 25)
        Me.TBDD_CONNECTIONBindingNavigator.TabIndex = 53
        Me.TBDD_CONNECTIONBindingNavigator.Text = "BindingNavigator1"
        '
@@ -432,8 +421,8 @@ Partial Class frmConnection
        '
        Me.TBDD_CONNECTIONDataGridView.AllowUserToAddRows = False
        Me.TBDD_CONNECTIONDataGridView.AllowUserToDeleteRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua
-        Me.TBDD_CONNECTIONDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua
+        Me.TBDD_CONNECTIONDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
        Me.TBDD_CONNECTIONDataGridView.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
            Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -444,7 +433,7 @@ Partial Class frmConnection
        Me.TBDD_CONNECTIONDataGridView.Location = New System.Drawing.Point(12, 276)
        Me.TBDD_CONNECTIONDataGridView.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.TBDD_CONNECTIONDataGridView.Name = "TBDD_CONNECTIONDataGridView"
-        Me.TBDD_CONNECTIONDataGridView.Size = New System.Drawing.Size(1133, 316)
+        Me.TBDD_CONNECTIONDataGridView.Size = New System.Drawing.Size(1144, 316)
        Me.TBDD_CONNECTIONDataGridView.TabIndex = 53
        '
        'DataGridViewTextBoxColumn1
@@ -552,11 +541,21 @@ Partial Class frmConnection
        '
        Me.TBDD_CONNECTIONTableAdapter.ClearBeforeFill = True
        '
+        'DATENBANKComboBox
+        '
+        Me.DATENBANKComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "DATENBANK", True))
+        Me.DATENBANKComboBox.FormattingEnabled = True
+        Me.DATENBANKComboBox.Location = New System.Drawing.Point(232, 102)
+        Me.DATENBANKComboBox.Name = "DATENBANKComboBox"
+        Me.DATENBANKComboBox.Size = New System.Drawing.Size(259, 24)
+        Me.DATENBANKComboBox.TabIndex = 66
+        '
        'frmConnection
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1154, 619)
+        Me.ClientSize = New System.Drawing.Size(1165, 619)
+        Me.Controls.Add(Me.DATENBANKComboBox)
        Me.Controls.Add(GUIDLabel)
        Me.Controls.Add(Me.GUIDTextBox)
        Me.Controls.Add(Me.SERVERTextBox)
@@ -580,7 +579,6 @@ Partial Class frmConnection
        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.lblDatasource2)
        Me.Controls.Add(Me.btnCheck_Con)
-        Me.Controls.Add(Me.txtDatasource2)
        Me.Controls.Add(Me.chkOR_ohne_TNS)
        Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
@@ -607,7 +605,6 @@ Partial Class frmConnection
    Friend WithEvents lblDataSource As System.Windows.Forms.Label
    Friend WithEvents cmbDbArt As System.Windows.Forms.ComboBox
    Friend WithEvents lblDatenbanktyp As System.Windows.Forms.Label
-    Friend WithEvents txtDatasource2 As System.Windows.Forms.TextBox
    Friend WithEvents DD_DMSLiteDataSet As DD_PM_WINDREAM.DD_DMSLiteDataSet
    Friend WithEvents TBDD_CONNECTIONBindingSource As System.Windows.Forms.BindingSource
    Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager
@@ -643,4 +640,5 @@ Partial Class frmConnection
    Friend WithEvents SERVERTextBox As TextBox
    Friend WithEvents ToolStripButton3 As ToolStripButton
    Friend WithEvents GUIDTextBox As TextBox
+    Friend WithEvents DATENBANKComboBox As ComboBox
 End Class