fix admin layout, added who,etc textboxes, postprocessing inputs

2020-05-29 15:14:11 +02:00 · 2020-05-29 15:14:11 +02:00 · 8c11a8170f
commit 8c11a8170f
parent 71c05a0fba
3 changed files with 708 additions and 1113 deletions
--- a/Global_Indexer/frmAdministration.Designer.vb
+++ b/Global_Indexer/frmAdministration.Designer.vb
@ -107,6 +107,11 @@ Partial Class frmAdministration
        Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem28 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem29 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem30 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarSubItem2 = New DevExpress.XtraBars.BarSubItem()
+        Me.BarButtonItem31 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem32 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem33 = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@ -196,9 +201,9 @@ Partial Class frmAdministration
        Me.ADDED_WHENTextBox4 = New System.Windows.Forms.TextBox()
        Me.ADDED_WHOTextBox4 = New System.Windows.Forms.TextBox()
        Me.SEQUENCETextBox1 = New System.Windows.Forms.TextBox()
-        Me.TEXT3TextBox = New System.Windows.Forms.TextBox()
-        Me.TEXT2TextBox = New System.Windows.Forms.TextBox()
-        Me.TEXT1TextBox = New System.Windows.Forms.TextBox()
+        Me.Text3TextBox = New System.Windows.Forms.TextBox()
+        Me.Text2TextBox = New System.Windows.Forms.TextBox()
+        Me.Text1TextBox = New System.Windows.Forms.TextBox()
        Me.FUNCTION2TextBox = New System.Windows.Forms.TextBox()
        Me.FUNCTION1TextBox = New System.Windows.Forms.TextBox()
        Me.TYPEComboBox = New System.Windows.Forms.ComboBox()
@ -305,11 +310,6 @@ Partial Class frmAdministration
        Me.TBGI_REGEX_DOCTYPETableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBGI_REGEX_DOCTYPETableAdapter()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPage8 = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.BarButtonItem30 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarSubItem2 = New DevExpress.XtraBars.BarSubItem()
-        Me.BarButtonItem31 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem32 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem33 = New DevExpress.XtraBars.BarButtonItem()
        GUIDLabel = New System.Windows.Forms.Label()
        GUIDLabel1 = New System.Windows.Forms.Label()
        NAMELabel = New System.Windows.Forms.Label()
@ -713,6 +713,36 @@ Partial Class frmAdministration
        Me.BarButtonItem29.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem29.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.BarButtonItem29.Name = "BarButtonItem29"
        '
+        'BarButtonItem30
+        '
+        resources.ApplyResources(Me.BarButtonItem30, "BarButtonItem30")
+        Me.BarButtonItem30.Id = 40
+        Me.BarButtonItem30.Name = "BarButtonItem30"
+        '
+        'BarSubItem2
+        '
+        resources.ApplyResources(Me.BarSubItem2, "BarSubItem2")
+        Me.BarSubItem2.Id = 41
+        Me.BarSubItem2.Name = "BarSubItem2"
+        '
+        'BarButtonItem31
+        '
+        resources.ApplyResources(Me.BarButtonItem31, "BarButtonItem31")
+        Me.BarButtonItem31.Id = 42
+        Me.BarButtonItem31.Name = "BarButtonItem31"
+        '
+        'BarButtonItem32
+        '
+        resources.ApplyResources(Me.BarButtonItem32, "BarButtonItem32")
+        Me.BarButtonItem32.Id = 43
+        Me.BarButtonItem32.Name = "BarButtonItem32"
+        '
+        'BarButtonItem33
+        '
+        resources.ApplyResources(Me.BarButtonItem33, "BarButtonItem33")
+        Me.BarButtonItem33.Id = 44
+        Me.BarButtonItem33.Name = "BarButtonItem33"
+        '
        'RibbonPageStart
        '
        Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1, Me.RibbonPageGroupManualIndex, Me.RibbonPageGroupManualIndexFunctions, Me.RibbonPageGroupAutoIndex, Me.RibbonPageGroupProfileRegex})
@ -1448,9 +1478,9 @@ Partial Class frmAdministration
        Me.XtraTabPageManualIndexFunctions.Controls.Add(Me.ADDED_WHOTextBox4)
        Me.XtraTabPageManualIndexFunctions.Controls.Add(SEQUENCELabel1)
        Me.XtraTabPageManualIndexFunctions.Controls.Add(Me.SEQUENCETextBox1)
-        Me.XtraTabPageManualIndexFunctions.Controls.Add(Me.TEXT3TextBox)
-        Me.XtraTabPageManualIndexFunctions.Controls.Add(Me.TEXT2TextBox)
-        Me.XtraTabPageManualIndexFunctions.Controls.Add(Me.TEXT1TextBox)
+        Me.XtraTabPageManualIndexFunctions.Controls.Add(Me.Text3TextBox)
+        Me.XtraTabPageManualIndexFunctions.Controls.Add(Me.Text2TextBox)
+        Me.XtraTabPageManualIndexFunctions.Controls.Add(Me.Text1TextBox)
        Me.XtraTabPageManualIndexFunctions.Controls.Add(Me.FUNCTION2TextBox)
        Me.XtraTabPageManualIndexFunctions.Controls.Add(Me.FUNCTION1TextBox)
        Me.XtraTabPageManualIndexFunctions.Controls.Add(TYPELabel)
