From 25aabe145d8232f262b303c5335de836505c109e Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 4 Mar 2020 12:48:17 +0100 Subject: [PATCH] enable/disable profile regex buttons --- Global_Indexer/frmAdministration.Designer.vb | 29 ++++++------- Global_Indexer/frmAdministration.resx | 44 ++++++++++---------- Global_Indexer/frmAdministration.vb | 4 ++ 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index a49f0ef..7a718ee 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -114,7 +114,7 @@ Partial Class frmAdministration Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupProfileRegex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.Label12 = New System.Windows.Forms.Label() Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() @@ -259,11 +259,11 @@ Partial Class frmAdministration Me.cmbCrFolderIndex = New System.Windows.Forms.ComboBox() Me.Label17 = New System.Windows.Forms.Label() Me.XtraTabPageProfileRegex = New DevExpress.XtraTab.XtraTabPage() - Me.TBGI_REGEX_DOCTYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TextBox1 = New System.Windows.Forms.TextBox() Me.Label27 = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() Me.TextBox2 = New System.Windows.Forms.TextBox() + Me.TBGI_REGEX_DOCTYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TextBox3 = New System.Windows.Forms.TextBox() Me.TextBox4 = New System.Windows.Forms.TextBox() Me.TextBox5 = New System.Windows.Forms.TextBox() @@ -698,7 +698,7 @@ Partial Class frmAdministration ' 'RibbonPageStart ' - Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1, Me.RibbonPageGroup5}) + Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1, Me.RibbonPageGroupProfileRegex}) Me.RibbonPageStart.Name = "RibbonPageStart" resources.ApplyResources(Me.RibbonPageStart, "RibbonPageStart") ' @@ -721,12 +721,13 @@ Partial Class frmAdministration Me.RibbonPageGroup1.Name = "RibbonPageGroup1" resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") ' - 'RibbonPageGroup5 + 'RibbonPageGroupProfileRegex ' - Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem13) - Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem14) - Me.RibbonPageGroup5.Name = "RibbonPageGroup5" - resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") + Me.RibbonPageGroupProfileRegex.Enabled = False + Me.RibbonPageGroupProfileRegex.ItemLinks.Add(Me.BarButtonItem13) + Me.RibbonPageGroupProfileRegex.ItemLinks.Add(Me.BarButtonItem14) + Me.RibbonPageGroupProfileRegex.Name = "RibbonPageGroupProfileRegex" + resources.ApplyResources(Me.RibbonPageGroupProfileRegex, "RibbonPageGroupProfileRegex") ' 'RibbonStatusBar1 ' @@ -2001,11 +2002,6 @@ Partial Class frmAdministration Me.XtraTabPageProfileRegex.Name = "XtraTabPageProfileRegex" resources.ApplyResources(Me.XtraTabPageProfileRegex, "XtraTabPageProfileRegex") ' - 'TBGI_REGEX_DOCTYPEBindingSource - ' - Me.TBGI_REGEX_DOCTYPEBindingSource.DataMember = "TBGI_REGEX_DOCTYPE" - Me.TBGI_REGEX_DOCTYPEBindingSource.DataSource = Me.MyDataset - ' 'TextBox1 ' Me.TextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.Global_Indexer.My.MySettings.Default, "FilenameTest", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) @@ -2036,6 +2032,11 @@ Partial Class frmAdministration Me.TextBox2.Name = "TextBox2" Me.TextBox2.ReadOnly = True ' + 'TBGI_REGEX_DOCTYPEBindingSource + ' + Me.TBGI_REGEX_DOCTYPEBindingSource.DataMember = "TBGI_REGEX_DOCTYPE" + Me.TBGI_REGEX_DOCTYPEBindingSource.DataSource = Me.MyDataset + ' 'Label29 ' resources.ApplyResources(Label29, "Label29") @@ -3049,5 +3050,5 @@ Partial Class frmAdministration Friend WithEvents BarButtonItem12 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem13 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem14 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupProfileRegex As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index d6a36a8..80588f6 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -543,21 +543,21 @@ 0, 0 - - Gruppenzuordnung - User-/Gruppenverwaltung - - E-Mail Indexierung - - - E-Mail Indexierung - Weitere Einstellungen + + Grundeinstellungen + + + Profile + + + Automatische Profilauswahl + Start @@ -893,17 +893,17 @@ 134, 17 - + Gruppenzuordnung - - Grundeinstellungen + + Gruppenzuordnung - - Profile + + E-Mail Indexierung - - Automatische Profilauswahl + + E-Mail Indexierung Fill @@ -7015,9 +7015,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 5 - - 17, 290 - 119, 65 @@ -7153,6 +7150,9 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 4 + + 17, 290 + False @@ -9383,10 +9383,10 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup5 + + RibbonPageGroupProfileRegex - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 950929c..4b42fbc 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -101,6 +101,9 @@ Public Class frmAdministration If frmloaded = False Then Exit Sub End If + + RibbonPageGroupProfileRegex.Enabled = False + Select Case XtraTabControl2.SelectedTabPage.Name Case XtraTabPageManualIndex.Name If DOKART_GUIDTextBox.Text <> "" Then @@ -120,6 +123,7 @@ Public Class frmAdministration End Try Case XtraTabPageProfileRegex.Name TBGI_REGEX_DOCTYPETableAdapter.Fill(MyDataset.TBGI_REGEX_DOCTYPE, DOKART_GUIDTextBox.Text) + RibbonPageGroupProfileRegex.Enabled = True End Select End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click