Compare commits

..

2 Commits

Author SHA1 Message Date
Jonathan Jenne
dff3272b31 fix files not deleting when folderwatch is active 2020-06-04 16:58:49 +02:00
Jonathan Jenne
1bd5b7446b remove duplicate profile grid 2020-06-04 15:40:31 +02:00
4 changed files with 2040 additions and 3478 deletions

View File

@@ -70,12 +70,8 @@ Partial Class frmAdministration
Dim GEAENDERTWANNLabel As System.Windows.Forms.Label
Dim SEQUENCELabel3 As System.Windows.Forms.Label
Dim Label9 As System.Windows.Forms.Label
Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
Me.GridControl3 = New DevExpress.XtraGrid.GridControl()
Me.TBDD_DOKUMENTARTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.MyDataset = New Global_Indexer.MyDataset()
Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.colBEZEICHNUNG1 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
@@ -86,11 +82,7 @@ Partial Class frmAdministration
Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
Me.txtStatus = New DevExpress.XtraBars.BarStaticItem()
Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem10 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem15 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem12 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem13 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem14 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem16 = New DevExpress.XtraBars.BarButtonItem()
@@ -113,16 +105,14 @@ Partial Class frmAdministration
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()
Me.RibbonPageGroupManualIndex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroupManualIndexFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroupAutoIndex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroupProfileRegex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageEmail = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
Me.Label12 = New System.Windows.Forms.Label()
Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl()
@@ -152,7 +142,6 @@ Partial Class frmAdministration
Me.GridColumn9 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.GridColumn8 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.Label35 = New System.Windows.Forms.Label()
Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl()
Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.colBEZEICHNUNG = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -310,6 +299,7 @@ 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.SplitContainerControl4 = New DevExpress.XtraEditors.SplitContainerControl()
GUIDLabel = New System.Windows.Forms.Label()
GUIDLabel1 = New System.Windows.Forms.Label()
NAMELabel = New System.Windows.Forms.Label()
@@ -356,12 +346,8 @@ Partial Class frmAdministration
GEAENDERTWANNLabel = New System.Windows.Forms.Label()
SEQUENCELabel3 = New System.Windows.Forms.Label()
Label9 = New System.Windows.Forms.Label()
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl1.SuspendLayout()
CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabControl3.SuspendLayout()
@@ -379,8 +365,6 @@ Partial Class frmAdministration
CType(Me.viewAssignedUsers, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.gridAvailableUsers, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.viewAvailableUsers, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl3.SuspendLayout()
CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -413,6 +397,8 @@ 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()
CType(Me.SplitContainerControl4, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl4.SuspendLayout()
Me.SuspendLayout()
'
'GUIDLabel
@@ -420,26 +406,6 @@ Partial Class frmAdministration
resources.ApplyResources(GUIDLabel, "GUIDLabel")
GUIDLabel.Name = "GUIDLabel"
'
'SplitContainerControl1
'
resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1")
Me.SplitContainerControl1.Name = "SplitContainerControl1"
Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControl3)
Me.SplitContainerControl1.Panel1.Controls.Add(Me.Label12)
resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1")
Me.SplitContainerControl1.Panel2.Controls.Add(Me.XtraTabControl3)
resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
Me.SplitContainerControl1.SplitterPosition = 250
'
'GridControl3
'
Me.GridControl3.DataSource = Me.TBDD_DOKUMENTARTBindingSource
resources.ApplyResources(Me.GridControl3, "GridControl3")
Me.GridControl3.MainView = Me.GridView3
Me.GridControl3.MenuManager = Me.RibbonControl1
Me.GridControl3.Name = "GridControl3"
Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3})
'
'TBDD_DOKUMENTARTBindingSource
'
Me.TBDD_DOKUMENTARTBindingSource.DataMember = "TBDD_DOKUMENTART"
@@ -450,42 +416,15 @@ Partial Class frmAdministration
Me.MyDataset.DataSetName = "MyDataset"
Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
'
'GridView3
'
Me.GridView3.Appearance.EvenRow.BackColor = System.Drawing.Color.PaleTurquoise
Me.GridView3.Appearance.EvenRow.Options.UseBackColor = True
Me.GridView3.Appearance.FocusedRow.BackColor = System.Drawing.Color.Khaki
Me.GridView3.Appearance.FocusedRow.Options.UseBackColor = True
Me.GridView3.Appearance.SelectedRow.BackColor = System.Drawing.Color.Khaki
Me.GridView3.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridView3.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colBEZEICHNUNG1})
Me.GridView3.GridControl = Me.GridControl3
Me.GridView3.Name = "GridView3"
Me.GridView3.OptionsBehavior.Editable = False
Me.GridView3.OptionsBehavior.ReadOnly = True
Me.GridView3.OptionsSelection.EnableAppearanceFocusedCell = False
Me.GridView3.OptionsView.EnableAppearanceEvenRow = True
Me.GridView3.OptionsView.ShowAutoFilterRow = True
Me.GridView3.OptionsView.ShowColumnHeaders = False
Me.GridView3.OptionsView.ShowDetailButtons = False
Me.GridView3.OptionsView.ShowGroupPanel = False
'
'colBEZEICHNUNG1
'
resources.ApplyResources(Me.colBEZEICHNUNG1, "colBEZEICHNUNG1")
Me.colBEZEICHNUNG1.FieldName = "BEZEICHNUNG"
Me.colBEZEICHNUNG1.Name = "colBEZEICHNUNG1"
'
'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.BarButtonItem28, Me.BarButtonItem29, Me.BarButtonItem30, Me.BarSubItem2, Me.BarButtonItem31, Me.BarButtonItem32, Me.BarButtonItem33})
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.BarButtonItem15, 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, Me.BarButtonItem29, Me.BarButtonItem30, Me.BarSubItem2, Me.BarButtonItem31, Me.BarButtonItem32, Me.BarButtonItem33})
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 45
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageEmail})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
Me.RibbonControl1.ShowToolbarCustomizeItem = False
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
@@ -557,28 +496,6 @@ Partial Class frmAdministration
Me.txtStatus.Name = "txtStatus"
Me.txtStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
'
'BarButtonItem9
'
resources.ApplyResources(Me.BarButtonItem9, "BarButtonItem9")
Me.BarButtonItem9.Id = 14
Me.BarButtonItem9.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem9.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem9.Name = "BarButtonItem9"
'
'BarButtonItem10
'
resources.ApplyResources(Me.BarButtonItem10, "BarButtonItem10")
Me.BarButtonItem10.Id = 15
Me.BarButtonItem10.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem10.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem10.Name = "BarButtonItem10"
'
'BarButtonItem11
'
resources.ApplyResources(Me.BarButtonItem11, "BarButtonItem11")
Me.BarButtonItem11.Id = 16
Me.BarButtonItem11.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem11.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem11.Name = "BarButtonItem11"
Me.BarButtonItem11.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText
'
'BarButtonItem15
'
resources.ApplyResources(Me.BarButtonItem15, "BarButtonItem15")
@@ -586,14 +503,6 @@ Partial Class frmAdministration
Me.BarButtonItem15.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem15.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem15.Name = "BarButtonItem15"
'
'BarButtonItem12
'
resources.ApplyResources(Me.BarButtonItem12, "BarButtonItem12")
Me.BarButtonItem12.Id = 22
Me.BarButtonItem12.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem12.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem12.Name = "BarButtonItem12"
Me.BarButtonItem12.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText
'
'BarButtonItem13
'
resources.ApplyResources(Me.BarButtonItem13, "BarButtonItem13")
@@ -745,20 +654,10 @@ Partial Class frmAdministration
'
'RibbonPageStart
'
Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1, Me.RibbonPageGroupManualIndex, Me.RibbonPageGroupManualIndexFunctions, Me.RibbonPageGroupAutoIndex, Me.RibbonPageGroupProfileRegex})
Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupManualIndex, Me.RibbonPageGroupManualIndexFunctions, Me.RibbonPageGroupAutoIndex, Me.RibbonPageGroupProfileRegex})
Me.RibbonPageStart.Name = "RibbonPageStart"
resources.ApplyResources(Me.RibbonPageStart, "RibbonPageStart")
'
'RibbonPageGroup2
'
Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem29)
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem15)
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1)
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
'
'RibbonPageGroup1
'
Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3)
@@ -809,18 +708,18 @@ Partial Class frmAdministration
'
'RibbonPageEmail
'
Me.RibbonPageEmail.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4})
Me.RibbonPageEmail.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2})
Me.RibbonPageEmail.Name = "RibbonPageEmail"
resources.ApplyResources(Me.RibbonPageEmail, "RibbonPageEmail")
'
'RibbonPageGroup4
'RibbonPageGroup2
'
Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem9)
Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem10)
Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem11)
Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem12)
Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem29)
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem15)
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1)
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
'
'RibbonStatusBar1
'
@@ -829,11 +728,6 @@ Partial Class frmAdministration
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
'
'Label12
'
resources.ApplyResources(Me.Label12, "Label12")
Me.Label12.Name = "Label12"
'
'XtraTabControl3
'
resources.ApplyResources(Me.XtraTabControl3, "XtraTabControl3")
@@ -844,6 +738,8 @@ Partial Class frmAdministration
'XtraTabPage1
'
Me.XtraTabPage1.Controls.Add(Me.SplitContainerControl2)
Me.XtraTabPage1.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.XtraTabPage1.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.XtraTabPage1.Name = "XtraTabPage1"
resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
'
@@ -965,6 +861,8 @@ Partial Class frmAdministration
'XtraTabPage2
'
Me.XtraTabPage2.Controls.Add(Me.SplitContainerControl5)
Me.XtraTabPage2.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.XtraTabPage2.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.XtraTabPage2.Name = "XtraTabPage2"
resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
'
@@ -1095,49 +993,6 @@ Partial Class frmAdministration
resources.ApplyResources(Me.Label35, "Label35")
Me.Label35.Name = "Label35"
'
'SplitContainerControl3
'
resources.ApplyResources(Me.SplitContainerControl3, "SplitContainerControl3")
Me.SplitContainerControl3.Name = "SplitContainerControl3"
Me.SplitContainerControl3.Panel1.Controls.Add(Me.GridControl1)
Me.SplitContainerControl3.Panel1.Controls.Add(Me.Label3)
resources.ApplyResources(Me.SplitContainerControl3.Panel1, "SplitContainerControl3.Panel1")
Me.SplitContainerControl3.Panel2.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.[Default]
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label32)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.ComboBox3)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label11)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.XtraTabControl2)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.DOKART_GUIDTextBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.OBJEKTTYPComboBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.GEAENDERTWANNTextBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.SEQUENCENumericUpDown)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.GEANDERTWERTextBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.WINDREAM_DIRECTCheckBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.ERSTELLTWANNTextBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label4)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label5)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label24)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label23)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label22)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label21)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label16)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label15)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label8)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label7)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Label1)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.lblObjekttyp)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.ERSTELLTWERTextBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.AKTIVCheckBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.btnNamenkonvention)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.BESCHREIBUNGTextBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.Button1)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.ZIEL_PFADTextBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.NAMENKONVENTIONTextBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.KURZNAMETextBox)
Me.SplitContainerControl3.Panel2.Controls.Add(Me.BEZEICHNUNGTextBox)
resources.ApplyResources(Me.SplitContainerControl3.Panel2, "SplitContainerControl3.Panel2")
Me.SplitContainerControl3.SplitterPosition = 250
'
'GridControl1
'
Me.GridControl1.CausesValidation = False
@@ -2341,7 +2196,38 @@ Partial Class frmAdministration
'XtraTabPageProfiles
'
resources.ApplyResources(Me.XtraTabPageProfiles, "XtraTabPageProfiles")
Me.XtraTabPageProfiles.Controls.Add(Me.SplitContainerControl3)
Me.XtraTabPageProfiles.Controls.Add(Me.BEZEICHNUNGTextBox)
Me.XtraTabPageProfiles.Controls.Add(Me.NAMENKONVENTIONTextBox)
Me.XtraTabPageProfiles.Controls.Add(Me.ZIEL_PFADTextBox)
Me.XtraTabPageProfiles.Controls.Add(Me.Button1)
Me.XtraTabPageProfiles.Controls.Add(Me.BESCHREIBUNGTextBox)
Me.XtraTabPageProfiles.Controls.Add(Me.btnNamenkonvention)
Me.XtraTabPageProfiles.Controls.Add(Me.AKTIVCheckBox)
Me.XtraTabPageProfiles.Controls.Add(Me.ERSTELLTWERTextBox)
Me.XtraTabPageProfiles.Controls.Add(Me.KURZNAMETextBox)
Me.XtraTabPageProfiles.Controls.Add(Me.lblObjekttyp)
Me.XtraTabPageProfiles.Controls.Add(Me.Label1)
Me.XtraTabPageProfiles.Controls.Add(Me.Label7)
Me.XtraTabPageProfiles.Controls.Add(Me.Label8)
Me.XtraTabPageProfiles.Controls.Add(Me.Label15)
Me.XtraTabPageProfiles.Controls.Add(Me.Label22)
Me.XtraTabPageProfiles.Controls.Add(Me.Label23)
Me.XtraTabPageProfiles.Controls.Add(Me.Label24)
Me.XtraTabPageProfiles.Controls.Add(Me.Label5)
Me.XtraTabPageProfiles.Controls.Add(Me.Label4)
Me.XtraTabPageProfiles.Controls.Add(Me.ERSTELLTWANNTextBox)
Me.XtraTabPageProfiles.Controls.Add(Me.WINDREAM_DIRECTCheckBox)
Me.XtraTabPageProfiles.Controls.Add(Me.SEQUENCENumericUpDown)
Me.XtraTabPageProfiles.Controls.Add(Me.GEANDERTWERTextBox)
Me.XtraTabPageProfiles.Controls.Add(Me.Label32)
Me.XtraTabPageProfiles.Controls.Add(Me.Label11)
Me.XtraTabPageProfiles.Controls.Add(Me.Label16)
Me.XtraTabPageProfiles.Controls.Add(Me.Label21)
Me.XtraTabPageProfiles.Controls.Add(Me.ComboBox3)
Me.XtraTabPageProfiles.Controls.Add(Me.OBJEKTTYPComboBox)
Me.XtraTabPageProfiles.Controls.Add(Me.DOKART_GUIDTextBox)
Me.XtraTabPageProfiles.Controls.Add(Me.GEAENDERTWANNTextBox)
Me.XtraTabPageProfiles.Controls.Add(Me.XtraTabControl2)
Me.XtraTabPageProfiles.Controls.Add(Label9)
Me.XtraTabPageProfiles.Controls.Add(SEQUENCELabel3)
Me.XtraTabPageProfiles.Controls.Add(GUIDLabel)
@@ -2362,7 +2248,7 @@ Partial Class frmAdministration
'XtraTabPageUsersGroups
'
resources.ApplyResources(Me.XtraTabPageUsersGroups, "XtraTabPageUsersGroups")
Me.XtraTabPageUsersGroups.Controls.Add(Me.SplitContainerControl1)
Me.XtraTabPageUsersGroups.Controls.Add(Me.XtraTabControl3)
Me.XtraTabPageUsersGroups.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPageUsersGroups.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.XtraTabPageUsersGroups.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20)
Me.XtraTabPageUsersGroups.Name = "XtraTabPageUsersGroups"
@@ -2475,12 +2361,23 @@ Partial Class frmAdministration
Me.RibbonPage8.Name = "RibbonPage8"
resources.ApplyResources(Me.RibbonPage8, "RibbonPage8")
'
'SplitContainerControl4
'
resources.ApplyResources(Me.SplitContainerControl4, "SplitContainerControl4")
Me.SplitContainerControl4.Name = "SplitContainerControl4"
Me.SplitContainerControl4.Panel1.Controls.Add(Me.GridControl1)
Me.SplitContainerControl4.Panel1.Controls.Add(Me.Label3)
resources.ApplyResources(Me.SplitContainerControl4.Panel1, "SplitContainerControl4.Panel1")
Me.SplitContainerControl4.Panel2.Controls.Add(Me.XtraTabControl1)
resources.ApplyResources(Me.SplitContainerControl4.Panel2, "SplitContainerControl4.Panel2")
Me.SplitContainerControl4.SplitterPosition = 224
'
'frmAdministration
'
Me.Appearance.Options.UseFont = True
resources.ApplyResources(Me, "$this")
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.XtraTabControl1)
Me.Controls.Add(Me.SplitContainerControl4)
Me.Controls.Add(Me.RibbonStatusBar1)
Me.Controls.Add(Me.RibbonControl1)
Me.IconOptions.Icon = CType(resources.GetObject("frmAdministration.IconOptions.Icon"), System.Drawing.Icon)
@@ -2488,12 +2385,8 @@ Partial Class frmAdministration
Me.Name = "frmAdministration"
Me.Ribbon = Me.RibbonControl1
Me.StatusBar = Me.RibbonStatusBar1
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl1.ResumeLayout(False)
CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl3.ResumeLayout(False)
@@ -2511,8 +2404,6 @@ Partial Class frmAdministration
CType(Me.viewAssignedUsers, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.gridAvailableUsers, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.viewAvailableUsers, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl3.ResumeLayout(False)
CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit()
@@ -2552,6 +2443,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()
CType(Me.SplitContainerControl4, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl4.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -2697,11 +2590,6 @@ Partial Class frmAdministration
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents Label12 As Label
Friend WithEvents GridControl3 As DevExpress.XtraGrid.GridControl
Friend WithEvents GridView3 As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents colBEZEICHNUNG1 As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents SplitContainerControl2 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents Label13 As Label
Friend WithEvents gridAvailableGroups As DevExpress.XtraGrid.GridControl
@@ -2718,11 +2606,6 @@ Partial Class frmAdministration
Friend WithEvents txtStatus As DevExpress.XtraBars.BarStaticItem
Friend WithEvents RibbonPage8 As DevExpress.XtraBars.Ribbon.RibbonPage
Friend WithEvents RibbonPageEmail As DevExpress.XtraBars.Ribbon.RibbonPage
Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem10 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem11 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents SplitContainerControl3 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents Label4 As Label
Friend WithEvents Label5 As Label
Friend WithEvents Label24 As Label
@@ -2747,7 +2630,6 @@ Partial Class frmAdministration
Friend WithEvents TextBox7 As TextBox
Friend WithEvents BarButtonItem15 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents Label11 As Label
Friend WithEvents BarButtonItem12 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem13 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem14 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents RibbonPageGroupProfileRegex As DevExpress.XtraBars.Ribbon.RibbonPageGroup
@@ -2790,10 +2672,11 @@ Partial Class frmAdministration
Friend WithEvents GridColumn4 As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents BarButtonItem28 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem29 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents Panel1 As Panel
Friend WithEvents BarButtonItem30 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarSubItem2 As DevExpress.XtraBars.BarSubItem
Friend WithEvents BarButtonItem31 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem32 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem33 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents Panel1 As Panel
Friend WithEvents SplitContainerControl4 As DevExpress.XtraEditors.SplitContainerControl
End Class

File diff suppressed because it is too large Load Diff

View File

@@ -66,10 +66,6 @@ Public Class frmAdministration
Me.TBDD_DOKUMENTARTTableAdapter.Fill(Me.MyDataset.TBDD_DOKUMENTART)
Me.TBDD_EINGANGSARTENTableAdapter.Fill(Me.MyDataset.TBDD_EINGANGSARTEN)
Me.TBDD_MODULESTableAdapter.Fill(Me.MyDataset.TBDD_MODULES)
' Initialize Profile-GridControl before its tab is loaded
' prevents jumping of selected profile when selected tab is changed
GridControl3.ForceInitialize()
Catch ex As Exception
MsgBox("Error in frmAdministration_Load: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
End Try
@@ -1055,7 +1051,7 @@ Public Class frmAdministration
End Try
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)
ObjektTypenEintragen()
End Sub

View File

@@ -1193,10 +1193,10 @@ Public Class frmIndex
LOGGER.Debug("File streamed to Windream: {0}", oStreamSuccessful)
LOGGER.Debug("File exists in Destination: {0}", File.Exists(CURRENT_NEWFILENAME))
LOGGER.Debug("File should be deleted: {0}", CONFIG.Config.DeleteOriginalFile)
LOGGER.Debug("File should be deleted: {0}", CURR_DELETE_ORIGIN)
If File.Exists(CURRENT_NEWFILENAME) And oStreamSuccessful Then
If CONFIG.Config.DeleteOriginalFile = True Then
If CURR_DELETE_ORIGIN = True Then
Try
My.Computer.FileSystem.DeleteFile(CURRENT_WORKFILE)
Catch ex As Exception
@@ -1371,6 +1371,10 @@ Public Class frmIndex
CURRENT_ISATTACHMENT = False
DropType = ClassDatabase.Execute_Scalar("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID, MyConnectionString, True)
CURR_DELETE_ORIGIN = CONFIG.Config.DeleteOriginalFile
checkItemDeleteSource.Enabled = True
checkItemDeleteSource.Checked = CONFIG.Config.DeleteOriginalFile
VIEWER_LICENSE = ClassDatabase.Execute_Scalar("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'", MyConnectionString)
DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE)
@@ -1382,6 +1386,14 @@ Public Class frmIndex
Else
CURRENT_DROPTYPE = DropType.Replace("|", "")
' Eine Datei aus FolderWatch wird IMMER gelöscht, egal wie die Einstellung in der Config lautet
If DropType.StartsWith("|FW") Then
CURR_DELETE_ORIGIN = True
checkItemDeleteSource.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
Else
checkItemDeleteSource.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
End If
If DropType = "|DROPFROMFSYSTEM|" Then
If USER_LANGUAGE <> "de-DE" Then
Me.Text = "Indexing of dropped file"
@@ -1485,10 +1497,6 @@ Public Class frmIndex
Refresh_Dokart()
pnlIndex.Controls.Clear()
CURR_DELETE_ORIGIN = CONFIG.Config.DeleteOriginalFile
checkItemDeleteSource.Enabled = True
checkItemDeleteSource.Checked = CONFIG.Config.DeleteOriginalFile
checkItemTopMost.Checked = CONFIG.Config.TopMost
TopMost = CONFIG.Config.TopMost
BringToFront()
@@ -2373,7 +2381,7 @@ Public Class frmIndex
End Sub
Private Sub checkItemDeleteSource_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkItemDeleteSource.CheckedChanged
If FormLoaded = True Then
If FormLoaded = True And checkItemDeleteSource.Visibility <> DevExpress.XtraBars.BarItemVisibility.Never Then
CURR_DELETE_ORIGIN = checkItemDeleteSource.Checked
CONFIG.Config.DeleteOriginalFile = checkItemDeleteSource.Checked
CONFIG.Save()