@ -1588,23 +1618,23 @@ Partial Class frmAdministration
        resources.ApplyResources(Me.SEQUENCETextBox1, "SEQUENCETextBox1")
        Me.SEQUENCETextBox1.Name = "SEQUENCETextBox1"
        '
-        'TEXT3TextBox
+        'Text3TextBox
        '
-        Me.TEXT3TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingSource, "TEXT3", True))
-        resources.ApplyResources(Me.TEXT3TextBox, "TEXT3TextBox")
-        Me.TEXT3TextBox.Name = "TEXT3TextBox"
+        Me.Text3TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingSource, "TEXT3", True))
+        resources.ApplyResources(Me.Text3TextBox, "Text3TextBox")
+        Me.Text3TextBox.Name = "Text3TextBox"
        '
-        'TEXT2TextBox
+        'Text2TextBox
        '
-        Me.TEXT2TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingSource, "TEXT2", True))
-        resources.ApplyResources(Me.TEXT2TextBox, "TEXT2TextBox")
-        Me.TEXT2TextBox.Name = "TEXT2TextBox"
+        Me.Text2TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingSource, "TEXT2", True))
+        resources.ApplyResources(Me.Text2TextBox, "Text2TextBox")
+        Me.Text2TextBox.Name = "Text2TextBox"
        '
-        'TEXT1TextBox
+        'Text1TextBox
        '
-        Me.TEXT1TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingSource, "TEXT1", True))
-        resources.ApplyResources(Me.TEXT1TextBox, "TEXT1TextBox")
-        Me.TEXT1TextBox.Name = "TEXT1TextBox"
+        Me.Text1TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MAN_POSTPROCESSINGBindingSource, "TEXT1", True))
+        resources.ApplyResources(Me.Text1TextBox, "Text1TextBox")
+        Me.Text1TextBox.Name = "Text1TextBox"
        '
        'FUNCTION2TextBox
        '
@ -2445,36 +2475,6 @@ Partial Class frmAdministration
        Me.RibbonPage8.Name = "RibbonPage8"
        resources.ApplyResources(Me.RibbonPage8, "RibbonPage8")
        '
-        'BarButtonItem30
-        '
-        resources.ApplyResources(Me.BarButtonItem30, "BarButtonItem30")
-        Me.BarButtonItem30.Id = 40
-        Me.BarButtonItem30.Name = "BarButtonItem30"
-        '
-        'BarSubItem2
-        '
-        resources.ApplyResources(Me.BarSubItem2, "BarSubItem2")
-        Me.BarSubItem2.Id = 41
-        Me.BarSubItem2.Name = "BarSubItem2"
-        '
-        'BarButtonItem31
-        '
-        resources.ApplyResources(Me.BarButtonItem31, "BarButtonItem31")
-        Me.BarButtonItem31.Id = 42
-        Me.BarButtonItem31.Name = "BarButtonItem31"
-        '
-        'BarButtonItem32
-        '
-        resources.ApplyResources(Me.BarButtonItem32, "BarButtonItem32")
-        Me.BarButtonItem32.Id = 43
-        Me.BarButtonItem32.Name = "BarButtonItem32"
-        '
-        'BarButtonItem33
-        '
-        resources.ApplyResources(Me.BarButtonItem33, "BarButtonItem33")
-        Me.BarButtonItem33.Id = 44
-        Me.BarButtonItem33.Name = "BarButtonItem33"
-        '
        'frmAdministration
        '
        Me.Appearance.Options.UseFont = True
@ -2627,9 +2627,9 @@ Partial Class frmAdministration
    Friend WithEvents TBDD_INDEX_MAN_POSTPROCESSINGBindingSource As System.Windows.Forms.BindingSource
    Friend WithEvents TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter As Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter
    Friend WithEvents SEQUENCETextBox1 As System.Windows.Forms.TextBox
-    Friend WithEvents TEXT3TextBox As System.Windows.Forms.TextBox
-    Friend WithEvents TEXT2TextBox As System.Windows.Forms.TextBox
-    Friend WithEvents TEXT1TextBox As System.Windows.Forms.TextBox
+    Friend WithEvents Text3TextBox As System.Windows.Forms.TextBox
+    Friend WithEvents Text2TextBox As System.Windows.Forms.TextBox
+    Friend WithEvents Text1TextBox As System.Windows.Forms.TextBox
    Friend WithEvents FUNCTION2TextBox As System.Windows.Forms.TextBox
    Friend WithEvents FUNCTION1TextBox As System.Windows.Forms.TextBox
    Friend WithEvents TYPEComboBox As System.Windows.Forms.ComboBox
