diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index dcce1f9..9266d05 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -1726,7 +1726,7 @@ NoControl - 595, 133 + 527, 150 167, 24 @@ -1783,7 +1783,7 @@ 3 - 317, 133 + 527, 120 128, 24 @@ -1813,7 +1813,7 @@ Tahoma, 8.25pt - 65, 47 + 141, 47 272, 21 @@ -1834,7 +1834,7 @@ 5 - 471, 133 + 527, 90 115, 24 @@ -1864,7 +1864,7 @@ True - 62, 31 + 138, 31 71, 13 @@ -1915,7 +1915,7 @@ False - 343, 47 + 419, 47 231, 21 @@ -1939,7 +1939,7 @@ True - 340, 31 + 416, 31 89, 13 @@ -2051,23 +2051,20 @@ der Datei MiddleLeft - 595, 162 + 317, 133 - 136, 23 + 167, 23 80 - Show SQL Config + SQL Abfrage bearbeiten MiddleRight - - False - btnSQLView @@ -2378,7 +2375,7 @@ der Datei False - 580, 47 + 65, 47 70, 21 @@ -2429,7 +2426,7 @@ der Datei True - 577, 31 + 62, 31 68, 13 diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index f92d834..f5f414d 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -340,9 +340,9 @@ Public Class frmAdministration 'Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) Load_ZuordnungDokart_Module(DOKART_GUIDTextBox.Text) If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then - btnSQLView.Visible = True + btnSQLView.Enabled = True Else - btnSQLView.Visible = False + btnSQLView.Enabled = False End If Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) End If @@ -454,15 +454,9 @@ Public Class frmAdministration Private Sub SUGGESTIONCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles SUGGESTIONCheckBox.CheckedChanged If frmloaded = True Then If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then - btnSQLView.Visible = True - 'MULTISELECTCheckBox.Visible = True - VKT_ADD_ITEMCheckbox.Visible = True - VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = True + btnSQLView.Enabled = True Else - btnSQLView.Visible = False - 'MULTISELECTCheckBox.Visible = False - VKT_ADD_ITEMCheckbox.Visible = False - VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = False + btnSQLView.Enabled = False End If End If End Sub @@ -991,13 +985,21 @@ Public Class frmAdministration Private Sub WD_INDEXComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WD_INDEXComboBox.SelectedIndexChanged _indexIsVectorField = indexIsVectorField() - MULTISELECTCheckBox.Visible = _indexIsVectorField - 'VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = _indexIsVectorField + MULTISELECTCheckBox.Enabled = _indexIsVectorField + If Not _indexIsVectorField Then MULTISELECTCheckBox.Checked = False 'VKT_PREVENT_MULTIPLE_VALUESCheckbox.Checked = False End If + + If MULTISELECTCheckBox.Checked Then + VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = True + VKT_ADD_ITEMCheckbox.Enabled = True + Else + VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = False + VKT_ADD_ITEMCheckbox.Enabled = False + End If End Sub Private Function indexIsVectorField() As Boolean @@ -1412,14 +1414,6 @@ Public Class frmAdministration EnableControls(XtraTabPageProfileRegex) End Sub - Private Sub ListBoxControl3_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBoxControl3.SelectedIndexChanged - If ListBoxControl3.SelectedIndex = -1 Then - EnableControls(Panel1, False) - Else - EnableControls(Panel1) - End If - End Sub - Private Sub GridView1_ValidateRow(sender As Object, e As ValidateRowEventArgs) Handles GridView1.ValidateRow e.Valid = True End Sub @@ -1427,4 +1421,36 @@ Public Class frmAdministration Private Sub GridView1_InvalidRowException(sender As Object, e As InvalidRowExceptionEventArgs) Handles GridView1.InvalidRowException e.ExceptionMode = DevExpress.XtraEditors.Controls.ExceptionMode.NoAction End Sub + + Private Sub MULTISELECTCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles MULTISELECTCheckBox.CheckedChanged + If MULTISELECTCheckBox.Checked Then + VKT_ADD_ITEMCheckbox.Enabled = True + VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = True + Else + VKT_ADD_ITEMCheckbox.Enabled = False + VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = False + End If + End Sub + + Private Sub TBDD_INDEX_MANBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBDD_INDEX_MANBindingSource.CurrentChanged + If ListBoxControl3.SelectedIndex = -1 Then + EnableControls(Panel1, False) + Else + EnableControls(Panel1) + End If + + If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then + btnSQLView.Enabled = True + Else + btnSQLView.Enabled = False + End If + + If MULTISELECTCheckBox.Checked Then + VKT_ADD_ITEMCheckbox.Enabled = True + VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = True + Else + VKT_ADD_ITEMCheckbox.Enabled = False + VKT_PREVENT_MULTIPLE_VALUESCheckbox.Enabled = False + End If + End Sub End Class