AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Jonathan Jenne 2020-03-16 15:34:47 +01:00
parent 1e945e4463
commit 3d94b192d8
7 changed files with 1044 additions and 1390 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
Global_Indexer/frmAdministration.Designer.vb generated
View File

@ -335,6 +335,8 @@ Partial Class frmAdministration
Me.TBGI_REGEX_DOCTYPETableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBGI_REGEX_DOCTYPETableAdapter() Me.TBGI_REGEX_DOCTYPETableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBGI_REGEX_DOCTYPETableAdapter()
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPage8 = 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() GUIDLabel = New System.Windows.Forms.Label()
CHANGED_WHENLabel = New System.Windows.Forms.Label() CHANGED_WHENLabel = New System.Windows.Forms.Label()
CHANGED_WHOLabel = 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.TBDD_DOKART_MODULEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.VWGI_USER_GROUPS_RELATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWGI_USER_GROUPS_RELATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBGI_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBGI_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'GUIDLabel 'GUIDLabel
@ -520,9 +523,9 @@ Partial Class frmAdministration
'RibbonControl1 'RibbonControl1
' '
Me.RibbonControl1.ExpandCollapseItem.Id = 0 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") resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 37 Me.RibbonControl1.MaxItemId = 38
Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryUserGroups, Me.RibbonPageCategoryMisc}) Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryUserGroups, Me.RibbonPageCategoryMisc})
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart}) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart})
@ -648,6 +651,7 @@ Partial Class frmAdministration
Me.BarButtonItem14.Id = 24 Me.BarButtonItem14.Id = 24
Me.BarButtonItem14.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem14.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem14.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem14.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem14.Name = "BarButtonItem14" Me.BarButtonItem14.Name = "BarButtonItem14"
Me.BarButtonItem14.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText
' '
'BarButtonItem16 'BarButtonItem16
' '
@ -843,6 +847,7 @@ Partial Class frmAdministration
'RibbonPageGroupProfileRegex 'RibbonPageGroupProfileRegex
' '
Me.RibbonPageGroupProfileRegex.Enabled = False Me.RibbonPageGroupProfileRegex.Enabled = False
Me.RibbonPageGroupProfileRegex.ItemLinks.Add(Me.BarButtonItem28)
Me.RibbonPageGroupProfileRegex.ItemLinks.Add(Me.BarButtonItem13) Me.RibbonPageGroupProfileRegex.ItemLinks.Add(Me.BarButtonItem13)
Me.RibbonPageGroupProfileRegex.ItemLinks.Add(Me.BarButtonItem14) Me.RibbonPageGroupProfileRegex.ItemLinks.Add(Me.BarButtonItem14)
Me.RibbonPageGroupProfileRegex.Name = "RibbonPageGroupProfileRegex" Me.RibbonPageGroupProfileRegex.Name = "RibbonPageGroupProfileRegex"
@ -1242,37 +1247,8 @@ Partial Class frmAdministration
'XtraTabPageManualIndex 'XtraTabPageManualIndex
' '
resources.ApplyResources(Me.XtraTabPageManualIndex, "XtraTabPageManualIndex") resources.ApplyResources(Me.XtraTabPageManualIndex, "XtraTabPageManualIndex")
Me.XtraTabPageManualIndex.Controls.Add(Me.Panel1)
Me.XtraTabPageManualIndex.Controls.Add(Me.ListBoxControl3) 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" Me.XtraTabPageManualIndex.Name = "XtraTabPageManualIndex"
' '
'ListBoxControl3 'ListBoxControl3
@ -2684,6 +2660,48 @@ Partial Class frmAdministration
Me.RibbonPage8.Name = "RibbonPage8" Me.RibbonPage8.Name = "RibbonPage8"
resources.ApplyResources(Me.RibbonPage8, "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 'frmAdministration
' '
Me.Appearance.Options.UseFont = True Me.Appearance.Options.UseFont = True
@ -2727,7 +2745,6 @@ Partial Class frmAdministration
CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl2.ResumeLayout(False) Me.XtraTabControl2.ResumeLayout(False)
Me.XtraTabPageManualIndex.ResumeLayout(False) Me.XtraTabPageManualIndex.ResumeLayout(False)
Me.XtraTabPageManualIndex.PerformLayout()
CType(Me.ListBoxControl3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ListBoxControl3, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBDD_INDEX_MANBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_INDEX_MANBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabPageManualIndexFunctions.ResumeLayout(False) Me.XtraTabPageManualIndexFunctions.ResumeLayout(False)
@ -2766,6 +2783,8 @@ Partial Class frmAdministration
CType(Me.TBDD_DOKART_MODULEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_DOKART_MODULEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.VWGI_USER_GROUPS_RELATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VWGI_USER_GROUPS_RELATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBGI_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBGI_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel1.ResumeLayout(False)
Me.Panel1.PerformLayout()
Me.ResumeLayout(False) Me.ResumeLayout(False)
Me.PerformLayout() Me.PerformLayout()
@ -3023,4 +3042,6 @@ Partial Class frmAdministration
Friend WithEvents GridColumn8 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn8 As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents GridColumn9 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn9 As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents GridColumn4 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 End Class

2156
Global_Indexer/frmAdministration.resx
View File

File diff suppressed because it is too large Load Diff

59
Global_Indexer/frmAdministration.vb
View File

@ -482,10 +482,8 @@ Public Class frmAdministration
Load_ZuordnungDokart_Module(DOKART_GUIDTextBox.Text) Load_ZuordnungDokart_Module(DOKART_GUIDTextBox.Text)
End If End If
Case 2 Case 2
EnableControls(pnlObjekttype_Config, False)
ObjektTypenListBoxEintragen() ObjektTypenListBoxEintragen()
If ListBoxControl1.Items.Count > 0 Then
EnableControls(pnlObjekttype_Config)
End If
End Select End Select
End Sub End Sub
Sub load_WDIndicesemail(Otype As String) Sub load_WDIndicesemail(Otype As String)
@ -594,17 +592,23 @@ Public Class frmAdministration
End If End If
End Sub End Sub
Private Sub LoadIDXEmail(Otype As String) Private Function LoadIDXEmail(Otype As String) As Integer
Try 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 Catch ex As System.Exception
MsgBox("Error in LoadIDXEmail:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Error in LoadIDXEmail:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
Return -1
End Try End Try
End Sub End Function
Private Sub ListBoxObjekttypen_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBoxControl1.SelectedIndexChanged Private Sub ListBoxObjekttypen_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBoxControl1.SelectedIndexChanged
If ListBoxControl1.SelectedIndex <> -1 Then 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) load_WDIndicesemail(ListBoxControl1.SelectedItem)
End If End If
End Sub End Sub
@ -821,10 +825,10 @@ Public Class frmAdministration
MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.SEQUENCEColumn.DefaultValue = 1 MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.SEQUENCEColumn.DefaultValue = 1
MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.COMMENTColumn.DefaultValue = "Funktions Name" MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.COMMENTColumn.DefaultValue = "Funktions Name"
End Sub 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 For Each oSubControl As Control In Control.Controls
If oSubControl.Enabled = False Then If oSubControl.Enabled <> Value Then
oSubControl.Enabled = True oSubControl.Enabled = Value
End If End If
Next Next
End Sub 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 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.ADDED_WHOColumn.DefaultValue = Environment.UserName
MyDataset.TBGI_REGEX_DOCTYPE.DOCTYPE_IDColumn.DefaultValue = DOKART_GUIDTextBox.Text
End Sub End Sub
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
@ -1097,8 +1102,8 @@ Public Class frmAdministration
End Sub End Sub
Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem9.ItemClick Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem9.ItemClick
Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource.AddNew() Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource.AddNew()
EnableControls(pnlObjekttype_Config)
End Sub End Sub
Private Sub BarButtonItem10_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem10.ItemClick 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 Try
End Sub 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 Private Sub BarButtonItem12_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem12.ItemClick
ObjektTypenEintragen() ObjektTypenEintragen()
End Sub End Sub
@ -1358,4 +1344,17 @@ Public Class frmAdministration
gridAvailableUsers.DataSource = ClassDatatables.GetAvailableUsers(profileId) gridAvailableUsers.DataSource = ClassDatatables.GetAvailableUsers(profileId)
End If End If
End Sub 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 End Class

16
Global_Indexer/frmIndex.designer.vb generated
View File

@ -45,6 +45,7 @@ Partial Class frmIndex
Me.labelNotice = New DevExpress.XtraBars.BarStaticItem() Me.labelNotice = New DevExpress.XtraBars.BarStaticItem()
Me.BarListItem1 = New DevExpress.XtraBars.BarListItem() Me.BarListItem1 = New DevExpress.XtraBars.BarListItem()
Me.BarStaticItem4 = New DevExpress.XtraBars.BarStaticItem() Me.BarStaticItem4 = New DevExpress.XtraBars.BarStaticItem()
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup2 = 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.PdfBarController1 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components)
Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components) Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components)
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel1.SuspendLayout()
Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout()
@ -240,6 +240,13 @@ Partial Class frmIndex
Me.BarStaticItem4.Id = 20 Me.BarStaticItem4.Id = 20
Me.BarStaticItem4.Name = "BarStaticItem4" 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 'RibbonPage1
' '
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup2}) Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup2})
@ -334,13 +341,6 @@ Partial Class frmIndex
Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Name = "RibbonPage2"
resources.ApplyResources(Me.RibbonPage2, "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 'frmIndex
' '
Me.Appearance.Options.UseFont = True Me.Appearance.Options.UseFont = True

14
Global_Indexer/frmIndex.resx
View File

@ -300,7 +300,7 @@
</value> </value>
</data> </data>
<data name="checkItemPreselection.Caption" xml:space="preserve"> <data name="checkItemPreselection.Caption" xml:space="preserve">
<value>Vorauswahl aktiv</value> <value>Profilauswahl merken</value>
</data> </data>
<data name="checkItemPreselection.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="checkItemPreselection.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
@ -832,6 +832,12 @@
<data name="&gt;&gt;BarStaticItem4.Type" xml:space="preserve"> <data name="&gt;&gt;BarStaticItem4.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
<value>BarButtonItem1</value>
</data>
<data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve"> <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
<value>RibbonPage1</value> <value>RibbonPage1</value>
</data> </data>
@ -904,12 +910,6 @@
<data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve"> <data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
<value>BarButtonItem1</value>
</data>
<data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmIndex</value> <value>frmIndex</value>
</data> </data>

43
Global_Indexer/frmIndex.vb
View File

@ -30,19 +30,12 @@ Public Class frmIndex
Private CancelAttempts As Integer = 0 Private CancelAttempts As Integer = 0
Private Property ViewerString As String 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 #End Region
Public Sub DisposeViewer()
DocumentViewer1.Dispose()
End Sub
'#Region "+++++ Allgemeine Funktionen ++++++" '#Region "+++++ Allgemeine Funktionen ++++++"
Sub ShowError(text As String) Sub ShowError(text As String)
'lblerror.Visible = True 'lblerror.Visible = True
@ -1359,6 +1352,19 @@ Public Class frmIndex
Else Else
e.Cancel = True e.Cancel = True
End If 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 Select
End If End If
End Sub End Sub
@ -1454,8 +1460,12 @@ Public Class frmIndex
checkMultiindex.Checked = False checkMultiindex.Checked = False
checkMultiindex.Visible = True checkMultiindex.Visible = True
BarButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
Else Else
checkMultiindex.Visible = False checkMultiindex.Visible = False
BarButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If End If
Catch ex As Exception Catch ex As Exception
LOGGER.Info(" - Unexpected error in Öffnen des Formulares - Fehler: " & vbNewLine & ex.Message) LOGGER.Info(" - Unexpected error in Öffnen des Formulares - Fehler: " & vbNewLine & ex.Message)
@ -2629,11 +2639,8 @@ Public Class frmIndex
CONFIG.Config.SplitterDistanceViewer = SplitContainer1.SplitterDistance CONFIG.Config.SplitterDistanceViewer = SplitContainer1.SplitterDistance
End Sub End Sub
Private Sub frmIndex_Closed(sender As Object, e As EventArgs) Handles Me.Closed Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
CancelAttempts = 2
End Sub Close()
Private Sub frmIndex_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
End Sub End Sub
End Class End Class

59
Global_Indexer/frmStart.vb
View File

@ -11,37 +11,12 @@ Public Class frmStart
Public _lizenzManager As ClassLicenseManager Public _lizenzManager As ClassLicenseManager
Dim loaded As Boolean = False Dim loaded As Boolean = False
Dim WithEvents HotKey As New clsHotkey(Me) 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 mSnapOffset As Integer = 35
Private Const WM_WINDOWPOSCHANGING As Integer = &H46 Private Const WM_WINDOWPOSCHANGING As Integer = &H46
Private IndexForm As frmIndex
<StructLayout(LayoutKind.Sequential)> <StructLayout(LayoutKind.Sequential)>
Public Structure WINDOWPOS Public Structure WINDOWPOS
Public hwnd As IntPtr Public hwnd As IntPtr
@ -274,8 +249,8 @@ Public Class frmStart
If File.Exists(CURRENT_WORKFILE) = True And DTACTUAL_FILES.Rows.Count > 0 Then If File.Exists(CURRENT_WORKFILE) = True And DTACTUAL_FILES.Rows.Count > 0 Then
Open_IndexDialog() Open_IndexDialog()
End If End If
Next Next
Show()
Catch ex As Exception Catch ex As Exception
If Not ex.Message.StartsWith("Die Auflistung wurde geändert") Then If Not ex.Message.StartsWith("Die Auflistung wurde geändert") Then
MsgBox("Unexpected Error in Check_Dropped_Files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in Check_Dropped_Files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@ -286,12 +261,12 @@ Public Class frmStart
Sub Open_IndexDialog() Sub Open_IndexDialog()
Try Try
Hide() Hide()
frmIndex.Show() IndexForm.ShowDialog()
AddHandler frmIndex.FormClosed, Sub() 'AddHandler frmIndex.FormClosed, Sub()
Show() ' Show()
BringToFront() ' BringToFront()
End Sub ' End Sub
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)
@ -320,7 +295,14 @@ Public Class frmStart
System.IO.File.Delete(_file) System.IO.File.Delete(_file)
Next Next
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex)
End Try
Try
IndexForm.DisposeViewer()
IndexForm.Dispose()
Catch ex As Exception
LOGGER.Error(ex)
End Try End Try
End Sub End Sub
@ -337,7 +319,10 @@ Public Class frmStart
Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles Me.Load Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles Me.Load
Cursor = Cursors.WaitCursor Cursor = Cursors.WaitCursor
Try Try
IndexForm = New frmIndex()
'Lizenz abgellaufen, überprüfen ob User Admin ist 'Lizenz abgellaufen, überprüfen ob User Admin ist
If LICENSE_COUNT < UserLoggedin Then If LICENSE_COUNT < UserLoggedin Then
If USER_IS_ADMIN = True Then If USER_IS_ADMIN = True Then
@ -666,8 +651,6 @@ Public Class frmStart
End Try End Try
End If End If
End Sub End Sub
Private Sub TimerClose3Minutes_Tick(sender As Object, e As EventArgs) Handles TimerClose3Minutes.Tick Private Sub TimerClose3Minutes_Tick(sender As Object, e As EventArgs) Handles TimerClose3Minutes.Tick
If LICENSE_EXPIRED = True Or LICENSE_COUNT < UserLoggedin Then If LICENSE_EXPIRED = True Or LICENSE_COUNT < UserLoggedin Then
@ -706,6 +689,7 @@ Public Class frmStart
Me.btnChoosefiles.Location = New Point(269, 37) Me.btnChoosefiles.Location = New Point(269, 37)
End Try End Try
End Sub End Sub
Private Sub HistoryIndexierteDateienToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HistoryIndexierteDateienToolStripMenuItem.Click Private Sub HistoryIndexierteDateienToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HistoryIndexierteDateienToolStripMenuItem.Click
frmHistory.ShowDialog() frmHistory.ShowDialog()
End Sub End Sub
@ -716,10 +700,6 @@ Public Class frmStart
Me.TopMost = True Me.TopMost = True
End Sub 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 Private Sub TimerCheckDroppedFiles_Tick(sender As Object, e As EventArgs) Handles TimerCheckDroppedFiles.Tick
TimerCheckDroppedFiles.Stop() TimerCheckDroppedFiles.Stop()
Check_Dropped_Files() Check_Dropped_Files()
@ -755,4 +735,5 @@ Public Class frmStart
MsgBox("Unexpected Error in Choose Files for Indexing:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in Choose Files for Indexing:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try End Try
End Sub End Sub
End Class End Class