--- a/Global_Indexer/frmAdministration.resx
+++ b/Global_Indexer/frmAdministration.resx
--- a/Global_Indexer/frmAdministration.vb
+++ b/Global_Indexer/frmAdministration.vb
@ -633,9 +633,13 @@ Public Class frmAdministration

    Private Sub TYPEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TYPEComboBox.SelectedIndexChanged
        If TYPEComboBox.SelectedIndex <> -1 Then
+            FUNCTION1TextBox.Visible = False
+            FUNCTION2TextBox.Visible = False
+            Function1Label.Visible = False
+            Function2Label.Visible = False
+
            Select Case TYPEComboBox.Text
                Case "VBREPLACE"
-
                    If USER_LANGUAGE = "de-DE" Then
                        Text1Label.Text = "Alter Wert:"
                        Text2Label.Text = "Neuer Wert:"
@ -644,74 +648,52 @@ Public Class frmAdministration
                        Text2Label.Text = "New Value:"
                    End If

-                    Me.TEXT1TextBox.Visible = True
-                    TEXT1TextBox.Width = 165
+                    Text1Label.Visible = True
+                    Text1TextBox.Visible = True
+                    Text1TextBox.Width = 150

-                    Me.TEXT2TextBox.Visible = True
-                    Me.TEXT2TextBox.Width = 191
-                    Me.Text3Label.Visible = False
-                    Me.TEXT3TextBox.Visible = False
-                    Me.FUNCTION1TextBox.Visible = False
-                    Me.FUNCTION2TextBox.Visible = False
-                    Me.Function1Label.Visible = False
-                    Me.Function2Label.Visible = False
+                    Text2Label.Visible = True
+                    Text2TextBox.Visible = True
+                    Text2TextBox.Width = 150

-                    Me.Function1Label.Visible = False
-                    Me.Function2Label.Visible = False
-                    Me.FUNCTION1TextBox.Visible = False
-                    Me.FUNCTION2TextBox.Visible = False
+                    Text3Label.Visible = False
+                    Text3TextBox.Visible = False

                Case "VBSPLIT"
-
                    If USER_LANGUAGE = "de-DE" Then
                        Text1Label.Text = "Split-Zeichen:"
-                        Text2Label.Text = "Wähle Vorkommen: Achtung Nullbasierend - Erstes Vorkommen = '0'"
+                        Text2Label.Text = "Wähle Vorkommen: (Nullbasierend)"
                    Else
                        Text1Label.Text = "Split-Character:"
-                        Text2Label.Text = "Choose occurrence: 0-Based - First occurrence = '0'"
+                        Text2Label.Text = "Choose occurrence: (Zero-Based)"
                    End If

-                    Me.FUNCTION1TextBox.Visible = True
-                    Me.FUNCTION2TextBox.Visible = True
-                    Me.Function1Label.Visible = True
-                    Me.Function2Label.Visible = True
+                    Text1Label.Visible = True
+                    Text1TextBox.Visible = True
+                    Text1TextBox.Width = 150

+                    Text2Label.Visible = True
+                    Text2TextBox.Visible = True
+                    Text2TextBox.Width = 150

-                    Me.TEXT1TextBox.Visible = True
-                    TEXT1TextBox.Width = 50
+                    Text3Label.Visible = False
+                    Text3TextBox.Visible = False

-                    Me.TEXT2TextBox.Visible = True
-                    Me.TEXT2TextBox.Width = 50
-                    Me.TEXT3TextBox.Visible = False
-                    Me.Text3Label.Visible = False
-
-                    Me.Function1Label.Visible = False
-                    Me.Function2Label.Visible = False
-                    Me.FUNCTION1TextBox.Visible = False
-                    Me.FUNCTION2TextBox.Visible = False
                Case "REG. EXPRESSION"
-
                    If USER_LANGUAGE = "de-DE" Then
-                        Me.Text1Label.Text = "Regulärer Ausdruck:"
+                        Text1Label.Text = "Regulärer Ausdruck:"
                    Else
-                        Me.Text1Label.Text = "Regular Expression:"
+                        Text1Label.Text = "Regular Expression:"
                    End If

-                    Me.TEXT1TextBox.Visible = True
-                    TEXT1TextBox.Width = 537
-                    Me.Text2Label.Visible = False
-                    Me.TEXT2TextBox.Visible = False
-                    Me.Text3Label.Visible = False
-                    Me.TEXT3TextBox.Visible = False
-                    Me.FUNCTION1TextBox.Visible = False
-                    Me.FUNCTION2TextBox.Visible = False
-                    Me.Function1Label.Visible = False
-                    Me.Function2Label.Visible = False
+                    Text1TextBox.Visible = True
+                    Text1TextBox.Width = 300

-                    Me.Function1Label.Visible = False
-                    Me.Function2Label.Visible = False
-                    Me.FUNCTION1TextBox.Visible = False
-                    Me.FUNCTION2TextBox.Visible = False
+                    Text2Label.Visible = False
+                    Text2TextBox.Visible = False
+
+                    Text3Label.Visible = False
+                    Text3TextBox.Visible = False
            End Select
        End If