last fixes

This commit is contained in:
Jonathan Jenne 2019-10-29 14:33:23 +01:00
parent 24e1fa2e04
commit b145bdf6b5
6 changed files with 44 additions and 40 deletions

View File

@ -24,7 +24,7 @@ Namespace My
<Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
Public Sub New()
MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
Me.IsSingleInstance = false
Me.IsSingleInstance = true
Me.EnableVisualStyles = true
Me.SaveMySettingsOnExit = true
Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses

View File

@ -2,7 +2,7 @@
<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<MySubMain>true</MySubMain>
<MainForm>frmStart</MainForm>
<SingleInstance>false</SingleInstance>
<SingleInstance>true</SingleInstance>
<ShutdownMode>0</ShutdownMode>
<EnableVisualStyles>true</EnableVisualStyles>
<AuthenticationMode>0</AuthenticationMode>

View File

@ -46,7 +46,6 @@ Partial Class frmAdministration
Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
Me.textEdit3 = New DevExpress.XtraEditors.TextEdit()
Me.textEdit4 = New DevExpress.XtraEditors.TextEdit()
Me.textEdit5 = New DevExpress.XtraEditors.TextEdit()
Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit()
Me.RibbonControl2 = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
@ -212,6 +211,7 @@ Partial Class frmAdministration
Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem()
Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit()
Me.SimpleSeparator1 = New DevExpress.XtraLayout.SimpleSeparator()
Me.textEdit5 = New DevExpress.XtraEditors.MemoEdit()
CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridControlProfiles, System.ComponentModel.ISupportInitialize).BeginInit()
@ -227,7 +227,6 @@ Partial Class frmAdministration
Me.LayoutControl1.SuspendLayout()
CType(Me.textEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.textEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.textEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RibbonControl2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
@ -339,6 +338,7 @@ Partial Class frmAdministration
CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.textEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'TBCW_PROFILESBindingSource
@ -474,7 +474,6 @@ Partial Class frmAdministration
'
Me.LayoutControl1.Controls.Add(Me.textEdit3)
Me.LayoutControl1.Controls.Add(Me.textEdit4)
Me.LayoutControl1.Controls.Add(Me.textEdit5)
Me.LayoutControl1.Controls.Add(Me.CheckEdit1)
Me.LayoutControl1.Controls.Add(Me.textEdit2)
Me.LayoutControl1.Controls.Add(Me.TextEdit8)
@ -482,6 +481,7 @@ Partial Class frmAdministration
Me.LayoutControl1.Controls.Add(Me.CHANGEDWHOTextBox)
Me.LayoutControl1.Controls.Add(Me.TextEdit6)
Me.LayoutControl1.Controls.Add(Me.PROFILE_IDTextBox)
Me.LayoutControl1.Controls.Add(Me.textEdit5)
Me.LayoutControl1.Location = New System.Drawing.Point(3, 3)
Me.LayoutControl1.Name = "LayoutControl1"
Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1243, 199, 650, 400)
@ -508,15 +508,6 @@ Partial Class frmAdministration
Me.textEdit4.StyleController = Me.LayoutControl1
Me.textEdit4.TabIndex = 7
'
'textEdit5
'
Me.textEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "REGEX_EXPRESSION", True))
Me.textEdit5.Location = New System.Drawing.Point(107, 133)
Me.textEdit5.Name = "textEdit5"
Me.textEdit5.Size = New System.Drawing.Size(269, 20)
Me.textEdit5.StyleController = Me.LayoutControl1
Me.textEdit5.TabIndex = 8
'
'CheckEdit1
'
Me.CheckEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ACTIVE", True))
@ -882,7 +873,7 @@ Partial Class frmAdministration
'TextEdit8
'
Me.TextEdit8.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "ADDED_WHO", True))
Me.TextEdit8.Location = New System.Drawing.Point(12, 173)
Me.TextEdit8.Location = New System.Drawing.Point(12, 224)
Me.TextEdit8.Name = "TextEdit8"
Me.TextEdit8.Properties.ReadOnly = True
Me.TextEdit8.Size = New System.Drawing.Size(180, 20)
@ -892,7 +883,7 @@ Partial Class frmAdministration
'TextEdit7
'
Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True))
Me.TextEdit7.Location = New System.Drawing.Point(196, 173)
Me.TextEdit7.Location = New System.Drawing.Point(196, 224)
Me.TextEdit7.Name = "TextEdit7"
Me.TextEdit7.Properties.ReadOnly = True
Me.TextEdit7.Size = New System.Drawing.Size(180, 20)
@ -902,7 +893,7 @@ Partial Class frmAdministration
'CHANGEDWHOTextBox
'
Me.CHANGEDWHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True))
Me.CHANGEDWHOTextBox.Location = New System.Drawing.Point(12, 213)
Me.CHANGEDWHOTextBox.Location = New System.Drawing.Point(12, 264)
Me.CHANGEDWHOTextBox.Name = "CHANGEDWHOTextBox"
Me.CHANGEDWHOTextBox.Properties.ReadOnly = True
Me.CHANGEDWHOTextBox.Size = New System.Drawing.Size(180, 20)
@ -912,7 +903,7 @@ Partial Class frmAdministration
'TextEdit6
'
Me.TextEdit6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True))
Me.TextEdit6.Location = New System.Drawing.Point(196, 213)
Me.TextEdit6.Location = New System.Drawing.Point(196, 264)
Me.TextEdit6.Name = "TextEdit6"
Me.TextEdit6.Properties.ReadOnly = True
Me.TextEdit6.Size = New System.Drawing.Size(180, 20)
@ -971,10 +962,9 @@ Partial Class frmAdministration
Me.layoutControlItem5.Control = Me.textEdit5
Me.layoutControlItem5.CustomizationFormText = "Regular Expression"
Me.layoutControlItem5.Location = New System.Drawing.Point(0, 121)
Me.layoutControlItem5.MaxSize = New System.Drawing.Size(404, 0)
Me.layoutControlItem5.MinSize = New System.Drawing.Size(149, 24)
Me.layoutControlItem5.MinSize = New System.Drawing.Size(50, 25)
Me.layoutControlItem5.Name = "layoutControlItem5"
Me.layoutControlItem5.Size = New System.Drawing.Size(368, 24)
Me.layoutControlItem5.Size = New System.Drawing.Size(368, 75)
Me.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom
Me.layoutControlItem5.Text = "Regular Expression"
Me.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Left
@ -993,7 +983,7 @@ Partial Class frmAdministration
'
Me.layoutControlItem1.Control = Me.TextEdit8
Me.layoutControlItem1.CustomizationFormText = "layoutControlItem1"
Me.layoutControlItem1.Location = New System.Drawing.Point(0, 145)
Me.layoutControlItem1.Location = New System.Drawing.Point(0, 196)
Me.layoutControlItem1.Name = "layoutControlItem1"
Me.layoutControlItem1.Size = New System.Drawing.Size(184, 40)
Me.layoutControlItem1.Text = "Erstellt Wer"
@ -1004,7 +994,7 @@ Partial Class frmAdministration
'
Me.layoutControlItem6.Control = Me.TextEdit7
Me.layoutControlItem6.CustomizationFormText = "layoutControlItem2"
Me.layoutControlItem6.Location = New System.Drawing.Point(184, 145)
Me.layoutControlItem6.Location = New System.Drawing.Point(184, 196)
Me.layoutControlItem6.Name = "layoutControlItem6"
Me.layoutControlItem6.Size = New System.Drawing.Size(184, 40)
Me.layoutControlItem6.Text = "Erstellt wann"
@ -1015,7 +1005,7 @@ Partial Class frmAdministration
'
Me.LayoutControlItem8.Control = Me.CHANGEDWHOTextBox
Me.LayoutControlItem8.CustomizationFormText = "layoutControlItem3"
Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 185)
Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 236)
Me.LayoutControlItem8.Name = "LayoutControlItem8"
Me.LayoutControlItem8.Size = New System.Drawing.Size(184, 40)
Me.LayoutControlItem8.Text = "Geändert wer"
@ -1026,7 +1016,7 @@ Partial Class frmAdministration
'
Me.LayoutControlItem9.Control = Me.TextEdit6
Me.LayoutControlItem9.CustomizationFormText = "layoutControlItem4"
Me.LayoutControlItem9.Location = New System.Drawing.Point(184, 185)
Me.LayoutControlItem9.Location = New System.Drawing.Point(184, 236)
Me.LayoutControlItem9.Name = "LayoutControlItem9"
Me.LayoutControlItem9.Size = New System.Drawing.Size(184, 40)
Me.LayoutControlItem9.Text = "Geändert wann"
@ -1045,9 +1035,9 @@ Partial Class frmAdministration
'EmptySpaceItem3
'
Me.EmptySpaceItem3.AllowHotTrack = False
Me.EmptySpaceItem3.Location = New System.Drawing.Point(0, 225)
Me.EmptySpaceItem3.Location = New System.Drawing.Point(0, 276)
Me.EmptySpaceItem3.Name = "EmptySpaceItem3"
Me.EmptySpaceItem3.Size = New System.Drawing.Size(368, 73)
Me.EmptySpaceItem3.Size = New System.Drawing.Size(368, 22)
Me.EmptySpaceItem3.TextSize = New System.Drawing.Size(0, 0)
'
'layoutControlItem3
@ -1735,6 +1725,10 @@ Partial Class frmAdministration
Me.CtrlApplicationAssignment1.Dock = System.Windows.Forms.DockStyle.Fill
Me.CtrlApplicationAssignment1.Location = New System.Drawing.Point(0, 0)
Me.CtrlApplicationAssignment1.Name = "CtrlApplicationAssignment1"
Me.CtrlApplicationAssignment1.SelectedControlId = 0
Me.CtrlApplicationAssignment1.SelectedProcessId = 0
Me.CtrlApplicationAssignment1.SelectedProfileId = 0
Me.CtrlApplicationAssignment1.SelectedWindowId = 0
Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1202, 587)
Me.CtrlApplicationAssignment1.TabIndex = 2
'
@ -2161,6 +2155,15 @@ Partial Class frmAdministration
Me.SimpleSeparator1.Name = "SimpleSeparator1"
Me.SimpleSeparator1.Size = New System.Drawing.Size(280, 2)
'
'textEdit5
'
Me.textEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "REGEX_EXPRESSION", True))
Me.textEdit5.Location = New System.Drawing.Point(107, 133)
Me.textEdit5.Name = "textEdit5"
Me.textEdit5.Size = New System.Drawing.Size(269, 71)
Me.textEdit5.StyleController = Me.LayoutControl1
Me.textEdit5.TabIndex = 8
'
'frmAdministration
'
Me.Appearance.Options.UseFont = True
@ -2192,7 +2195,6 @@ Partial Class frmAdministration
Me.LayoutControl1.ResumeLayout(False)
CType(Me.textEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.textEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.textEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.RibbonControl2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit()
@ -2304,6 +2306,7 @@ Partial Class frmAdministration
CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.textEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@ -2411,7 +2414,6 @@ Partial Class frmAdministration
Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl
Friend WithEvents textEdit3 As DevExpress.XtraEditors.TextEdit
Friend WithEvents textEdit4 As DevExpress.XtraEditors.TextEdit
Friend WithEvents textEdit5 As DevExpress.XtraEditors.TextEdit
Friend WithEvents CheckEdit1 As DevExpress.XtraEditors.CheckEdit
Friend WithEvents textEdit2 As DevExpress.XtraEditors.LookUpEdit
Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup
@ -2496,4 +2498,5 @@ Partial Class frmAdministration
Friend WithEvents TextEdit19 As DevExpress.XtraEditors.LookUpEdit
Friend WithEvents TBWHSEARCHPOSITIONBindingSource As BindingSource
Friend WithEvents TextEdit10 As DevExpress.XtraEditors.LookUpEdit
Friend WithEvents textEdit5 As DevExpress.XtraEditors.MemoEdit
End Class

View File

@ -276,8 +276,6 @@ Public Class frmAdministration
End Sub
Private Sub TBCW_PROF_DATA_SEARCHBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBCW_PROF_DATA_SEARCHBindingSource.AddingNew
MyDataset.TBCW_PROF_DATA_SEARCH.ADDED_WHOColumn.DefaultValue = Environment.UserName
MyDataset.TBCW_PROF_DATA_SEARCH.PROFILE_IDColumn.DefaultValue = PROFILE_IDTextBox.Text
MyDataset.TBCW_PROF_DATA_SEARCH.CONN_IDColumn.DefaultValue = 1
@ -339,9 +337,12 @@ Public Class frmAdministration
End Sub
Sub Refresh_ProfileScreen()
Load_Profiles()
Refresh_ProfileData()
Refresh_Free_Users(PROFILE_IDTextBox.Text)
Refresh_Free_Groups(PROFILE_IDTextBox.Text)
If PROFILE_IDTextBox.Text <> "" Then
Refresh_ProfileData()
Refresh_Free_Users(PROFILE_IDTextBox.Text)
Refresh_Free_Groups(PROFILE_IDTextBox.Text)
End If
End Sub
Private Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem5.ItemClick
@ -660,10 +661,8 @@ Public Class frmAdministration
TBCW_PROF_DOC_SEARCHTableAdapter.Fill(MyDataset.TBCW_PROF_DOC_SEARCH, PROFILE_IDTextBox.Text)
Status_Changed("Dokument-Suche gespeichert")
End If
Catch ex As NoNullAllowedException
MsgBox("Ein oder mehrere Felder wurden nicht ausgefüllt:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, Text)
Catch ex As Exception
MsgBox("Unexpected Error while saving Document Search: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
ShowErrorMessage(ex)
End Try
End Sub

View File

@ -242,6 +242,7 @@ Partial Class frmStart
'
Me.GroupBox2.Controls.Add(Me.labelStatus)
Me.GroupBox2.Controls.Add(Me.labelRefresh)
Me.GroupBox2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.GroupBox2.Location = New System.Drawing.Point(15, 157)
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(318, 64)
@ -252,6 +253,7 @@ Partial Class frmStart
'labelRefresh
'
Me.labelRefresh.AutoSize = True
Me.labelRefresh.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.labelRefresh.Location = New System.Drawing.Point(8, 21)
Me.labelRefresh.Name = "labelRefresh"
Me.labelRefresh.Size = New System.Drawing.Size(132, 13)
@ -260,10 +262,10 @@ Partial Class frmStart
'
'labelStatus
'
Me.labelStatus.AutoSize = True
Me.labelStatus.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.labelStatus.Location = New System.Drawing.Point(8, 34)
Me.labelStatus.Name = "labelStatus"
Me.labelStatus.Size = New System.Drawing.Size(38, 13)
Me.labelStatus.Size = New System.Drawing.Size(304, 27)
Me.labelStatus.TabIndex = 0
Me.labelStatus.Text = "Label3"
'

View File

@ -251,7 +251,7 @@ Public Class frmStart
Dim oForm As New frmMatch(LogConfig, oEnv, oParams)
_MatchForm = oForm
oForm.ShowDialog()
oForm.Show()
End Sub
Private Function GetEnvironment() As Environment