diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index ca7ca51..c422e10 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -335,6 +335,8 @@ 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.BarButtonItem28 = New DevExpress.XtraBars.BarButtonItem() + Me.Panel1 = New System.Windows.Forms.Panel() GUIDLabel = New System.Windows.Forms.Label() CHANGED_WHENLabel = New System.Windows.Forms.Label() CHANGED_WHOLabel = New System.Windows.Forms.Label() @@ -454,6 +456,7 @@ Partial Class frmAdministration CType(Me.TBDD_DOKART_MODULEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWGI_USER_GROUPS_RELATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBGI_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() Me.SuspendLayout() ' 'GUIDLabel @@ -520,9 +523,9 @@ Partial Class frmAdministration 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem6, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem7, Me.BarButtonItem8, Me.txtStatus, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem15, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarButtonItem27}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem6, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem7, Me.BarButtonItem8, Me.txtStatus, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem15, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarButtonItem27, Me.BarButtonItem28}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 37 + Me.RibbonControl1.MaxItemId = 38 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryUserGroups, Me.RibbonPageCategoryMisc}) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart}) @@ -648,6 +651,7 @@ Partial Class frmAdministration Me.BarButtonItem14.Id = 24 Me.BarButtonItem14.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem14.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem14.Name = "BarButtonItem14" + Me.BarButtonItem14.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText ' 'BarButtonItem16 ' @@ -843,6 +847,7 @@ Partial Class frmAdministration 'RibbonPageGroupProfileRegex ' Me.RibbonPageGroupProfileRegex.Enabled = False + Me.RibbonPageGroupProfileRegex.ItemLinks.Add(Me.BarButtonItem28) Me.RibbonPageGroupProfileRegex.ItemLinks.Add(Me.BarButtonItem13) Me.RibbonPageGroupProfileRegex.ItemLinks.Add(Me.BarButtonItem14) Me.RibbonPageGroupProfileRegex.Name = "RibbonPageGroupProfileRegex" @@ -1242,37 +1247,8 @@ Partial Class frmAdministration 'XtraTabPageManualIndex ' resources.ApplyResources(Me.XtraTabPageManualIndex, "XtraTabPageManualIndex") + Me.XtraTabPageManualIndex.Controls.Add(Me.Panel1) Me.XtraTabPageManualIndex.Controls.Add(Me.ListBoxControl3) - Me.XtraTabPageManualIndex.Controls.Add(Me.VKT_PREVENT_MULTIPLE_VALUESCheckbox) - Me.XtraTabPageManualIndex.Controls.Add(Me.VKT_ADD_ITEMCheckbox) - Me.XtraTabPageManualIndex.Controls.Add(Me.MULTISELECTCheckBox) - Me.XtraTabPageManualIndex.Controls.Add(Me.SAVE_VALUECheckBox) - Me.XtraTabPageManualIndex.Controls.Add(Me.lblWDINDEX) - Me.XtraTabPageManualIndex.Controls.Add(Me.OPTIONALCheckBox) - Me.XtraTabPageManualIndex.Controls.Add(Me.btnSQLView) - Me.XtraTabPageManualIndex.Controls.Add(CHANGED_WHENLabel) - Me.XtraTabPageManualIndex.Controls.Add(Me.CHANGED_WHENTextBox) - Me.XtraTabPageManualIndex.Controls.Add(CHANGED_WHOLabel) - Me.XtraTabPageManualIndex.Controls.Add(Me.CHANGED_WHOTextBox) - Me.XtraTabPageManualIndex.Controls.Add(ADDED_WHENLabel) - Me.XtraTabPageManualIndex.Controls.Add(Me.ADDED_WHENTextBox) - Me.XtraTabPageManualIndex.Controls.Add(ADDED_WHOLabel) - Me.XtraTabPageManualIndex.Controls.Add(Me.ADDED_WHOTextBox) - Me.XtraTabPageManualIndex.Controls.Add(Me.ACTIVECheckBox) - Me.XtraTabPageManualIndex.Controls.Add(SEQUENCELabel) - Me.XtraTabPageManualIndex.Controls.Add(Me.SEQUENCETextBox) - Me.XtraTabPageManualIndex.Controls.Add(DEFAULT_VALUELabel) - Me.XtraTabPageManualIndex.Controls.Add(Me.DEFAULT_VALUETextBox) - Me.XtraTabPageManualIndex.Controls.Add(Me.SUGGESTIONCheckBox) - Me.XtraTabPageManualIndex.Controls.Add(DATATYPELabel) - Me.XtraTabPageManualIndex.Controls.Add(Me.DATATYPEComboBox) - Me.XtraTabPageManualIndex.Controls.Add(COMMENTLabel) - Me.XtraTabPageManualIndex.Controls.Add(Me.COMMENTTextBox) - Me.XtraTabPageManualIndex.Controls.Add(Me.WD_INDEXComboBox) - Me.XtraTabPageManualIndex.Controls.Add(NAMELabel) - Me.XtraTabPageManualIndex.Controls.Add(Me.NAMETextBox) - Me.XtraTabPageManualIndex.Controls.Add(GUIDLabel1) - Me.XtraTabPageManualIndex.Controls.Add(Me.GUIDTextBox1) Me.XtraTabPageManualIndex.Name = "XtraTabPageManualIndex" ' 'ListBoxControl3 @@ -2684,6 +2660,48 @@ Partial Class frmAdministration Me.RibbonPage8.Name = "RibbonPage8" resources.ApplyResources(Me.RibbonPage8, "RibbonPage8") ' + 'BarButtonItem28 + ' + resources.ApplyResources(Me.BarButtonItem28, "BarButtonItem28") + Me.BarButtonItem28.Id = 37 + Me.BarButtonItem28.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem28.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem28.Name = "BarButtonItem28" + ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.ACTIVECheckBox) + Me.Panel1.Controls.Add(Me.GUIDTextBox1) + Me.Panel1.Controls.Add(Me.VKT_PREVENT_MULTIPLE_VALUESCheckbox) + Me.Panel1.Controls.Add(GUIDLabel1) + Me.Panel1.Controls.Add(Me.VKT_ADD_ITEMCheckbox) + Me.Panel1.Controls.Add(Me.NAMETextBox) + Me.Panel1.Controls.Add(Me.MULTISELECTCheckBox) + Me.Panel1.Controls.Add(NAMELabel) + Me.Panel1.Controls.Add(Me.SAVE_VALUECheckBox) + Me.Panel1.Controls.Add(Me.WD_INDEXComboBox) + Me.Panel1.Controls.Add(Me.lblWDINDEX) + Me.Panel1.Controls.Add(Me.COMMENTTextBox) + Me.Panel1.Controls.Add(Me.OPTIONALCheckBox) + Me.Panel1.Controls.Add(COMMENTLabel) + Me.Panel1.Controls.Add(Me.btnSQLView) + Me.Panel1.Controls.Add(Me.DATATYPEComboBox) + Me.Panel1.Controls.Add(CHANGED_WHENLabel) + Me.Panel1.Controls.Add(DATATYPELabel) + Me.Panel1.Controls.Add(Me.CHANGED_WHENTextBox) + Me.Panel1.Controls.Add(Me.SUGGESTIONCheckBox) + Me.Panel1.Controls.Add(CHANGED_WHOLabel) + Me.Panel1.Controls.Add(Me.DEFAULT_VALUETextBox) + Me.Panel1.Controls.Add(Me.CHANGED_WHOTextBox) + Me.Panel1.Controls.Add(DEFAULT_VALUELabel) + Me.Panel1.Controls.Add(ADDED_WHENLabel) + Me.Panel1.Controls.Add(Me.SEQUENCETextBox) + Me.Panel1.Controls.Add(Me.ADDED_WHENTextBox) + Me.Panel1.Controls.Add(SEQUENCELabel) + Me.Panel1.Controls.Add(ADDED_WHOLabel) + Me.Panel1.Controls.Add(Me.ADDED_WHOTextBox) + resources.ApplyResources(Me.Panel1, "Panel1") + Me.Panel1.Name = "Panel1" + ' 'frmAdministration ' Me.Appearance.Options.UseFont = True @@ -2727,7 +2745,6 @@ Partial Class frmAdministration CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl2.ResumeLayout(False) Me.XtraTabPageManualIndex.ResumeLayout(False) - Me.XtraTabPageManualIndex.PerformLayout() CType(Me.ListBoxControl3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_INDEX_MANBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageManualIndexFunctions.ResumeLayout(False) @@ -2766,6 +2783,8 @@ Partial Class frmAdministration CType(Me.TBDD_DOKART_MODULEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VWGI_USER_GROUPS_RELATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBGI_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -3023,4 +3042,6 @@ Partial Class frmAdministration Friend WithEvents GridColumn8 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn9 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn4 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents BarButtonItem28 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents Panel1 As Panel End Class diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index ac414f1..6d3abb2 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -794,6 +794,27 @@ TTIzLjEsMjAuMmwtMi44LDIuOEwxNiwxOC44bC00LjIsNC4yICAgbC0yLjgtMi44bDQuMi00LjJsLTQu Mi00LjJsMi44LTIuOGw0LjIsNC4ybDQuMi00LjJsMi44LDIuOEwxOC44LDE2TDIzLjEsMjAuMnoiIGNs YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + Neue Auswahl + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZENpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0xNiw0 + QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0 + LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N + Cjwvc3ZnPgs= @@ -1683,39 +1704,886 @@ 0, 283 - - False + + True + + + 17, 95 - + False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - + + + 6, 3 + + + 61, 24 + + + 19 + + + Aktiv + + + ACTIVECheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 0 + + + Tahoma, 8.25pt + + + 6, 47 + + + 53, 21 + + + 1 + + + GUIDTextBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 1 + + + NoControl + + + 595, 133 + + + 167, 24 + + + 94 + + + Doppelte Einträge verhindern + + + VKT_PREVENT_MULTIPLE_VALUESCheckbox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 2 + False - + True + + Segoe UI, 9pt, style=Italic + + + 3, 30 + + + 22, 15 + + + 0 + + + ID: + + + GUIDLabel1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 3 + + + 317, 133 + + + 128, 24 + + + 94 + + + Neueingabe erlauben + + + VKT_ADD_ITEMCheckbox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 4 + + + False + + + Tahoma, 8.25pt + + + 65, 47 + + + 272, 21 + + + 4 + + + NAMETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 5 + + + 471, 133 + + + 115, 24 + + + 93 + + + Mehrfachauswahl + + + MULTISELECTCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 6 + + + False + + + True + + + 62, 31 + + + 71, 13 + + + 3 + + + Bezeichnung: + + + NAMELabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 7 + + + 172, 218 + + + 152, 41 + + + 92 + + + Letzte erfolgreiche Eingabe speichern + + + SAVE_VALUECheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 8 + + + False + + + 343, 47 + + + 231, 21 + + + 6 + + + WD_INDEXComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 9 + + + True + + + 340, 31 + + + 89, 13 + + + 91 + + + windream-Index: + + + lblWDINDEX + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 10 + + + False + + + 6, 92 + + + 509, 21 + + + 8 + + + COMMENTTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 11 + + + False + + + 6, 218 + + + 180, 41 + + + 90 + + + Optional/Nur für Benennung +der Datei + + + OPTIONALCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 12 + + + False + + + True + + + 3, 74 + + + 47, 13 + + + 7 + + + Hinweis: + + + COMMENTLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 13 + + + False + + + MiddleLeft + + + 595, 162 + + + 136, 23 + + + 80 + + + Show SQL Config + + + MiddleRight + + + False + + + btnSQLView + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 14 + + + False + + + BOOLEAN + + + DATE + + + INTEGER + + + VARCHAR + + + 6, 136 + + + 145, 21 + + + 10 + + + DATATYPEComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 15 + + + False + + + True + + + Segoe UI, 9pt + + + 765, 160 + + + 90, 15 + + + 25 + + + Geändert wann: + + + CHANGED_WHENLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 16 + + + False + + + True + + + 3, 118 + + + 56, 13 + + + 9 + + + Datentyp: + + + DATATYPELabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 17 + + + Segoe UI, 9pt, style=Italic + + + 767, 178 + + + 156, 23 + + + 26 + + + CHANGED_WHENTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 18 + + + False + + + 170, 133 + + + 141, 24 + + + 12 + + + Vorschlagsliste per SQL + + + SUGGESTIONCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 19 + + + False + + + True + + + Segoe UI, 9pt + + + 764, 117 + + + 80, 15 + + + 23 + + + Geändert wer: + + + CHANGED_WHOLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 20 + + + False + + + 6, 180 + + + 318, 21 + + + 13 + + + DEFAULT_VALUETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 21 + + + Segoe UI, 9pt, style=Italic + + + 767, 134 + + + 156, 23 + + + 24 + + + CHANGED_WHOTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 22 + + + False + + + True + + + 3, 162 + + + 74, 13 + + + 12 + + + Default-Wert: + + + DEFAULT_VALUELabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 23 + + + False + + + True + + + Segoe UI, 9pt + + + 765, 73 + + + 77, 15 + + + 21 + + + Erstellt wann: + + + ADDED_WHENLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 24 + + + False + + + 580, 47 + + + 70, 21 + + + 17 + + + SEQUENCETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 25 + + + Segoe UI, 9pt, style=Italic + + + 768, 91 + + + 155, 23 + + + 22 + + + ADDED_WHENTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 26 + + + False + + + True + + + 577, 31 + + + 68, 13 + + + 16 + + + Reihenfolge: + + + SEQUENCELabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 27 + + + False + + + True + + + Segoe UI, 9pt + + + 765, 28 + + + 67, 15 + + + 19 + + + Erstellt wer: + + + ADDED_WHOLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 28 + + + Segoe UI, 9pt, style=Italic + + + 768, 46 + + + 155, 23 + + + 20 + + + ADDED_WHOTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 29 + + + Fill + + + 150, 0 + + + 962, 281 + + + 96 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPageManualIndex + + + 0 + + + Left + + + 0, 0 + + + 150, 281 + + + 95 + ListBoxControl3 @@ -1726,368 +2594,8 @@ XtraTabPageManualIndex - 0 - - - VKT_PREVENT_MULTIPLE_VALUESCheckbox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - 1 - - VKT_ADD_ITEMCheckbox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 2 - - - MULTISELECTCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 3 - - - SAVE_VALUECheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 4 - - - lblWDINDEX - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 5 - - - OPTIONALCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 6 - - - btnSQLView - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 7 - - - CHANGED_WHENLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 8 - - - CHANGED_WHENTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 9 - - - CHANGED_WHOLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 10 - - - CHANGED_WHOTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 11 - - - ADDED_WHENLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 12 - - - ADDED_WHENTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 13 - - - ADDED_WHOLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 14 - - - ADDED_WHOTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 15 - - - ACTIVECheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 16 - - - SEQUENCELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 17 - - - SEQUENCETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 18 - - - DEFAULT_VALUELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 19 - - - DEFAULT_VALUETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 20 - - - SUGGESTIONCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 21 - - - DATATYPELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 22 - - - DATATYPEComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 23 - - - COMMENTLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 24 - - - COMMENTTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 25 - - - WD_INDEXComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 26 - - - NAMELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 27 - - - NAMETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 28 - - - GUIDLabel1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 29 - - - GUIDTextBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 30 - 1112, 281 @@ -3933,874 +4441,6 @@ 0 - - 17, 95 - - - Left - - - 0, 0 - - - 150, 281 - - - 95 - - - ListBoxControl3 - - - DevExpress.XtraEditors.ListBoxControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageManualIndex - - - 0 - - - 17, 95 - - - NoControl - - - 751, 133 - - - 167, 24 - - - 94 - - - Doppelte Einträge verhindern - - - VKT_PREVENT_MULTIPLE_VALUESCheckbox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 1 - - - 473, 133 - - - 128, 24 - - - 94 - - - Neueingabe erlauben - - - VKT_ADD_ITEMCheckbox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 2 - - - 627, 133 - - - 115, 24 - - - 93 - - - Mehrfachauswahl - - - MULTISELECTCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 3 - - - 328, 218 - - - 152, 41 - - - 92 - - - Letzte erfolgreiche Eingabe speichern - - - SAVE_VALUECheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 4 - - - True - - - 496, 31 - - - 89, 13 - - - 91 - - - windream-Index: - - - lblWDINDEX - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 5 - - - False - - - 162, 218 - - - 180, 41 - - - 90 - - - Optional/Nur für Benennung -der Datei - - - OPTIONALCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 6 - - - False - - - MiddleLeft - - - 751, 162 - - - 136, 23 - - - 80 - - - Show SQL Config - - - MiddleRight - - - False - - - btnSQLView - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 7 - - - False - - - True - - - Segoe UI, 9pt - - - 921, 160 - - - 90, 15 - - - 25 - - - Geändert wann: - - - CHANGED_WHENLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 8 - - - Segoe UI, 9pt, style=Italic - - - 923, 178 - - - 156, 23 - - - 26 - - - CHANGED_WHENTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 9 - - - False - - - True - - - Segoe UI, 9pt - - - 920, 117 - - - 80, 15 - - - 23 - - - Geändert wer: - - - CHANGED_WHOLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 10 - - - Segoe UI, 9pt, style=Italic - - - 923, 134 - - - 156, 23 - - - 24 - - - CHANGED_WHOTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 11 - - - False - - - True - - - Segoe UI, 9pt - - - 921, 73 - - - 77, 15 - - - 21 - - - Erstellt wann: - - - ADDED_WHENLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 12 - - - Segoe UI, 9pt, style=Italic - - - 924, 91 - - - 155, 23 - - - 22 - - - ADDED_WHENTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 13 - - - False - - - True - - - Segoe UI, 9pt - - - 921, 28 - - - 67, 15 - - - 19 - - - Erstellt wer: - - - ADDED_WHOLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 14 - - - Segoe UI, 9pt, style=Italic - - - 924, 46 - - - 155, 23 - - - 20 - - - ADDED_WHOTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 15 - - - False - - - 162, 3 - - - 61, 24 - - - 19 - - - Aktiv - - - ACTIVECheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 16 - - - False - - - True - - - 733, 31 - - - 68, 13 - - - 16 - - - Reihenfolge: - - - SEQUENCELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 17 - - - False - - - 736, 47 - - - 70, 21 - - - 17 - - - SEQUENCETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 18 - - - False - - - True - - - 159, 162 - - - 74, 13 - - - 12 - - - Default-Wert: - - - DEFAULT_VALUELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 19 - - - False - - - 162, 180 - - - 318, 21 - - - 13 - - - DEFAULT_VALUETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 20 - - - False - - - 326, 133 - - - 141, 24 - - - 12 - - - Vorschlagsliste per SQL - - - SUGGESTIONCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 21 - - - False - - - True - - - 159, 118 - - - 56, 13 - - - 9 - - - Datentyp: - - - DATATYPELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 22 - - - False - - - BOOLEAN - - - DATE - - - INTEGER - - - VARCHAR - - - 162, 136 - - - 145, 21 - - - 10 - - - DATATYPEComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 23 - - - False - - - True - - - 159, 74 - - - 47, 13 - - - 7 - - - Hinweis: - - - COMMENTLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 24 - - - False - - - 162, 92 - - - 509, 21 - - - 8 - - - COMMENTTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 25 - - - False - - - 499, 47 - - - 231, 21 - - - 6 - - - WD_INDEXComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 26 - - - False - - - True - - - 218, 31 - - - 71, 13 - - - 3 - - - Bezeichnung: - - - NAMELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 27 - - - False - - - Tahoma, 8.25pt - - - 221, 47 - - - 272, 21 - - - 4 - - - NAMETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 28 - - - False - - - True - - - Segoe UI, 9pt, style=Italic - - - 159, 30 - - - 22, 15 - - - 0 - - - ID: - - - GUIDLabel1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 29 - - - Tahoma, 8.25pt - - - 162, 47 - - - 53, 21 - - - 1 - - - GUIDTextBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPageManualIndex - - - 30 - 511, 173 @@ -9036,7 +8676,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei True - 177 + 201 7, 17 @@ -9675,6 +9315,12 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem28 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmAdministration diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 140eddc..94b0607 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -482,10 +482,8 @@ Public Class frmAdministration Load_ZuordnungDokart_Module(DOKART_GUIDTextBox.Text) End If Case 2 + EnableControls(pnlObjekttype_Config, False) ObjektTypenListBoxEintragen() - If ListBoxControl1.Items.Count > 0 Then - EnableControls(pnlObjekttype_Config) - End If End Select End Sub Sub load_WDIndicesemail(Otype As String) @@ -594,17 +592,23 @@ Public Class frmAdministration End If End Sub - Private Sub LoadIDXEmail(Otype As String) + Private Function LoadIDXEmail(Otype As String) As Integer Try - Me.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter.Fill(Me.MyDataset.TBGI_OBJECTTYPE_EMAIL_INDEX, Otype) + Return TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter.Fill(MyDataset.TBGI_OBJECTTYPE_EMAIL_INDEX, Otype) Catch ex As System.Exception MsgBox("Error in LoadIDXEmail:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + Return -1 End Try - End Sub + End Function Private Sub ListBoxObjekttypen_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBoxControl1.SelectedIndexChanged If ListBoxControl1.SelectedIndex <> -1 Then - LoadIDXEmail(ListBoxControl1.SelectedItem) + Dim oRows As Integer = LoadIDXEmail(ListBoxControl1.SelectedItem) + + If oRows > 0 Then + EnableControls(pnlObjekttype_Config) + End If + load_WDIndicesemail(ListBoxControl1.SelectedItem) End If End Sub @@ -821,10 +825,10 @@ Public Class frmAdministration MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.SEQUENCEColumn.DefaultValue = 1 MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.COMMENTColumn.DefaultValue = "Funktions Name" End Sub - Sub EnableControls(Control As Control) + Sub EnableControls(Control As Control, Optional Value As Boolean = True) For Each oSubControl As Control In Control.Controls - If oSubControl.Enabled = False Then - oSubControl.Enabled = True + If oSubControl.Enabled <> Value Then + oSubControl.Enabled = Value End If Next End Sub @@ -986,6 +990,7 @@ Public Class frmAdministration Private Sub TBGI_REGEX_DOCTYPEBindingSource_AddingNew(sender As Object, e As AddingNewEventArgs) Handles TBGI_REGEX_DOCTYPEBindingSource.AddingNew MyDataset.TBGI_REGEX_DOCTYPE.ADDED_WHOColumn.DefaultValue = Environment.UserName + MyDataset.TBGI_REGEX_DOCTYPE.DOCTYPE_IDColumn.DefaultValue = DOKART_GUIDTextBox.Text End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick @@ -1097,8 +1102,8 @@ Public Class frmAdministration End Sub Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem9.ItemClick - Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource.AddNew() + EnableControls(pnlObjekttype_Config) End Sub Private Sub BarButtonItem10_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem10.ItemClick @@ -1157,25 +1162,6 @@ Public Class frmAdministration End Try End Sub - Private Sub ToolStripButton10_Click(sender As Object, e As EventArgs) - Try - Me.TBGI_REGEX_DOCTYPEBindingSource.EndEdit() - Catch ex As Exception - MsgBox("Error in Save Regex1: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) - Exit Sub - End Try - - If MyDataset.TBGI_REGEX_DOCTYPE.GetChanges Is Nothing = False Then - TextBox4.Text = Environment.UserName - Try - Me.TBGI_REGEX_DOCTYPEBindingSource.EndEdit() - Catch ex As Exception - MsgBox("Error in Save Regex2: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) - End Try - TBGI_REGEX_DOCTYPETableAdapter.Update(MyDataset.TBGI_REGEX_DOCTYPE) - End If - End Sub - Private Sub BarButtonItem12_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem12.ItemClick ObjektTypenEintragen() End Sub @@ -1358,4 +1344,17 @@ Public Class frmAdministration gridAvailableUsers.DataSource = ClassDatatables.GetAvailableUsers(profileId) End If End Sub + + Private Sub BarButtonItem28_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem28.ItemClick + TBGI_REGEX_DOCTYPEBindingSource.AddNew() + 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 End Class diff --git a/Global_Indexer/frmIndex.designer.vb b/Global_Indexer/frmIndex.designer.vb index c0be6f1..199fafe 100644 --- a/Global_Indexer/frmIndex.designer.vb +++ b/Global_Indexer/frmIndex.designer.vb @@ -45,6 +45,7 @@ Partial Class frmIndex Me.labelNotice = New DevExpress.XtraBars.BarStaticItem() Me.BarListItem1 = New DevExpress.XtraBars.BarListItem() Me.BarStaticItem4 = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -60,7 +61,6 @@ Partial Class frmIndex Me.PdfBarController1 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components) Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components) Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() @@ -240,6 +240,13 @@ Partial Class frmIndex Me.BarStaticItem4.Id = 20 Me.BarStaticItem4.Name = "BarStaticItem4" ' + 'BarButtonItem1 + ' + resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") + Me.BarButtonItem1.Id = 21 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup2}) @@ -334,13 +341,6 @@ Partial Class frmIndex Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' - 'BarButtonItem1 - ' - resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") - Me.BarButtonItem1.Id = 21 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" - ' 'frmIndex ' Me.Appearance.Options.UseFont = True diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx index 69a624c..49978d6 100644 --- a/Global_Indexer/frmIndex.resx +++ b/Global_Indexer/frmIndex.resx @@ -300,7 +300,7 @@ - Vorauswahl aktiv + Profilauswahl merken @@ -832,6 +832,12 @@ DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -904,12 +910,6 @@ DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem1 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmIndex diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 05dc934..589061e 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -30,19 +30,12 @@ Public Class frmIndex Private CancelAttempts As Integer = 0 Private Property ViewerString As String - 'Dim DocView - 'Dim viewer_string As String - - Public Shared Function Instance() As frmIndex - If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then - _Instance = New frmIndex - End If - _Instance.BringToFront() - _Instance.TopMost = True - _Instance.Focus() - Return _Instance - End Function #End Region + + Public Sub DisposeViewer() + DocumentViewer1.Dispose() + End Sub + '#Region "+++++ Allgemeine Funktionen ++++++" Sub ShowError(text As String) 'lblerror.Visible = True @@ -1359,6 +1352,19 @@ Public Class frmIndex Else e.Cancel = True End If + Case Else + Try + INDEXING_ACTIVE = False + + DocumentViewer1.CloseDocument() + DocumentViewer1.Done() + ClassWindowLocation.SaveFormLocationSize(Me) + My.Settings.Save() + Catch ex As Exception + LOGGER.Info(" - Unexpected error in Schliessen des Formulares - Fehler: " & vbNewLine & ex.Message) + LOGGER.Error(ex.Message) + MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Schliessen des Formulares:") + End Try End Select End If End Sub @@ -1454,8 +1460,12 @@ Public Class frmIndex checkMultiindex.Checked = False checkMultiindex.Visible = True + + BarButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Else checkMultiindex.Visible = False + + BarButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End If Catch ex As Exception LOGGER.Info(" - Unexpected error in Öffnen des Formulares - Fehler: " & vbNewLine & ex.Message) @@ -2629,11 +2639,8 @@ Public Class frmIndex CONFIG.Config.SplitterDistanceViewer = SplitContainer1.SplitterDistance End Sub - Private Sub frmIndex_Closed(sender As Object, e As EventArgs) Handles Me.Closed - - End Sub - - Private Sub frmIndex_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing - + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + CancelAttempts = 2 + Close() End Sub End Class diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 22920bf..287488c 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -11,37 +11,12 @@ Public Class frmStart Public _lizenzManager As ClassLicenseManager Dim loaded As Boolean = False Dim WithEvents HotKey As New clsHotkey(Me) - 'Public Sub SetLanguage() - ' Dim de = System.Globalization.CultureInfo.CurrentUICulture - ' 'Neue Sprache festlegen und entfernen aller Controls - - - ' Thread.CurrentThread.CurrentUICulture = New CultureInfo(USER_LANGUAGE) - ' Me.Controls.Clear() - - ' 'Me.Events.Dispose() - - ' InitializeComponent() - ' tslblCultureInfo.Text = "Culture/Language: " & USER_LANGUAGE - ' Try - ' Dim Ic As Icon = New Icon(Application.StartupPath & "\DD_Icons_ICO_GLOBIX_128.ico") - ' If Not IsNothing(Ic) Then - ' Me.Icon = Ic - ' End If - - ' Catch ex As Exception - ' LOGGER.Info(">> Icon file could not be read: " & ex.Message) - ' End Try - - ' 'Me.i() - ' 'Wiederherstellen der Fensterposition - ' 'Me.Size = sz - ' 'Me.Location = pt - 'End Sub Private Const mSnapOffset As Integer = 35 Private Const WM_WINDOWPOSCHANGING As Integer = &H46 + Private IndexForm As frmIndex + Public Structure WINDOWPOS Public hwnd As IntPtr @@ -274,8 +249,8 @@ Public Class frmStart If File.Exists(CURRENT_WORKFILE) = True And DTACTUAL_FILES.Rows.Count > 0 Then Open_IndexDialog() End If - Next + Show() Catch ex As Exception If Not ex.Message.StartsWith("Die Auflistung wurde geändert") Then MsgBox("Unexpected Error in Check_Dropped_Files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -286,12 +261,12 @@ Public Class frmStart Sub Open_IndexDialog() Try Hide() - frmIndex.Show() + IndexForm.ShowDialog() - AddHandler frmIndex.FormClosed, Sub() - Show() - BringToFront() - End Sub + 'AddHandler frmIndex.FormClosed, Sub() + ' Show() + ' BringToFront() + ' End Sub Catch ex As Exception LOGGER.Error(ex) @@ -320,7 +295,14 @@ Public Class frmStart System.IO.File.Delete(_file) Next Catch ex As Exception + LOGGER.Error(ex) + End Try + Try + IndexForm.DisposeViewer() + IndexForm.Dispose() + Catch ex As Exception + LOGGER.Error(ex) End Try End Sub @@ -337,7 +319,10 @@ Public Class frmStart Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles Me.Load Cursor = Cursors.WaitCursor + Try + IndexForm = New frmIndex() + 'Lizenz abgellaufen, überprüfen ob User Admin ist If LICENSE_COUNT < UserLoggedin Then If USER_IS_ADMIN = True Then @@ -666,8 +651,6 @@ Public Class frmStart End Try End If - - End Sub Private Sub TimerClose3Minutes_Tick(sender As Object, e As EventArgs) Handles TimerClose3Minutes.Tick If LICENSE_EXPIRED = True Or LICENSE_COUNT < UserLoggedin Then @@ -706,6 +689,7 @@ Public Class frmStart Me.btnChoosefiles.Location = New Point(269, 37) End Try End Sub + Private Sub HistoryIndexierteDateienToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HistoryIndexierteDateienToolStripMenuItem.Click frmHistory.ShowDialog() End Sub @@ -716,10 +700,6 @@ Public Class frmStart Me.TopMost = True End Sub - Private Sub frmStart_SizeChanged(sender As Object, e As EventArgs) Handles Me.SizeChanged - - End Sub - Private Sub TimerCheckDroppedFiles_Tick(sender As Object, e As EventArgs) Handles TimerCheckDroppedFiles.Tick TimerCheckDroppedFiles.Stop() Check_Dropped_Files() @@ -755,4 +735,5 @@ Public Class frmStart MsgBox("Unexpected Error in Choose Files for Indexing:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Sub + End Class \ No newline at end of file