diff --git a/Global_Indexer.sln b/Global_Indexer.sln index 33eb617..976acf0 100644 --- a/Global_Indexer.sln +++ b/Global_Indexer.sln @@ -5,11 +5,6 @@ VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Global_Indexer", "Global_Indexer\Global_Indexer.vbproj", "{7474B1D2-49A4-4D12-B544-C8674D3F7231}" EndProject -Project("{6141683F-8A12-4E36-9623-2EB02B2C2303}") = "Setup", "Setup\Setup.isproj", "{B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}" - ProjectSection(ProjectDependencies) = postProject - {7474B1D2-49A4-4D12-B544-C8674D3F7231} = {7474B1D2-49A4-4D12-B544-C8674D3F7231} - EndProjectSection -EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupWix", "SetupWix\SetupWix.wixproj", "{5BF6646D-6F46-45E5-8806-8783F030F311}" EndProject Global @@ -56,36 +51,6 @@ Global {7474B1D2-49A4-4D12-B544-C8674D3F7231}.SingleImage|Mixed Platforms.ActiveCfg = Debug|Any CPU {7474B1D2-49A4-4D12-B544-C8674D3F7231}.SingleImage|Mixed Platforms.Build.0 = Debug|Any CPU {7474B1D2-49A4-4D12-B544-C8674D3F7231}.SingleImage|x86.ActiveCfg = Debug|Any CPU - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.CD_ROM|Any CPU.ActiveCfg = CD_ROM - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.CD_ROM|Any CPU.Build.0 = CD_ROM - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.CD_ROM|Mixed Platforms.ActiveCfg = CD_ROM - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.CD_ROM|Mixed Platforms.Build.0 = CD_ROM - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.CD_ROM|x86.ActiveCfg = CD_ROM - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.CD_ROM|x86.Build.0 = CD_ROM - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Debug|Any CPU.ActiveCfg = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Debug|Any CPU.Build.0 = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Debug|Mixed Platforms.ActiveCfg = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Debug|Mixed Platforms.Build.0 = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Debug|x86.ActiveCfg = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Debug|x86.Build.0 = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.DVD-5|Any CPU.ActiveCfg = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.DVD-5|Any CPU.Build.0 = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.DVD-5|Mixed Platforms.ActiveCfg = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.DVD-5|Mixed Platforms.Build.0 = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.DVD-5|x86.ActiveCfg = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.DVD-5|x86.Build.0 = DVD-5 - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Release|Any CPU.ActiveCfg = SingleImage - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Release|Any CPU.Build.0 = SingleImage - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Release|Mixed Platforms.ActiveCfg = SingleImage - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Release|Mixed Platforms.Build.0 = SingleImage - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Release|x86.ActiveCfg = SingleImage - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.Release|x86.Build.0 = SingleImage - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.SingleImage|Any CPU.ActiveCfg = SingleImage - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.SingleImage|Any CPU.Build.0 = SingleImage - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.SingleImage|Mixed Platforms.ActiveCfg = SingleImage - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.SingleImage|Mixed Platforms.Build.0 = SingleImage - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.SingleImage|x86.ActiveCfg = SingleImage - {B5CC58D2-5A9C-4640-BECC-5D67C2BCFC4B}.SingleImage|x86.Build.0 = SingleImage {5BF6646D-6F46-45E5-8806-8783F030F311}.CD_ROM|Any CPU.ActiveCfg = Release|x86 {5BF6646D-6F46-45E5-8806-8783F030F311}.CD_ROM|Mixed Platforms.ActiveCfg = Release|x86 {5BF6646D-6F46-45E5-8806-8783F030F311}.CD_ROM|Mixed Platforms.Build.0 = Release|x86 diff --git a/Global_Indexer/ClassDatabase.vb b/Global_Indexer/ClassDatabase.vb index 9920d51..5b2418c 100644 --- a/Global_Indexer/ClassDatabase.vb +++ b/Global_Indexer/ClassDatabase.vb @@ -24,12 +24,12 @@ Public Class ClassDatabase SQLconnect.Open() SQLcommand = SQLconnect.CreateCommand SQLcommand.CommandText = Select_anweisung - Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand) Dim dt As DataTable = New DataTable() adapter1.Fill(dt) SQLconnect.Close() Return dt + Catch ex As Exception If userInput = True Then MsgBox("Error in Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical) diff --git a/Global_Indexer/ClassDragDrop.vb b/Global_Indexer/ClassDragDrop.vb index b073a41..4d997f2 100644 --- a/Global_Indexer/ClassDragDrop.vb +++ b/Global_Indexer/ClassDragDrop.vb @@ -15,7 +15,7 @@ Public Class ClassDragDrop For i = 0 To MyFiles.Length - 1 ClassLogger.Add(">> Simple FileDrop - File: " & MyFiles(i), False) ReDim Preserve files_dropped(i) - files_dropped(i) = "@DROPFROMFSYSTEM@" & MyFiles(i) + files_dropped(i) = "|DROPFROMFSYSTEM|" & MyFiles(i) ' ListBox1.Items.Add(MyFiles(i)) Next Return True @@ -71,7 +71,7 @@ Public Class ClassDragDrop '// always good to make sure we actually created the file If (finTemp.Exists = True) Then ReDim Preserve files_dropped(0) - files_dropped(0) = "@OUTLOOK_ATTACHMENT@" & strOutFile + files_dropped(0) = "|OUTLOOK_ATTACHMENT|" & strOutFile If LogErrorsOnly = False Then ClassLogger.Add(">> Drop an Attachment - File: " & strOutFile, False) Return True Else @@ -110,9 +110,6 @@ Public Class ClassDragDrop strFile = strFile.Replace("!", "") strFile = strFile.Replace("%", "") strFile = strFile.Replace("$", "") - - - ClassLogger.Add(">> Drop of msg - File:" & strFile, False) Try myobj.SaveAs(strFile) @@ -122,7 +119,7 @@ Public Class ClassDragDrop End Try ReDim Preserve files_dropped(i) - files_dropped(i) = "@OUTLOOK_MESSAGE@" & strFile + files_dropped(i) = "|OUTLOOK_MESSAGE|" & strFile Next Return True 'Drop eines Outlook Attachments diff --git a/Global_Indexer/ClassEmailHeaderExtractor.vb b/Global_Indexer/ClassEmailHeaderExtractor.vb index c1b1e51..48a8bea 100644 --- a/Global_Indexer/ClassEmailHeaderExtractor.vb +++ b/Global_Indexer/ClassEmailHeaderExtractor.vb @@ -54,6 +54,53 @@ Public Class ClassEmailHeaderExtractor Return Nothing End Function + Public Shared Function extractFromAddress1(messageHeaders As String, Regex As String) + Try + Dim result + Dim i As Integer = 0 + If IsNothing(messageHeaders) Then + Return Nothing + End If + ' einen Regulären Ausdruck laden + Dim strRegex As String = Regex + Dim myRegex As New Regex(strRegex, RegexOptions.None) + Dim strTargetString As String = messageHeaders + ' die Vorkommen im String auslesen + For Each myMatch As Match In myRegex.Matches(strTargetString) + If myMatch.Success Then + If myMatch.Value <> "" Then + If i = 0 Then + result = myMatch.Value.ToString + Else + result = result & ";" & myMatch.Value.ToString + End If + i += 1 + End If + End If + Next + + '' einen Regulären Ausdruck laden + 'Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(Regex) + '' die Vorkommen im SQL-String auslesen + 'Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(messageHeaders) + 'Dim result + 'Dim i As Integer = 0 + '' alle Vorkommen der Indexe im header durchlaufen + 'For Each element As System.Text.RegularExpressions.Match In elemente + ' If i = 0 Then + ' result = element.ToString + ' Else + ' result = result & ";" & element.ToString + ' End If + ' i += 1 + 'Next + Return result + Catch ex As Exception + MsgBox("Unexpected Error in extractFromAddress1: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + Return Nothing + End Try + + End Function ''' ''' Extrahiert aus den Headerinformationen anhand einer Liste von Regular Expressions eine Empfängeradresse. diff --git a/Global_Indexer/ClassFilehandle.vb b/Global_Indexer/ClassFilehandle.vb index ed7e4aa..b5dcabb 100644 --- a/Global_Indexer/ClassFilehandle.vb +++ b/Global_Indexer/ClassFilehandle.vb @@ -25,7 +25,7 @@ Public Class ClassFilehandle Dim result As MsgBoxResult result = MessageBox.Show("Achtung: Die Email enthält Anhänge!" & vbNewLine & "Wollen Sie die Anhänge separat indexieren und herauslösen?", "Nachfrage zur Indexierung:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then - If handletype.StartsWith("@FW") Then + If handletype.StartsWith("|FW") Then Return Email_Decay(filename, True) Else Return Email_Decay(filename) @@ -41,11 +41,11 @@ Public Class ClassFilehandle End Function Private Shared Function Email_Decay(msgname As String, Optional FW As Boolean = False) Try - Dim msgonly As String = "@MSGONLY@" - Dim ATT_EXTR As String = "@ATTMNTEXTRACTED@" + Dim msgonly As String = "|MSGONLY|" + Dim ATT_EXTR As String = "|ATTMNTEXTRACTED|" If FW = True Then - msgonly = "@FW_MSGONLY@" - ATT_EXTR = "@FW_ATTMNTEXTRACTED@" + msgonly = "|FW_MSGONLY|" + ATT_EXTR = "|FW_ATTMNTEXTRACTED|" End If Dim erfolgreich As Boolean = False Dim msg As New Msg.Message(msgname) diff --git a/Global_Indexer/ClassFolderWatcher.vb b/Global_Indexer/ClassFolderWatcher.vb index 5c29b12..e5420f3 100644 --- a/Global_Indexer/ClassFolderWatcher.vb +++ b/Global_Indexer/ClassFolderWatcher.vb @@ -139,9 +139,9 @@ Public Class ClassFolderWatcher Dim handleType As String If e.FullPath.ToLower.EndsWith(".msg") Then - handleType = "@FW_OUTLOOK_MESSAGE@" + handleType = "|FW_OUTLOOK_MESSAGE|" Else - handleType = "@FW_SIMPLEINDEXER@" + handleType = "|FW_SIMPLEINDEXER|" End If 'Die Datei übergeben If LogErrorsOnly = False Then ClassLogger.Add(">> OnCreated-File:" & e.FullPath, False) @@ -149,7 +149,6 @@ Public Class ClassFolderWatcher ClassFilehandle.Decide_FileHandle(e.FullPath, handleType) Else ClassLogger.Add(">> Folderwatcher: File already exists:" & e.FullPath, False) - Console.WriteLine("File existiert bereits") End If Catch ex As Exception diff --git a/Global_Indexer/ClassWindream.vb b/Global_Indexer/ClassWindream.vb index 605d09d..9eb16b9 100644 --- a/Global_Indexer/ClassWindream.vb +++ b/Global_Indexer/ClassWindream.vb @@ -42,7 +42,6 @@ Public Class ClassWindream Public Shared oBrowser As New WMOBRWSLib.ServerBrowser Public Shared oDokumentTypen As WINDREAMLib.WMObjects Private oController As New WMOSearchController - Public Shared _DateiinWindream As String Public Shared _WDObjekttyp As String Private Shared aktWMObject As WINDREAMLib.WMObject #End Region @@ -573,17 +572,17 @@ Public Class ClassWindream Const STREAM_BinaryObject = "BinaryObject" If LogErrorsOnly = False Then ClassLogger.Add(" ...Stream_File wurde gestartet", False) - Dim endgültigerDateiname As String = "" + Dim windreamFilename As String = "" ' Objekt für Datei und Zielverzeichnis anlegen Dim Quelldatei_Name As String = Path.GetFileName(filenameQuelle) If LogErrorsOnly = False Then ClassLogger.Add(" ...Quelldatei gelesen", False) '"Version-KZ entfernen newfilename = newfilename.Replace("\\", "\") - endgültigerDateiname = newfilename.Substring(2) - If endgültigerDateiname.Contains("[%Version]") Then - endgültigerDateiname = endgültigerDateiname.Replace("[%Version]", "") - newfilename = endgültigerDateiname + windreamFilename = newfilename.Substring(2) + If windreamFilename.Contains("[%Version]") Then + windreamFilename = windreamFilename.Replace("[%Version]", "") + newfilename = windreamFilename End If If My.Computer.FileSystem.DirectoryExists(Zielverzeichnis) Then @@ -640,6 +639,7 @@ Public Class ClassWindream ClassLogger.Add(" >> Login on dms-Server failed", False) ' MsgBox("Login failed. ") End If + oSession = Session Const WMCOMEventWMSessionNeedIndex = 1 'windream Objekte erstellen ohne Indexierungs-Event @@ -647,10 +647,10 @@ Public Class ClassWindream '================================================================== ' check if files exist '================================================================== - If LogErrorsOnly = False Then ClassLogger.Add(" ...ÜBERPRÜFTER DATEINAME => " & endgültigerDateiname, False) + If LogErrorsOnly = False Then ClassLogger.Add(" ...ÜBERPRÜFTER DATEINAME => " & windreamFilename, False) Dim wdFilexists As Boolean If LogErrorsOnly = False Then ClassLogger.Add(" ...Versuch auf die Datei in W: zuzugreifen und zu sperren...", False) - wdFilexists = Session.WMObjectExists(WMEntityDocument, endgültigerDateiname, 0, 0) + wdFilexists = Session.WMObjectExists(WMEntityDocument, windreamFilename, 0, 0) Err.Clear() If wdFilexists = False Then If LogErrorsOnly = False Then ClassLogger.Add(" ...Datei ist NICHT vorhanden, kann also einfach neu angelegt werden", False) @@ -658,47 +658,53 @@ Public Class ClassWindream '================================================================== ' create an object '================================================================== - WMObject = Session.GetNewWMObjectFS(WMEntityDocument, endgültigerDateiname, WMObjectEditModeObject) + WMObject = Session.GetNewWMObjectFS(WMEntityDocument, windreamFilename, WMObjectEditModeObject) If Err.Number > 0 Then ClassLogger.Add(" FEHLER: WMObject konnte nicht erzeugt werden - Error: '" & Err.Description & "'") 'MsgBox(Err.Description) End If - ' MsgBox("Created file: " + endgültigerDateiname) + ' MsgBox("Created file: " + windreamFilename) Else - 'endgültigerDateiname = \Brainpool - Geschäftsprozess\GI\DAGI_Digital Data[%Version].jpg ' wenn auf die Datei zugeriffen werden konnte ist sie bereits vorhanden -> Datum anhängen If LogErrorsOnly = False Then ClassLogger.Add(" ...Es konnte zugegriffen werden -> DATEI IST BEREITS VORHANDEN", False) - '### Automatische Versionierung ### - Dim version As Integer = 2 - Dim extension As String = Path.GetExtension(newfilename) - Dim Stammname As String = newfilename.Substring(0, newfilename.LastIndexOf(".")).Substring(3) - Dim neuername As String = newfilename.Substring(0, newfilename.LastIndexOf(".")).Substring(3) - - Do While File.Exists(vWLaufwerk & ":\" & neuername & extension) = True - ClassLogger.Add(" >> Datei " & vWLaufwerk & ":\" & neuername & extension & " ist vorhanden - Versionieren....", False) - neuername = Stammname & VERSION_DELIMITER & version - endgültigerDateiname = "\" & neuername & extension - version = version + 1 - Loop - WMObject = Session.GetNewWMObjectFS(WMEntityDocument, endgültigerDateiname, WMObjectEditModeObject) + If CURRENT_DOKART_DUPLICATE_HANDLING = "Default" Or CURRENT_DOKART_DUPLICATE_HANDLING = "Question" Then + ''########## + Dim msg = String.Format("Eine Datei mit identischem Namen " & vbNewLine & "'{0}'" & vbNewLine & "existiert bereits!" & vbNewLine & "Wollen Sie die bestehende Datei ersetzen?", newfilename) + If USER_LANGUAGE <> "de-DE" Then + msg = "There is already a file with the same name! Would You like to replace the file?" + End If + Dim result As MsgBoxResult + result = MessageBox.Show(msg, "File alredy exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.No Then + windreamFilename = ClassFilehandle.Versionierung_Datei(newfilename).ToString.Substring(2) + Else + If Delete_WDFile(windreamFilename) = False Then + Return False + End If + End If + ElseIf CURRENT_DOKART_DUPLICATE_HANDLING = "New version" Then + windreamFilename = ClassFilehandle.Versionierung_Datei(newfilename).ToString.Substring(2) + End If + WMObject = Session.GetNewWMObjectFS(WMEntityDocument, windreamFilename, WMObjectEditModeObject) If Err.Number > 0 Then ClassLogger.Add(" FEHLER: Neues WMObject (Kopie) konnte nicht erzeugt werden - Error: '" & Err.Description & "'") 'MsgBox(Err.Description) End If If LogErrorsOnly = False Then ClassLogger.Add(" ...WMObject zugewiesen", False) End If - If LogErrorsOnly = False Then ClassLogger.Add(" ...ENDGÜLTIGER DATEINAME => " & endgültigerDateiname, False) + If LogErrorsOnly = False Then ClassLogger.Add(" ...ENDGÜLTIGER DATEINAME => " & windreamFilename, False) If WMObject IsNot Nothing Then + newfilename = vWLaufwerk & ":" & windreamFilename ' lock object for file system access (to change the file itself) WMObject.lock() ' set fileIO the local source file aFileIO.bstrOriginalFileName = filenameQuelle If Err.Number > 0 Then - 'MsgBox(Err.Number.ToString) ClassLogger.Add(" FEHLER: fileIO konnte nicht gesetzt werden - Datei wird wieder gelöscht - Error: '" & Err.Description & "'") ClassLogger.Add(" HINWEIS: Überprüfen Sie den Verweis auf die Bibliotheken 'WMOTool.WMFileIO' UND 'WMOTOOLLib.WMFileIO' und ändern diese in den Anwendungseinstellungen (DLL_WMOTOOL)'", False) WMObject.Unlock() - System.IO.File.Delete(vWLaufwerk & ":\" & endgültigerDateiname) + Delete_WDFile(windreamFilename) + Return False ' MsgBox(Err.Description) End If @@ -707,7 +713,7 @@ Public Class ClassWindream If Err.Number > 0 Then ClassLogger.Add(" Unexpected error in OpenStream - Datei wird wieder gelöscht - Error: '" & Err.Description & "'") WMObject.Unlock() - System.IO.File.Delete(vWLaufwerk & ":\" & endgültigerDateiname) + Delete_WDFile(windreamFilename) Return False 'MsgBox(Err.Description) End If @@ -717,7 +723,7 @@ Public Class ClassWindream If Err.Number > 0 Then ClassLogger.Add(" Unexpected error in Zuweisen aWMStream zu aFileIO - Datei wird wieder gelöscht - Error: '" & Err.Description & "'") WMObject.Unlock() - System.IO.File.Delete(vWLaufwerk & ":\" & endgültigerDateiname) + Delete_WDFile(windreamFilename) Return False 'MsgBox(Err.Description) End If @@ -726,7 +732,7 @@ Public Class ClassWindream If Err.Number > 0 Then ClassLogger.Add(" Unexpected error in FileIO.ImportOriginal(True) - Datei wird wieder gelöscht - Error: '" & Err.Description & "'") WMObject.Unlock() - System.IO.File.Delete(vWLaufwerk & ":\" & endgültigerDateiname) + Delete_WDFile(windreamFilename) Return False ' MsgBox(Err.Description) End If @@ -736,7 +742,7 @@ Public Class ClassWindream If Err.Number > 0 Then ClassLogger.Add(" Unexpected error in aWMStream.Close() - Datei wird wieder gelöscht - Error: '" & Err.Description & "'") WMObject.Unlock() - System.IO.File.Delete(vWLaufwerk & ":\" & endgültigerDateiname) + Delete_WDFile(windreamFilename) Return False 'MsgBox(Err.Description) End If @@ -745,7 +751,7 @@ Public Class ClassWindream If Err.Number > 0 Then ClassLogger.Add(" Unexpected error in WMObject.save - Datei wird wieder gelöscht - Error: '" & Err.Description & "'") WMObject.Unlock() - System.IO.File.Delete(vWLaufwerk & ":\" & endgültigerDateiname) + Delete_WDFile(windreamFilename) Return False 'MsgBox(Err.Description) End If @@ -755,37 +761,37 @@ Public Class ClassWindream If Err.Number > 0 Then ClassLogger.Add(" Unexpected error in WMObject.unlock - Datei wird wieder gelöscht - Error: '" & Err.Description & "'") WMObject.Unlock() - System.IO.File.Delete(vWLaufwerk & ":\" & endgültigerDateiname) + Delete_WDFile(windreamFilename) Return False 'MsgBox(Err.Description) End If 'DATEI GRÖSSE ERMITTELN - MANCHMAL KOMMT ES VOR DAS DATEIGRÖße 0 ist - Dim info2 As New FileInfo(vWLaufwerk & ":\" & endgültigerDateiname) + Dim info2 As New FileInfo(newfilename) Dim length1 As Long = info2.Length If LogErrorsOnly = False Then ClassLogger.Add(" ...Length der Zieldatei: " & length1.ToString, False) - If length1 > 0 And Err.Number = 0 Then + If length > 0 And Err.Number = 0 Then Dim p As String - If endgültigerDateiname.StartsWith("\") Then - If endgültigerDateiname.StartsWith("\\") Then - p = endgültigerDateiname.Replace("\\", "\") + If windreamFilename.StartsWith("\") Then + If windreamFilename.StartsWith("\\") Then + p = windreamFilename.Replace("\\", "\") Else - p = endgültigerDateiname + p = windreamFilename End If Else - p = "\" & endgültigerDateiname + p = "\" & windreamFilename End If - _DateiinWindream = vWLaufwerk & ":" & p - ClassLogger.Add(" >> Datei '" & _DateiinWindream & "' wurde erfolgreich importiert!", False) + CURRENT_NEWFILENAME = vWLaufwerk & ":" & p + ClassLogger.Add(" >> Datei '" & CURRENT_NEWFILENAME & "' wurde erfolgreich importiert!", False) aktWMObject = WMObject - - CURRENT_NEWFILENAME = _DateiinWindream Return True Else - System.IO.File.Delete(vWLaufwerk & ":\" & endgültigerDateiname) + Delete_WDFile(windreamFilename) + Console.WriteLine(Err.Number.ToString) ClassLogger.Add(" Unexpected error in Datei-Übertragen - FileLength ist 0, Übertragene Datei wurde gelöscht") Return False End If Else + ClassLogger.Add(" Could not create a WMObject for file:'" & windreamFilename & "'") Return False End If Else @@ -794,6 +800,28 @@ Public Class ClassWindream End If End Function + Public Shared Function Delete_WDFile(ByVal WD_File As String) + Try + If Not WD_File.StartsWith("\") Then + WD_File = WD_File.Substring(2) + End If + Dim WMObject As WINDREAMLib.WMObject '= CreateObject("WINDREAMLib.WMObject") 'New WINDREAMLib.WMObject + Try + WMObject = oSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, WD_File) 'WINDREAMLib.WMEntity.WMEntityDocument + Catch ex As Exception + ClassLogger.Add(">> Could not create WMObject for file '" & WD_File & "' - so it is not existing", False) + Return False + End Try + + If LogErrorsOnly = False Then ClassLogger.Add(" >> Deleting started - Object created", False) + WMObject.Delete() + Return True + Catch ex As Exception + MsgBox("Unexpected Error in Delete_WDFile: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + ClassLogger.Add("Unexpected Error in Delete_WDFile: " & ex.Message, False) + Return False + End Try + End Function ''' ''' Übergibt einer in windream gespeicherten Datei Indexwerte ''' diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index cb70785..3cf1090 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -53,32 +53,32 @@ My Project\app.manifest - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + False - - - - - - - + + + + + + + False P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll @@ -305,6 +305,9 @@ frmConfig_Basic.vb + + frmConfig_Basic.vb + frmConfig_Basic.vb diff --git a/Global_Indexer/Global_Indexer.vbproj.bak b/Global_Indexer/Global_Indexer.vbproj.bak index 1291007..cb70785 100644 --- a/Global_Indexer/Global_Indexer.vbproj.bak +++ b/Global_Indexer/Global_Indexer.vbproj.bak @@ -54,14 +54,12 @@ - - @@ -83,18 +81,18 @@ False - ..\..\..\Bibliotheken\DLL\DLLLicenseManager.dll + P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll False - \\dd-sto01\DD-STO01-A2\Projekte\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll + P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll - ..\..\..\Bibliotheken\DLL\windreamDLL\64bit\Interop.WINDREAMLib.dll + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll False - \\dd-sto01\DD-STO01-A2\Projekte\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll True @@ -139,6 +137,7 @@ Form + @@ -297,9 +296,15 @@ AboutBox1.vb + + frmAdministration.vb + frmAdministration.vb + + frmConfig_Basic.vb + frmConfig_Basic.vb @@ -575,6 +580,8 @@ Always + + diff --git a/Global_Indexer/ModuleCURRENT.vb b/Global_Indexer/ModuleCURRENT.vb index e9b18c2..432a592 100644 --- a/Global_Indexer/ModuleCURRENT.vb +++ b/Global_Indexer/ModuleCURRENT.vb @@ -8,6 +8,7 @@ Public CURR_WORKFILE_EXTENSION As String Public CURRENT_DOKART_ID As Integer + Public CURRENT_DOKART_DUPLICATE_HANDLING As String = "Default" Public CURRENT_LASTDOKART As String = "" Public CURRENT_INDEXMAN As Integer Public CURRENT_INDEXAUTO As Integer diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index b4e4462..d8dccdf 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices - + @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/Global_Indexer/My Project/licenses.licx b/Global_Indexer/My Project/licenses.licx index 395f626..79a6743 100644 --- a/Global_Indexer/My Project/licenses.licx +++ b/Global_Indexer/My Project/licenses.licx @@ -1,3 +1,3 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Global_Indexer/MyDataset.Designer.vb b/Global_Indexer/MyDataset.Designer.vb index 4675e28..957d6e8 100644 --- a/Global_Indexer/MyDataset.Designer.vb +++ b/Global_Indexer/MyDataset.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.34209 +' Laufzeitversion:4.0.30319.36366 ' ' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' der Code erneut generiert wird. @@ -1844,6 +1844,8 @@ Partial Public Class MyDataset Private columnSEQUENCE As Global.System.Data.DataColumn + Private columnDUPLICATE_HANDLING As Global.System.Data.DataColumn + _ Public Sub New() @@ -2007,6 +2009,14 @@ Partial Public Class MyDataset End Get End Property + _ + Public ReadOnly Property DUPLICATE_HANDLINGColumn() As Global.System.Data.DataColumn + Get + Return Me.columnDUPLICATE_HANDLING + End Get + End Property + _ @@ -2044,9 +2054,25 @@ Partial Public Class MyDataset _ - Public Overloads Function AddTBDD_DOKUMENTARTRow(ByVal BEZEICHNUNG As String, ByVal parentTBDD_EINGANGSARTENRowByFK_TBDD_DOKUMENTART_EINGID As TBDD_EINGANGSARTENRow, ByVal KURZNAME As String, ByVal ZIEL_PFAD As String, ByVal BESCHREIBUNG As String, ByVal AKTIV As Boolean, ByVal NAMENKONVENTION As String, ByVal ERSTELLTWER As String, ByVal ERSTELLTWANN As Date, ByVal GEANDERTWER As String, ByVal GEAENDERTWANN As Date, ByVal OBJEKTTYP As String, ByVal WINDREAM_DIRECT As Boolean, ByVal FOLDER_FOR_INDEX As String, ByVal SEQUENCE As Integer) As TBDD_DOKUMENTARTRow + Public Overloads Function AddTBDD_DOKUMENTARTRow( _ + ByVal BEZEICHNUNG As String, _ + ByVal parentTBDD_EINGANGSARTENRowByFK_TBDD_DOKUMENTART_EINGID As TBDD_EINGANGSARTENRow, _ + ByVal KURZNAME As String, _ + ByVal ZIEL_PFAD As String, _ + ByVal BESCHREIBUNG As String, _ + ByVal AKTIV As Boolean, _ + ByVal NAMENKONVENTION As String, _ + ByVal ERSTELLTWER As String, _ + ByVal ERSTELLTWANN As Date, _ + ByVal GEANDERTWER As String, _ + ByVal GEAENDERTWANN As Date, _ + ByVal OBJEKTTYP As String, _ + ByVal WINDREAM_DIRECT As Boolean, _ + ByVal FOLDER_FOR_INDEX As String, _ + ByVal SEQUENCE As Integer, _ + ByVal DUPLICATE_HANDLING As String) As TBDD_DOKUMENTARTRow Dim rowTBDD_DOKUMENTARTRow As TBDD_DOKUMENTARTRow = CType(Me.NewRow,TBDD_DOKUMENTARTRow) - Dim columnValuesArray() As Object = New Object() {Nothing, BEZEICHNUNG, Nothing, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, OBJEKTTYP, WINDREAM_DIRECT, FOLDER_FOR_INDEX, SEQUENCE} + Dim columnValuesArray() As Object = New Object() {Nothing, BEZEICHNUNG, Nothing, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, OBJEKTTYP, WINDREAM_DIRECT, FOLDER_FOR_INDEX, SEQUENCE, DUPLICATE_HANDLING} If (Not (parentTBDD_EINGANGSARTENRowByFK_TBDD_DOKUMENTART_EINGID) Is Nothing) Then columnValuesArray(2) = parentTBDD_EINGANGSARTENRowByFK_TBDD_DOKUMENTART_EINGID(0) End If @@ -2094,6 +2120,7 @@ Partial Public Class MyDataset Me.columnWINDREAM_DIRECT = MyBase.Columns("WINDREAM_DIRECT") Me.columnFOLDER_FOR_INDEX = MyBase.Columns("FOLDER_FOR_INDEX") Me.columnSEQUENCE = MyBase.Columns("SEQUENCE") + Me.columnDUPLICATE_HANDLING = MyBase.Columns("DUPLICATE_HANDLING") End Sub _ Public Sub New() @@ -3414,6 +3450,14 @@ Partial Public Class MyDataset End Get End Property + _ + Public ReadOnly Property SAVE_VALUEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSAVE_VALUE + End Get + End Property + _ @@ -3468,9 +3512,10 @@ Partial Public Class MyDataset ByVal ADDED_WHEN As Date, _ ByVal CHANGED_WHO As String, _ ByVal CHANGED_WHEN As Date, _ - ByVal _OPTIONAL As Boolean) As TBDD_INDEX_MANRow + ByVal _OPTIONAL As Boolean, _ + ByVal SAVE_VALUE As Boolean) As TBDD_INDEX_MANRow Dim rowTBDD_INDEX_MANRow As TBDD_INDEX_MANRow = CType(Me.NewRow,TBDD_INDEX_MANRow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, Nothing, SEQUENCE, SQL_RESULT, SQL_CHECK, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, _OPTIONAL} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, Nothing, SEQUENCE, SQL_RESULT, SQL_CHECK, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, _OPTIONAL, SAVE_VALUE} If (Not (parentTBDD_DOKUMENTARTRowByFK_TBDD_INDEX_MAN_DAID) Is Nothing) Then columnValuesArray(1) = parentTBDD_DOKUMENTARTRowByFK_TBDD_INDEX_MAN_DAID(0) End If @@ -3523,6 +3568,7 @@ Partial Public Class MyDataset Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") Me.columnOPTIONAL = MyBase.Columns("OPTIONAL") + Me.columnSAVE_VALUE = MyBase.Columns("SAVE_VALUE") End Sub _ Public Sub New() @@ -4422,6 +4474,14 @@ Partial Public Class MyDataset End Get End Property + _ + Public ReadOnly Property SAVE_VALUEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSAVE_VALUE + End Get + End Property + _ @@ -4481,9 +4541,10 @@ Partial Public Class MyDataset ByVal Indexiert As Boolean, _ ByVal Indexwert As String, _ ByVal _OPTIONAL As Boolean, _ - ByVal Indexwert_File As String) As VWDDINDEX_MANRow + ByVal Indexwert_File As String, _ + ByVal SAVE_VALUE As Boolean) As VWDDINDEX_MANRow Dim rowVWDDINDEX_MANRow As VWDDINDEX_MANRow = CType(Me.NewRow,VWDDINDEX_MANRow) - Dim columnValuesArray() As Object = New Object() {GUID, INDEXNAME, WD_INDEX, COMMENT, DATATYPE, DOK_ID, DOKUMENTART, KURZNAME, SUGGESTION, CONNECTION_ID, CONNECTION, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, SQL_RESULT, SQL_CHECK, Indexiert, Indexwert, _OPTIONAL, Indexwert_File} + Dim columnValuesArray() As Object = New Object() {GUID, INDEXNAME, WD_INDEX, COMMENT, DATATYPE, DOK_ID, DOKUMENTART, KURZNAME, SUGGESTION, CONNECTION_ID, CONNECTION, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, SQL_RESULT, SQL_CHECK, Indexiert, Indexwert, _OPTIONAL, Indexwert_File, SAVE_VALUE} rowVWDDINDEX_MANRow.ItemArray = columnValuesArray Me.Rows.Add(rowVWDDINDEX_MANRow) Return rowVWDDINDEX_MANRow @@ -4534,6 +4595,7 @@ Partial Public Class MyDataset Me.columnIndexwert = MyBase.Columns("Indexwert") Me.columnOPTIONAL = MyBase.Columns("OPTIONAL") Me.columnIndexwert_File = MyBase.Columns("Indexwert_File") + Me.columnSAVE_VALUE = MyBase.Columns("SAVE_VALUE") End Sub _ Public Property ERSTELLTWANN() As Date Get - Try - Return CType(Me(Me.tableTBDD_DOKUMENTART.ERSTELLTWANNColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ERSTELLTWANN in Tabelle TBDD_DOKUMENTART ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBDD_DOKUMENTART.ERSTELLTWANNColumn),Date) End Get Set Me(Me.tableTBDD_DOKUMENTART.ERSTELLTWANNColumn) = value @@ -13068,6 +13130,17 @@ Partial Public Class MyDataset End Set End Property + _ + Public Property DUPLICATE_HANDLING() As String + Get + Return CType(Me(Me.tableTBDD_DOKUMENTART.DUPLICATE_HANDLINGColumn),String) + End Get + Set + Me(Me.tableTBDD_DOKUMENTART.DUPLICATE_HANDLINGColumn) = value + End Set + End Property + _ Public Property TBDD_EINGANGSARTENRow() As TBDD_EINGANGSARTENRow @@ -13103,18 +13176,6 @@ Partial Public Class MyDataset Me(Me.tableTBDD_DOKUMENTART.NAMENKONVENTIONColumn) = Global.System.Convert.DBNull End Sub - _ - Public Function IsERSTELLTWANNNull() As Boolean - Return Me.IsNull(Me.tableTBDD_DOKUMENTART.ERSTELLTWANNColumn) - End Function - - _ - Public Sub SetERSTELLTWANNNull() - Me(Me.tableTBDD_DOKUMENTART.ERSTELLTWANNColumn) = Global.System.Convert.DBNull - End Sub - _ Public Function IsGEANDERTWERNull() As Boolean @@ -13700,6 +13761,17 @@ Partial Public Class MyDataset End Set End Property + _ + Public Property SAVE_VALUE() As Boolean + Get + Return CType(Me(Me.tableTBDD_INDEX_MAN.SAVE_VALUEColumn),Boolean) + End Get + Set + Me(Me.tableTBDD_INDEX_MAN.SAVE_VALUEColumn) = value + End Set + End Property + _ Public Property TBDD_CONNECTIONRow() As TBDD_CONNECTIONRow @@ -14455,6 +14527,17 @@ Partial Public Class MyDataset End Set End Property + _ + Public Property SAVE_VALUE() As Boolean + Get + Return CType(Me(Me.tableVWDDINDEX_MAN.SAVE_VALUEColumn),Boolean) + End Get + Set + Me(Me.tableVWDDINDEX_MAN.SAVE_VALUEColumn) = value + End Set + End Property + _ Public Function IsWD_INDEXNull() As Boolean @@ -20010,6 +20093,7 @@ Namespace MyDatasetTableAdapters tableMapping.ColumnMappings.Add("WINDREAM_DIRECT", "WINDREAM_DIRECT") tableMapping.ColumnMappings.Add("FOLDER_FOR_INDEX", "FOLDER_FOR_INDEX") tableMapping.ColumnMappings.Add("SEQUENCE", "SEQUENCE") + tableMapping.ColumnMappings.Add("DUPLICATE_HANDLING", "DUPLICATE_HANDLING") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -20020,12 +20104,13 @@ Namespace MyDatasetTableAdapters Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_DOKUMENTART"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (BEZEICHNUNG, EINGANGSART_"& _ "ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, OBJE"& _ - "KTTYP, WINDREAM_DIRECT, FOLDER_FOR_INDEX, SEQUENCE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@BEZEICHNUNG"& _ - ",@EINGANGSART_ID,@KURZNAME,@ZIEL_PFAD,@BESCHREIBUNG,@AKTIV,@NAMENKONVENTION,@ERS"& _ - "TELLTWER,@OBJEKTTYP,@WINDREAM_DIRECT,@FOLDER_FOR_INDEX,@SEQUENCE); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT G"& _ - "UID, BEZEICHNUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAME"& _ - "NKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, OBJEKTTYP FR"& _ - "OM TBDD_DOKUMENTART WHERE (GUID = SCOPE_IDENTITY())" + "KTTYP, WINDREAM_DIRECT, FOLDER_FOR_INDEX, SEQUENCE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" D"& _ + "UPLICATE_HANDLING)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@BEZEICHNUNG,@EINGANGSART_ID,@KURZNAME,@ZIEL_"& _ + "PFAD,@BESCHREIBUNG,@AKTIV,@NAMENKONVENTION,@ERSTELLTWER,@OBJEKTTYP,@WINDREAM_DIR"& _ + "ECT,@FOLDER_FOR_INDEX,@SEQUENCE,@DUPLICATE_HANDLING); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICH"& _ + "NUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION,"& _ + " ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, OBJEKTTYP FROM TBDD_DOKU"& _ + "MENTART WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEZEICHNUNG", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EINGANGSART_ID", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "EINGANGSART_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -20039,6 +20124,7 @@ Namespace MyDatasetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WINDREAM_DIRECT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "WINDREAM_DIRECT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLDER_FOR_INDEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLDER_FOR_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DUPLICATE_HANDLING", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "DUPLICATE_HANDLING", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_DOKUMENTART"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET BEZEICHNUNG = @BEZEICHNUNG, EIN"& _ @@ -20046,10 +20132,11 @@ Namespace MyDatasetTableAdapters "CHREIBUNG = @BESCHREIBUNG, AKTIV = @AKTIV, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" NAMENKONVE"& _ "NTION = @NAMENKONVENTION, GEANDERTWER = @GEANDERTWER, OBJEKTTYP = @OBJEKTTYP, WI"& _ "NDREAM_DIRECT = @WINDREAM_DIRECT, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" FOLDER_FOR_INDEX = "& _ - "@FOLDER_FOR_INDEX, SEQUENCE = @SEQUENCE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "& _ - " "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG"& _ - ", AKTIV, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN,"& _ - " OBJEKTTYP FROM TBDD_DOKUMENTART WHERE (GUID = @GUID)" + "@FOLDER_FOR_INDEX, SEQUENCE = @SEQUENCE, DUPLICATE_HANDLING = @DUPLICATE_HANDLIN"& _ + "G"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, EINGAN"& _ + "GSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER"& _ + ", ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, OBJEKTTYP FROM TBDD_DOKUMENTART WHER"& _ + "E (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEZEICHNUNG", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EINGANGSART_ID", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "EINGANGSART_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -20063,6 +20150,7 @@ Namespace MyDatasetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WINDREAM_DIRECT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "WINDREAM_DIRECT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLDER_FOR_INDEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLDER_FOR_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DUPLICATE_HANDLING", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "DUPLICATE_HANDLING", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -20083,7 +20171,8 @@ Namespace MyDatasetTableAdapters Me._commandCollection(0).CommandText = "SELECT GUID, BEZEICHNUNG, EINGANGSART_ID, WINDREAM_DIRECT, KURZNAME, ZIEL_"& _ "PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTW"& _ "ER, GEAENDERTWANN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" OBJEKTTYP, FOLDER_FOR_INDEX, SEQUE"& _ - "NCE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_DOKUMENTART"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY SEQUENCE, BEZEICHNUNG" + "NCE, DUPLICATE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_DOKUMENTART"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY SEQUENCE, BE"& _ + "ZEICHNUNG" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(1).Connection = Me.Connection @@ -20099,10 +20188,10 @@ Namespace MyDatasetTableAdapters Me._commandCollection(2).CommandText = "SELECT GUID, BEZEICHNUNG, EINGANGSART_ID, WINDREAM_DIRECT, KURZNAME, ZIEL_"& _ "PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTW"& _ "ER, GEAENDERTWANN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" OBJEKTTYP, FOLDER_FOR_INDEX, SEQUE"& _ - "NCE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_DOKUMENTART"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " (SELECT DOKART_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" FROM "& _ - " TBDD_DOKUMENTART_MODULE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WHERE (MODULE"& _ - "_ID = 1)))"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY SEQUENCE, BEZEICHNUNG" + "NCE, DUPLICATE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_DOKUMENTART"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID IN"& _ + ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (SELECT DOKART_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " FROM TBDD_DOKUMENTART_MODULE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + "WHERE (MODULE_ID = 1)))"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY SEQUENCE, BEZEICHNUNG" Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text End Sub @@ -20207,7 +20296,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal BEZEICHNUNG As String, ByVal EINGANGSART_ID As Byte, ByVal KURZNAME As String, ByVal ZIEL_PFAD As String, ByVal BESCHREIBUNG As String, ByVal AKTIV As Boolean, ByVal NAMENKONVENTION As String, ByVal ERSTELLTWER As String, ByVal OBJEKTTYP As String, ByVal WINDREAM_DIRECT As Boolean, ByVal FOLDER_FOR_INDEX As String, ByVal SEQUENCE As Integer) As Integer + Public Overloads Overridable Function Insert(ByVal BEZEICHNUNG As String, ByVal EINGANGSART_ID As Byte, ByVal KURZNAME As String, ByVal ZIEL_PFAD As String, ByVal BESCHREIBUNG As String, ByVal AKTIV As Boolean, ByVal NAMENKONVENTION As String, ByVal ERSTELLTWER As String, ByVal OBJEKTTYP As String, ByVal WINDREAM_DIRECT As Boolean, ByVal FOLDER_FOR_INDEX As String, ByVal SEQUENCE As Integer, ByVal DUPLICATE_HANDLING As String) As Integer If (BEZEICHNUNG Is Nothing) Then Throw New Global.System.ArgumentNullException("BEZEICHNUNG") Else @@ -20252,6 +20341,11 @@ Namespace MyDatasetTableAdapters Me.Adapter.InsertCommand.Parameters(10).Value = CType(FOLDER_FOR_INDEX,String) End If Me.Adapter.InsertCommand.Parameters(11).Value = CType(SEQUENCE,Integer) + If (DUPLICATE_HANDLING Is Nothing) Then + Throw New Global.System.ArgumentNullException("DUPLICATE_HANDLING") + Else + Me.Adapter.InsertCommand.Parameters(12).Value = CType(DUPLICATE_HANDLING,String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -20271,7 +20365,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ - Public Overloads Overridable Function Update(ByVal BEZEICHNUNG As String, ByVal EINGANGSART_ID As Byte, ByVal KURZNAME As String, ByVal ZIEL_PFAD As String, ByVal BESCHREIBUNG As String, ByVal AKTIV As Boolean, ByVal NAMENKONVENTION As String, ByVal GEANDERTWER As String, ByVal OBJEKTTYP As String, ByVal WINDREAM_DIRECT As Boolean, ByVal FOLDER_FOR_INDEX As String, ByVal SEQUENCE As Integer, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Update(ByVal BEZEICHNUNG As String, ByVal EINGANGSART_ID As Byte, ByVal KURZNAME As String, ByVal ZIEL_PFAD As String, ByVal BESCHREIBUNG As String, ByVal AKTIV As Boolean, ByVal NAMENKONVENTION As String, ByVal GEANDERTWER As String, ByVal OBJEKTTYP As String, ByVal WINDREAM_DIRECT As Boolean, ByVal FOLDER_FOR_INDEX As String, ByVal SEQUENCE As Integer, ByVal DUPLICATE_HANDLING As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer If (BEZEICHNUNG Is Nothing) Then Throw New Global.System.ArgumentNullException("BEZEICHNUNG") Else @@ -20316,8 +20410,13 @@ Namespace MyDatasetTableAdapters Me.Adapter.UpdateCommand.Parameters(10).Value = CType(FOLDER_FOR_INDEX,String) End If Me.Adapter.UpdateCommand.Parameters(11).Value = CType(SEQUENCE,Integer) - Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(13).Value = CType(GUID,Integer) + If (DUPLICATE_HANDLING Is Nothing) Then + Throw New Global.System.ArgumentNullException("DUPLICATE_HANDLING") + Else + Me.Adapter.UpdateCommand.Parameters(12).Value = CType(DUPLICATE_HANDLING,String) + End If + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -21229,6 +21328,7 @@ Namespace MyDatasetTableAdapters tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") tableMapping.ColumnMappings.Add("OPTIONAL", "OPTIONAL") + tableMapping.ColumnMappings.Add("SAVE_VALUE", "SAVE_VALUE") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -21239,12 +21339,13 @@ Namespace MyDatasetTableAdapters Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_INDEX_MAN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (DOK_ID, NAME, WD_INDEX, COM"& _ "MENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, CONNECTION_ID, SEQUENCE, SQL_RESULT, "& _ - "SQL_CHECK, ACTIVE, ADDED_WHO, OPTIONAL)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@DOK_ID,@NAME,@WD_INDEX,"& _ - "@COMMENT,@DATATYPE,@SUGGESTION,@DEFAULT_VALUE,@CONNECTION_ID,@SEQUENCE,@SQL_RESU"& _ - "LT,@SQL_CHECK,@ACTIVE,@ADDED_WHO,@OPTIONAL); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOK_ID, NAME, WD_IND"& _ - "EX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, CONNECTION_ID, SEQUENCE, SQL_R"& _ - "ESULT, SQL_CHECK, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, OPTI"& _ - "ONAL FROM TBDD_INDEX_MAN WHERE (GUID = SCOPE_IDENTITY())" + "SQL_CHECK, ACTIVE, ADDED_WHO, OPTIONAL, SAVE_VALUE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@DOK_ID,@NAM"& _ + "E,@WD_INDEX,@COMMENT,@DATATYPE,@SUGGESTION,@DEFAULT_VALUE,@CONNECTION_ID,@SEQUEN"& _ + "CE,@SQL_RESULT,@SQL_CHECK,@ACTIVE,@ADDED_WHO,@OPTIONAL,@SAVE_VALUE); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT G"& _ + "UID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, CONNE"& _ + "CTION_ID, SEQUENCE, SQL_RESULT, SQL_CHECK, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGE"& _ + "D_WHO, CHANGED_WHEN, OPTIONAL FROM TBDD_INDEX_MAN WHERE (GUID = SCOPE_IDENTITY()"& _ + ")" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOK_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOK_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -21260,6 +21361,7 @@ Namespace MyDatasetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@OPTIONAL", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "OPTIONAL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_INDEX_MAN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET DOK_ID = @DOK_ID, NAME = @NAME, W"& _ @@ -21267,10 +21369,11 @@ Namespace MyDatasetTableAdapters "GESTION, DEFAULT_VALUE = @DEFAULT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CONNECTION_I"& _ "D = @CONNECTION_ID, SEQUENCE = @SEQUENCE, SQL_RESULT = @SQL_RESULT, SQL_CHECK = "& _ "@SQL_CHECK, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " OPTIONAL = @OPTIONAL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, "& _ - "DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, CONNECTION"& _ - "_ID, SEQUENCE, SQL_RESULT, SQL_CHECK, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO"& _ - ", CHANGED_WHEN, OPTIONAL FROM TBDD_INDEX_MAN WHERE (GUID = @GUID)" + " OPTIONAL = @OPTIONAL, SAVE_VALUE = @SAVE_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Origi"& _ + "nal_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION"& _ + ", DEFAULT_VALUE, CONNECTION_ID, SEQUENCE, SQL_RESULT, SQL_CHECK, ACTIVE, ADDED_W"& _ + "HO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, OPTIONAL FROM TBDD_INDEX_MAN WHERE (G"& _ + "UID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOK_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOK_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -21286,6 +21389,7 @@ Namespace MyDatasetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@OPTIONAL", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "OPTIONAL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -21305,8 +21409,9 @@ Namespace MyDatasetTableAdapters Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAUL"& _ "T_VALUE, CONNECTION_ID, SEQUENCE, SQL_RESULT, SQL_CHECK, ACTIVE, ADDED_WHO, ADDE"& _ - "D_WHEN, CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHEN, OPTIONAL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ - " TBDD_INDEX_MAN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (DOK_ID = @DOK_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY SEQUENCE" + "D_WHEN, CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHEN, OPTIONAL, SAVE_VAL"& _ + "UE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_INDEX_MAN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (DOK_ID = @DOK_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY SE"& _ + "QUENCE" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOK_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOK_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub @@ -21390,7 +21495,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal DOK_ID As Integer, ByVal NAME As String, ByVal WD_INDEX As String, ByVal COMMENT As String, ByVal DATATYPE As String, ByVal SUGGESTION As Boolean, ByVal DEFAULT_VALUE As String, ByVal CONNECTION_ID As Global.System.Nullable(Of Short), ByVal SEQUENCE As Integer, ByVal SQL_RESULT As String, ByVal SQL_CHECK As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal _OPTIONAL As Boolean) As Integer + Public Overloads Overridable Function Insert(ByVal DOK_ID As Integer, ByVal NAME As String, ByVal WD_INDEX As String, ByVal COMMENT As String, ByVal DATATYPE As String, ByVal SUGGESTION As Boolean, ByVal DEFAULT_VALUE As String, ByVal CONNECTION_ID As Global.System.Nullable(Of Short), ByVal SEQUENCE As Integer, ByVal SQL_RESULT As String, ByVal SQL_CHECK As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal _OPTIONAL As Boolean, ByVal SAVE_VALUE As Boolean) As Integer Me.Adapter.InsertCommand.Parameters(0).Value = CType(DOK_ID,Integer) If (NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("NAME") @@ -21441,6 +21546,7 @@ Namespace MyDatasetTableAdapters Me.Adapter.InsertCommand.Parameters(12).Value = CType(ADDED_WHO,String) End If Me.Adapter.InsertCommand.Parameters(13).Value = CType(_OPTIONAL,Boolean) + Me.Adapter.InsertCommand.Parameters(14).Value = CType(SAVE_VALUE,Boolean) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -21475,6 +21581,7 @@ Namespace MyDatasetTableAdapters ByVal ACTIVE As Boolean, _ ByVal CHANGED_WHO As String, _ ByVal _OPTIONAL As Boolean, _ + ByVal SAVE_VALUE As Boolean, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(DOK_ID,Integer) @@ -21527,8 +21634,9 @@ Namespace MyDatasetTableAdapters Me.Adapter.UpdateCommand.Parameters(12).Value = CType(CHANGED_WHO,String) End If Me.Adapter.UpdateCommand.Parameters(13).Value = CType(_OPTIONAL,Boolean) - Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(15).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(SAVE_VALUE,Boolean) + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -22093,6 +22201,7 @@ Namespace MyDatasetTableAdapters tableMapping.ColumnMappings.Add("SQL_RESULT", "SQL_RESULT") tableMapping.ColumnMappings.Add("SQL_CHECK", "SQL_CHECK") tableMapping.ColumnMappings.Add("OPTIONAL", "OPTIONAL") + tableMapping.ColumnMappings.Add("SAVE_VALUE", "SAVE_VALUE") Me._adapter.TableMappings.Add(tableMapping) End Sub @@ -22112,7 +22221,7 @@ Namespace MyDatasetTableAdapters Me._commandCollection(0).CommandText = "SELECT GUID, INDEXNAME, WD_INDEX, COMMENT, DATATYPE, DOK_ID, DOKUMENTART, "& _ "KURZNAME, SUGGESTION, CONNECTION_ID, CONNECTION, SQL_PROVIDER, SERVER, DATENBANK"& _ ", USERNAME, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" PASSWORD, SQL_RESULT, SQL_CHECK, OPTIONAL"& _ - ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWDDINDEX_MAN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (DOK_ID = @DokID)" + ", SAVE_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWDDINDEX_MAN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (DOK_ID = @DokID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DokID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOK_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub diff --git a/Global_Indexer/MyDataset.xsd b/Global_Indexer/MyDataset.xsd index 93a56d5..f721e50 100644 --- a/Global_Indexer/MyDataset.xsd +++ b/Global_Indexer/MyDataset.xsd @@ -115,8 +115,9 @@ WHERE (GUID = @Original_GUID) INSERT INTO TBDD_DOKUMENTART - (BEZEICHNUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, OBJEKTTYP, WINDREAM_DIRECT, FOLDER_FOR_INDEX, SEQUENCE) -VALUES (@BEZEICHNUNG,@EINGANGSART_ID,@KURZNAME,@ZIEL_PFAD,@BESCHREIBUNG,@AKTIV,@NAMENKONVENTION,@ERSTELLTWER,@OBJEKTTYP,@WINDREAM_DIRECT,@FOLDER_FOR_INDEX,@SEQUENCE); + (BEZEICHNUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, OBJEKTTYP, WINDREAM_DIRECT, FOLDER_FOR_INDEX, SEQUENCE, + DUPLICATE_HANDLING) +VALUES (@BEZEICHNUNG,@EINGANGSART_ID,@KURZNAME,@ZIEL_PFAD,@BESCHREIBUNG,@AKTIV,@NAMENKONVENTION,@ERSTELLTWER,@OBJEKTTYP,@WINDREAM_DIRECT,@FOLDER_FOR_INDEX,@SEQUENCE,@DUPLICATE_HANDLING); SELECT GUID, BEZEICHNUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, OBJEKTTYP FROM TBDD_DOKUMENTART WHERE (GUID = SCOPE_IDENTITY()) @@ -131,13 +132,14 @@ SELECT GUID, BEZEICHNUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKT + SELECT GUID, BEZEICHNUNG, EINGANGSART_ID, WINDREAM_DIRECT, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, - OBJEKTTYP, FOLDER_FOR_INDEX, SEQUENCE + OBJEKTTYP, FOLDER_FOR_INDEX, SEQUENCE, DUPLICATE_HANDLING FROM TBDD_DOKUMENTART ORDER BY SEQUENCE, BEZEICHNUNG @@ -148,8 +150,8 @@ ORDER BY SEQUENCE, BEZEICHNUNG UPDATE TBDD_DOKUMENTART SET BEZEICHNUNG = @BEZEICHNUNG, EINGANGSART_ID = @EINGANGSART_ID, KURZNAME = @KURZNAME, ZIEL_PFAD = @ZIEL_PFAD, BESCHREIBUNG = @BESCHREIBUNG, AKTIV = @AKTIV, NAMENKONVENTION = @NAMENKONVENTION, GEANDERTWER = @GEANDERTWER, OBJEKTTYP = @OBJEKTTYP, WINDREAM_DIRECT = @WINDREAM_DIRECT, - FOLDER_FOR_INDEX = @FOLDER_FOR_INDEX, SEQUENCE = @SEQUENCE -WHERE (GUID = @Original_GUID); + FOLDER_FOR_INDEX = @FOLDER_FOR_INDEX, SEQUENCE = @SEQUENCE, DUPLICATE_HANDLING = @DUPLICATE_HANDLING +WHERE (GUID = @Original_GUID); SELECT GUID, BEZEICHNUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, OBJEKTTYP FROM TBDD_DOKUMENTART WHERE (GUID = @GUID) @@ -164,6 +166,7 @@ SELECT GUID, BEZEICHNUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKT + @@ -188,6 +191,7 @@ SELECT GUID, BEZEICHNUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKT + @@ -209,7 +213,7 @@ WHERE (GUID = @Original_GUID) SELECT GUID, BEZEICHNUNG, EINGANGSART_ID, WINDREAM_DIRECT, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, - OBJEKTTYP, FOLDER_FOR_INDEX, SEQUENCE + OBJEKTTYP, FOLDER_FOR_INDEX, SEQUENCE, DUPLICATE_HANDLING FROM TBDD_DOKUMENTART WHERE (GUID IN (SELECT DOKART_ID @@ -348,33 +352,34 @@ WHERE (GUID = @Original_GUID) - + INSERT INTO TBDD_INDEX_MAN - (DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, CONNECTION_ID, SEQUENCE, SQL_RESULT, SQL_CHECK, ACTIVE, ADDED_WHO, OPTIONAL) -VALUES (@DOK_ID,@NAME,@WD_INDEX,@COMMENT,@DATATYPE,@SUGGESTION,@DEFAULT_VALUE,@CONNECTION_ID,@SEQUENCE,@SQL_RESULT,@SQL_CHECK,@ACTIVE,@ADDED_WHO,@OPTIONAL); + (DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, CONNECTION_ID, SEQUENCE, SQL_RESULT, SQL_CHECK, ACTIVE, ADDED_WHO, OPTIONAL, SAVE_VALUE) +VALUES (@DOK_ID,@NAME,@WD_INDEX,@COMMENT,@DATATYPE,@SUGGESTION,@DEFAULT_VALUE,@CONNECTION_ID,@SEQUENCE,@SQL_RESULT,@SQL_CHECK,@ACTIVE,@ADDED_WHO,@OPTIONAL,@SAVE_VALUE); SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, CONNECTION_ID, SEQUENCE, SQL_RESULT, SQL_CHECK, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, OPTIONAL FROM TBDD_INDEX_MAN WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - - - - - - - - + + + + + + + + + + + + + + + SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, CONNECTION_ID, SEQUENCE, SQL_RESULT, SQL_CHECK, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, - CHANGED_WHEN, OPTIONAL + CHANGED_WHEN, OPTIONAL, SAVE_VALUE FROM TBDD_INDEX_MAN WHERE (DOK_ID = @DOK_ID) ORDER BY SEQUENCE @@ -384,30 +389,31 @@ ORDER BY SEQUENCE - + UPDATE TBDD_INDEX_MAN SET DOK_ID = @DOK_ID, NAME = @NAME, WD_INDEX = @WD_INDEX, COMMENT = @COMMENT, DATATYPE = @DATATYPE, SUGGESTION = @SUGGESTION, DEFAULT_VALUE = @DEFAULT_VALUE, CONNECTION_ID = @CONNECTION_ID, SEQUENCE = @SEQUENCE, SQL_RESULT = @SQL_RESULT, SQL_CHECK = @SQL_CHECK, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO, - OPTIONAL = @OPTIONAL -WHERE (GUID = @Original_GUID); + OPTIONAL = @OPTIONAL, SAVE_VALUE = @SAVE_VALUE +WHERE (GUID = @Original_GUID); SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, CONNECTION_ID, SEQUENCE, SQL_RESULT, SQL_CHECK, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, OPTIONAL FROM TBDD_INDEX_MAN WHERE (GUID = @GUID) - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -432,6 +438,7 @@ SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALU + @@ -520,7 +527,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B SELECT GUID, INDEXNAME, WD_INDEX, COMMENT, DATATYPE, DOK_ID, DOKUMENTART, KURZNAME, SUGGESTION, CONNECTION_ID, CONNECTION, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, - PASSWORD, SQL_RESULT, SQL_CHECK, OPTIONAL + PASSWORD, SQL_RESULT, SQL_CHECK, OPTIONAL, SAVE_VALUE FROM VWDDINDEX_MAN WHERE (DOK_ID = @DokID) @@ -550,6 +557,7 @@ WHERE (DOK_ID = @DokID) + @@ -1787,7 +1795,7 @@ ORDER BY GUID DESC - + @@ -1832,7 +1840,7 @@ ORDER BY GUID DESC - + @@ -1857,6 +1865,13 @@ ORDER BY GUID DESC + + + + + + + @@ -2000,6 +2015,7 @@ ORDER BY GUID DESC + @@ -2185,6 +2201,7 @@ ORDER BY GUID DESC + diff --git a/Global_Indexer/MyDataset.xss b/Global_Indexer/MyDataset.xss index f6bbbdf..7444583 100644 --- a/Global_Indexer/MyDataset.xss +++ b/Global_Indexer/MyDataset.xss @@ -4,40 +4,40 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + 431 @@ -49,7 +49,7 @@ - + 543 @@ -61,7 +61,7 @@ - + 397 @@ -73,7 +73,7 @@ - + 605 @@ -89,7 +89,7 @@ - + 959 @@ -101,7 +101,7 @@ - + 1193 @@ -117,7 +117,7 @@ - + 871 @@ -129,7 +129,7 @@ - + 94 @@ -149,7 +149,7 @@ - + 129 @@ -165,7 +165,7 @@ - + 183 @@ -177,7 +177,7 @@ - + 88 @@ -197,7 +197,7 @@ - + 117 @@ -217,7 +217,7 @@ - + 765 @@ -233,7 +233,7 @@ - + 409 @@ -253,7 +253,7 @@ - + 38 diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index 708154b..fb68a8a 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -99,17 +99,23 @@ Partial Class frmAdministration Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() - Me.SEQUENCENumericUpDown = New System.Windows.Forms.NumericUpDown() + Me.GroupBox6 = New System.Windows.Forms.GroupBox() + Me.ComboBox3 = New System.Windows.Forms.ComboBox() Me.TBDD_DOKUMENTARTBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.MyDataset = New Global_Indexer.MyDataset() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colBEZEICHNUNG = New DevExpress.XtraGrid.Columns.GridColumn() + Me.SEQUENCENumericUpDown = New System.Windows.Forms.NumericUpDown() Me.WINDREAM_DIRECTCheckBox = New System.Windows.Forms.CheckBox() Me.btndeleteZuordnung = New System.Windows.Forms.Button() Me.lblObjekttyp = New System.Windows.Forms.Label() Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage() + Me.SAVE_VALUECheckBox = New System.Windows.Forms.CheckBox() + Me.TBDD_INDEX_MANBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.lblWDINDEX = New System.Windows.Forms.Label() Me.OPTIONALCheckBox = New System.Windows.Forms.CheckBox() - Me.TBDD_INDEX_MANBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.ListBox5 = New System.Windows.Forms.ListBox() Me.btnSQLView = New System.Windows.Forms.Button() Me.lblSaveIndexMan = New System.Windows.Forms.Label() @@ -211,6 +217,7 @@ Partial Class frmAdministration Me.ToolStripButton21 = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripButton22 = New System.Windows.Forms.ToolStripButton() + Me.tsbtnRefreshAutomatic = New System.Windows.Forms.ToolStripButton() Me.INDEXNAME_AutoIndexTXT = New System.Windows.Forms.TextBox() Me.XtraTabPage9 = New DevExpress.XtraTab.XtraTabPage() Me.Button2 = New System.Windows.Forms.Button() @@ -278,8 +285,13 @@ Partial Class frmAdministration Me.GEAENDERTWANNTextBox = New System.Windows.Forms.TextBox() Me.OBJEKTTYPComboBox = New System.Windows.Forms.ComboBox() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() - Me.SHORTNAMETextBox = New System.Windows.Forms.TextBox() + Me.GridControl2 = New DevExpress.XtraGrid.GridControl() Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colUSERNAME = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colNAME = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colEMAIL = New DevExpress.XtraGrid.Columns.GridColumn() + Me.SHORTNAMETextBox = New System.Windows.Forms.TextBox() Me.LANGUAGEComboBox = New System.Windows.Forms.ComboBox() Me.lblsaveUSer = New System.Windows.Forms.Label() Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl() @@ -388,14 +400,6 @@ Partial Class frmAdministration Me.TBDD_GROUPS_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_GROUPS_USERTableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBDD_GROUPS_USERTableAdapter() Me.VWGI_DOCTYPE_GROUPTableAdapter = New Global_Indexer.MyDatasetTableAdapters.VWGI_DOCTYPE_GROUPTableAdapter() - Me.GridControl1 = New DevExpress.XtraGrid.GridControl() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colBEZEICHNUNG = New DevExpress.XtraGrid.Columns.GridColumn() - Me.GridControl2 = New DevExpress.XtraGrid.GridControl() - Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colUSERNAME = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colNAME = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colEMAIL = New DevExpress.XtraGrid.Columns.GridColumn() GUIDLabel = New System.Windows.Forms.Label() BEZEICHNUNGLabel = New System.Windows.Forms.Label() EINGANGSART_IDLabel = New System.Windows.Forms.Label() @@ -471,9 +475,12 @@ Partial Class frmAdministration CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.XtraTabPage1.SuspendLayout() - CType(Me.SEQUENCENumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupBox6.SuspendLayout() CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SEQUENCENumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl2.SuspendLayout() Me.XtraTabPage3.SuspendLayout() @@ -502,7 +509,9 @@ Partial Class frmAdministration CType(Me.TBDD_DOKUMENTARTBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() Me.TBDD_DOKUMENTARTBindingNavigator.SuspendLayout() Me.XtraTabPage2.SuspendLayout() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl3.SuspendLayout() Me.XtraTabPage7.SuspendLayout() @@ -519,10 +528,6 @@ Partial Class frmAdministration CType(Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBGI_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_GROUPS_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GUIDLabel @@ -905,6 +910,7 @@ Partial Class frmAdministration 'XtraTabPage1 ' resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1") + Me.XtraTabPage1.Controls.Add(Me.GroupBox6) Me.XtraTabPage1.Controls.Add(Me.GridControl1) Me.XtraTabPage1.Controls.Add(Label9) Me.XtraTabPage1.Controls.Add(SEQUENCELabel3) @@ -948,11 +954,20 @@ Partial Class frmAdministration Me.XtraTabPage1.Controls.Add(Me.OBJEKTTYPComboBox) Me.XtraTabPage1.Name = "XtraTabPage1" ' - 'SEQUENCENumericUpDown + 'GroupBox6 ' - Me.SEQUENCENumericUpDown.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_DOKUMENTARTBindingSource, "SEQUENCE", True)) - resources.ApplyResources(Me.SEQUENCENumericUpDown, "SEQUENCENumericUpDown") - Me.SEQUENCENumericUpDown.Name = "SEQUENCENumericUpDown" + Me.GroupBox6.Controls.Add(Me.ComboBox3) + resources.ApplyResources(Me.GroupBox6, "GroupBox6") + Me.GroupBox6.Name = "GroupBox6" + Me.GroupBox6.TabStop = False + ' + 'ComboBox3 + ' + Me.ComboBox3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "DUPLICATE_HANDLING", True)) + Me.ComboBox3.FormattingEnabled = True + Me.ComboBox3.Items.AddRange(New Object() {resources.GetString("ComboBox3.Items"), resources.GetString("ComboBox3.Items1"), resources.GetString("ComboBox3.Items2")}) + resources.ApplyResources(Me.ComboBox3, "ComboBox3") + Me.ComboBox3.Name = "ComboBox3" ' 'TBDD_DOKUMENTARTBindingSource ' @@ -964,6 +979,46 @@ Partial Class frmAdministration Me.MyDataset.DataSetName = "MyDataset" Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' + 'GridControl1 + ' + Me.GridControl1.DataSource = Me.TBDD_DOKUMENTARTBindingSource + resources.ApplyResources(Me.GridControl1, "GridControl1") + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.ShowOnlyPredefinedDetails = True + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView1.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True + Me.GridView1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color) + Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colBEZEICHNUNG}) + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsBehavior.Editable = False + Me.GridView1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridView1.OptionsView.ColumnAutoWidth = False + Me.GridView1.OptionsView.EnableAppearanceEvenRow = True + Me.GridView1.OptionsView.ShowAutoFilterRow = True + Me.GridView1.OptionsView.ShowGroupPanel = False + ' + 'colBEZEICHNUNG + ' + resources.ApplyResources(Me.colBEZEICHNUNG, "colBEZEICHNUNG") + Me.colBEZEICHNUNG.FieldName = "BEZEICHNUNG" + Me.colBEZEICHNUNG.Name = "colBEZEICHNUNG" + ' + 'SEQUENCENumericUpDown + ' + Me.SEQUENCENumericUpDown.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_DOKUMENTARTBindingSource, "SEQUENCE", True)) + resources.ApplyResources(Me.SEQUENCENumericUpDown, "SEQUENCENumericUpDown") + Me.SEQUENCENumericUpDown.Name = "SEQUENCENumericUpDown" + ' 'WINDREAM_DIRECTCheckBox ' Me.WINDREAM_DIRECTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_DOKUMENTARTBindingSource, "WINDREAM_DIRECT", True)) @@ -999,6 +1054,7 @@ Partial Class frmAdministration 'XtraTabPage3 ' resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3") + Me.XtraTabPage3.Controls.Add(Me.SAVE_VALUECheckBox) Me.XtraTabPage3.Controls.Add(Me.lblWDINDEX) Me.XtraTabPage3.Controls.Add(Me.OPTIONALCheckBox) Me.XtraTabPage3.Controls.Add(Me.ListBox5) @@ -1030,6 +1086,18 @@ Partial Class frmAdministration Me.XtraTabPage3.Controls.Add(Me.GUIDTextBox1) Me.XtraTabPage3.Name = "XtraTabPage3" ' + 'SAVE_VALUECheckBox + ' + Me.SAVE_VALUECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "SAVE_VALUE", True)) + resources.ApplyResources(Me.SAVE_VALUECheckBox, "SAVE_VALUECheckBox") + Me.SAVE_VALUECheckBox.Name = "SAVE_VALUECheckBox" + Me.SAVE_VALUECheckBox.UseVisualStyleBackColor = True + ' + 'TBDD_INDEX_MANBindingSource + ' + Me.TBDD_INDEX_MANBindingSource.DataMember = "TBDD_INDEX_MAN" + Me.TBDD_INDEX_MANBindingSource.DataSource = Me.MyDataset + ' 'lblWDINDEX ' resources.ApplyResources(Me.lblWDINDEX, "lblWDINDEX") @@ -1042,11 +1110,6 @@ Partial Class frmAdministration Me.OPTIONALCheckBox.Name = "OPTIONALCheckBox" Me.OPTIONALCheckBox.UseVisualStyleBackColor = True ' - 'TBDD_INDEX_MANBindingSource - ' - Me.TBDD_INDEX_MANBindingSource.DataMember = "TBDD_INDEX_MAN" - Me.TBDD_INDEX_MANBindingSource.DataSource = Me.MyDataset - ' 'ListBox5 ' Me.ListBox5.DataSource = Me.TBDD_INDEX_MANBindingSource @@ -1151,7 +1214,7 @@ Partial Class frmAdministration Me.TBDD_INDEX_MANBindingNav.BindingSource = Me.TBDD_INDEX_MANBindingSource Me.TBDD_INDEX_MANBindingNav.CountItem = Me.ToolStripLabel1 Me.TBDD_INDEX_MANBindingNav.CountItemFormat = "von {0} manuellen Indexen" - Me.TBDD_INDEX_MANBindingNav.DeleteItem = Me.ToolStripButton2 + Me.TBDD_INDEX_MANBindingNav.DeleteItem = Nothing Me.TBDD_INDEX_MANBindingNav.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton3, Me.ToolStripButton4, Me.ToolStripSeparator1, Me.ToolStripTextBox1, Me.ToolStripLabel1, Me.ToolStripSeparator2, Me.ToolStripButton5, Me.ToolStripButton6, Me.ToolStripSeparator3, Me.ToolStripButton1, Me.ToolStripButton2, Me.ToolStripButton7, Me.ToolStripButton41}) resources.ApplyResources(Me.TBDD_INDEX_MANBindingNav, "TBDD_INDEX_MANBindingNav") Me.TBDD_INDEX_MANBindingNav.MoveFirstItem = Me.ToolStripButton3 @@ -1562,7 +1625,7 @@ Partial Class frmAdministration ' resources.ApplyResources(Me.lbFileparameter, "lbFileparameter") Me.lbFileparameter.FormattingEnabled = True - Me.lbFileparameter.Items.AddRange(New Object() {resources.GetString("lbFileparameter.Items"), resources.GetString("lbFileparameter.Items1"), resources.GetString("lbFileparameter.Items2"), resources.GetString("lbFileparameter.Items3"), resources.GetString("lbFileparameter.Items4"), resources.GetString("lbFileparameter.Items5"), resources.GetString("lbFileparameter.Items6")}) + Me.lbFileparameter.Items.AddRange(New Object() {resources.GetString("lbFileparameter.Items"), resources.GetString("lbFileparameter.Items1"), resources.GetString("lbFileparameter.Items2"), resources.GetString("lbFileparameter.Items3"), resources.GetString("lbFileparameter.Items4"), resources.GetString("lbFileparameter.Items5"), resources.GetString("lbFileparameter.Items6"), resources.GetString("lbFileparameter.Items7")}) Me.lbFileparameter.Name = "lbFileparameter" ' 'ListBox6 @@ -1678,7 +1741,7 @@ Partial Class frmAdministration Me.BindingNavigator2.CountItemFormat = "von {0} automatischen Indexen" Me.BindingNavigator2.DeleteItem = Me.ToolStripButton17 resources.ApplyResources(Me.BindingNavigator2, "BindingNavigator2") - Me.BindingNavigator2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton18, Me.ToolStripButton19, Me.ToolStripSeparator7, Me.ToolStripTextBox3, Me.ToolStripLabel3, Me.ToolStripSeparator8, Me.ToolStripButton20, Me.ToolStripButton21, Me.ToolStripSeparator9, Me.ToolStripButton16, Me.ToolStripButton17, Me.ToolStripButton22}) + Me.BindingNavigator2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton18, Me.ToolStripButton19, Me.ToolStripSeparator7, Me.ToolStripTextBox3, Me.ToolStripLabel3, Me.ToolStripSeparator8, Me.ToolStripButton20, Me.ToolStripButton21, Me.ToolStripSeparator9, Me.ToolStripButton16, Me.ToolStripButton17, Me.ToolStripButton22, Me.tsbtnRefreshAutomatic}) Me.BindingNavigator2.MoveFirstItem = Me.ToolStripButton18 Me.BindingNavigator2.MoveLastItem = Me.ToolStripButton21 Me.BindingNavigator2.MoveNextItem = Me.ToolStripButton20 @@ -1753,6 +1816,13 @@ Partial Class frmAdministration resources.ApplyResources(Me.ToolStripButton22, "ToolStripButton22") Me.ToolStripButton22.Name = "ToolStripButton22" ' + 'tsbtnRefreshAutomatic + ' + Me.tsbtnRefreshAutomatic.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.tsbtnRefreshAutomatic.Image = Global.Global_Indexer.My.Resources.Resources.refresh_16xLG + resources.ApplyResources(Me.tsbtnRefreshAutomatic, "tsbtnRefreshAutomatic") + Me.tsbtnRefreshAutomatic.Name = "tsbtnRefreshAutomatic" + ' 'INDEXNAME_AutoIndexTXT ' Me.INDEXNAME_AutoIndexTXT.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "INDEXNAME", True)) @@ -2229,17 +2299,63 @@ Partial Class frmAdministration Me.XtraTabPage2.Controls.Add(Me.BindingNavigator1) Me.XtraTabPage2.Name = "XtraTabPage2" ' - 'SHORTNAMETextBox + 'GridControl2 ' - Me.SHORTNAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "SHORTNAME", True)) - resources.ApplyResources(Me.SHORTNAMETextBox, "SHORTNAMETextBox") - Me.SHORTNAMETextBox.Name = "SHORTNAMETextBox" + resources.ApplyResources(Me.GridControl2, "GridControl2") + Me.GridControl2.DataSource = Me.TBDD_USERBindingSource + Me.GridControl2.MainView = Me.GridView2 + Me.GridControl2.Name = "GridControl2" + Me.GridControl2.ShowOnlyPredefinedDetails = True + Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' 'TBDD_USERBindingSource ' Me.TBDD_USERBindingSource.DataMember = "TBDD_USER" Me.TBDD_USERBindingSource.DataSource = Me.MyDataset ' + 'GridView2 + ' + Me.GridView2.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView2.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True + Me.GridView2.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView2.Appearance.FocusedRow.BackColor"), System.Drawing.Color) + Me.GridView2.Appearance.FocusedRow.Options.UseBackColor = True + Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colUSERNAME, Me.colNAME, Me.colEMAIL}) + Me.GridView2.GridControl = Me.GridControl2 + Me.GridView2.Name = "GridView2" + Me.GridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView2.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView2.OptionsBehavior.Editable = False + Me.GridView2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView2.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridView2.OptionsView.ColumnAutoWidth = False + Me.GridView2.OptionsView.EnableAppearanceEvenRow = True + Me.GridView2.OptionsView.ShowAutoFilterRow = True + Me.GridView2.OptionsView.ShowGroupPanel = False + ' + 'colUSERNAME + ' + resources.ApplyResources(Me.colUSERNAME, "colUSERNAME") + Me.colUSERNAME.FieldName = "USERNAME" + Me.colUSERNAME.Name = "colUSERNAME" + ' + 'colNAME + ' + resources.ApplyResources(Me.colNAME, "colNAME") + Me.colNAME.FieldName = "NAME" + Me.colNAME.Name = "colNAME" + ' + 'colEMAIL + ' + resources.ApplyResources(Me.colEMAIL, "colEMAIL") + Me.colEMAIL.FieldName = "EMAIL" + Me.colEMAIL.Name = "colEMAIL" + ' + 'SHORTNAMETextBox + ' + Me.SHORTNAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "SHORTNAME", True)) + resources.ApplyResources(Me.SHORTNAMETextBox, "SHORTNAMETextBox") + Me.SHORTNAMETextBox.Name = "SHORTNAMETextBox" + ' 'LANGUAGEComboBox ' Me.LANGUAGEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "LANGUAGE", True)) @@ -2980,86 +3096,6 @@ Partial Class frmAdministration ' Me.VWGI_DOCTYPE_GROUPTableAdapter.ClearBeforeFill = True ' - 'GridControl1 - ' - Me.GridControl1.DataSource = Me.TBDD_DOKUMENTARTBindingSource - resources.ApplyResources(Me.GridControl1, "GridControl1") - Me.GridControl1.MainView = Me.GridView1 - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.ShowOnlyPredefinedDetails = True - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) - ' - 'GridView1 - ' - Me.GridView1.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView1.Appearance.EvenRow.BackColor"), System.Drawing.Color) - Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True - Me.GridView1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color) - Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True - Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colBEZEICHNUNG}) - Me.GridView1.GridControl = Me.GridControl1 - Me.GridView1.Name = "GridView1" - Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] - Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] - Me.GridView1.OptionsBehavior.CopyToClipboardWithColumnHeaders = False - Me.GridView1.OptionsBehavior.Editable = False - Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridView1.OptionsView.ColumnAutoWidth = False - Me.GridView1.OptionsView.EnableAppearanceEvenRow = True - Me.GridView1.OptionsView.ShowAutoFilterRow = True - Me.GridView1.OptionsView.ShowGroupPanel = False - ' - 'colBEZEICHNUNG - ' - resources.ApplyResources(Me.colBEZEICHNUNG, "colBEZEICHNUNG") - Me.colBEZEICHNUNG.FieldName = "BEZEICHNUNG" - Me.colBEZEICHNUNG.Name = "colBEZEICHNUNG" - ' - 'GridControl2 - ' - resources.ApplyResources(Me.GridControl2, "GridControl2") - Me.GridControl2.DataSource = Me.TBDD_USERBindingSource - Me.GridControl2.MainView = Me.GridView2 - Me.GridControl2.Name = "GridControl2" - Me.GridControl2.ShowOnlyPredefinedDetails = True - Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) - ' - 'GridView2 - ' - Me.GridView2.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView2.Appearance.EvenRow.BackColor"), System.Drawing.Color) - Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True - Me.GridView2.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView2.Appearance.FocusedRow.BackColor"), System.Drawing.Color) - Me.GridView2.Appearance.FocusedRow.Options.UseBackColor = True - Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colUSERNAME, Me.colNAME, Me.colEMAIL}) - Me.GridView2.GridControl = Me.GridControl2 - Me.GridView2.Name = "GridView2" - Me.GridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] - Me.GridView2.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] - Me.GridView2.OptionsBehavior.CopyToClipboardWithColumnHeaders = False - Me.GridView2.OptionsBehavior.Editable = False - Me.GridView2.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridView2.OptionsView.ColumnAutoWidth = False - Me.GridView2.OptionsView.EnableAppearanceEvenRow = True - Me.GridView2.OptionsView.ShowAutoFilterRow = True - Me.GridView2.OptionsView.ShowGroupPanel = False - ' - 'colUSERNAME - ' - resources.ApplyResources(Me.colUSERNAME, "colUSERNAME") - Me.colUSERNAME.FieldName = "USERNAME" - Me.colUSERNAME.Name = "colUSERNAME" - ' - 'colNAME - ' - resources.ApplyResources(Me.colNAME, "colNAME") - Me.colNAME.FieldName = "NAME" - Me.colNAME.Name = "colNAME" - ' - 'colEMAIL - ' - resources.ApplyResources(Me.colEMAIL, "colEMAIL") - Me.colEMAIL.FieldName = "EMAIL" - Me.colEMAIL.Name = "colEMAIL" - ' 'frmAdministration ' resources.ApplyResources(Me, "$this") @@ -3071,9 +3107,12 @@ Partial Class frmAdministration Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabPage1.ResumeLayout(False) Me.XtraTabPage1.PerformLayout() - CType(Me.SEQUENCENumericUpDown, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupBox6.ResumeLayout(False) CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SEQUENCENumericUpDown, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl2.ResumeLayout(False) Me.XtraTabPage3.ResumeLayout(False) @@ -3114,7 +3153,9 @@ Partial Class frmAdministration Me.TBDD_DOKUMENTARTBindingNavigator.PerformLayout() Me.XtraTabPage2.ResumeLayout(False) Me.XtraTabPage2.PerformLayout() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl3.ResumeLayout(False) Me.XtraTabPage7.ResumeLayout(False) @@ -3138,10 +3179,6 @@ Partial Class frmAdministration CType(Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBGI_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_GROUPS_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -3446,4 +3483,8 @@ Partial Class frmAdministration Friend WithEvents colUSERNAME As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colNAME As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colEMAIL As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents tsbtnRefreshAutomatic As System.Windows.Forms.ToolStripButton + Friend WithEvents SAVE_VALUECheckBox As System.Windows.Forms.CheckBox + Friend WithEvents GroupBox6 As System.Windows.Forms.GroupBox + Friend WithEvents ComboBox3 As System.Windows.Forms.ComboBox End Class diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index ea44df3..fa5e2a1 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -150,7 +150,7 @@ XtraTabPage1 - 19 + 20 False @@ -180,7 +180,7 @@ XtraTabPage1 - 21 + 22 False @@ -210,7 +210,7 @@ XtraTabPage1 - 23 + 24 False @@ -240,7 +240,7 @@ XtraTabPage1 - 24 + 25 False @@ -270,7 +270,7 @@ XtraTabPage1 - 26 + 27 False @@ -300,7 +300,7 @@ XtraTabPage1 - 28 + 29 False @@ -330,7 +330,7 @@ XtraTabPage1 - 31 + 32 False @@ -363,7 +363,7 @@ XtraTabPage1 - 32 + 33 False @@ -396,7 +396,7 @@ XtraTabPage1 - 34 + 35 False @@ -429,7 +429,7 @@ XtraTabPage1 - 36 + 37 False @@ -462,7 +462,7 @@ XtraTabPage1 - 38 + 39 False @@ -495,7 +495,7 @@ XtraTabPage3 - 27 + 28 False @@ -525,7 +525,7 @@ XtraTabPage3 - 24 + 25 False @@ -555,7 +555,7 @@ XtraTabPage3 - 21 + 22 False @@ -585,7 +585,7 @@ XtraTabPage3 - 19 + 20 False @@ -615,7 +615,7 @@ XtraTabPage3 - 16 + 17 False @@ -645,7 +645,7 @@ XtraTabPage3 - 14 + 15 False @@ -678,7 +678,7 @@ XtraTabPage3 - 11 + 12 False @@ -711,7 +711,7 @@ XtraTabPage3 - 9 + 10 False @@ -744,7 +744,7 @@ XtraTabPage3 - 7 + 8 False @@ -777,7 +777,7 @@ XtraTabPage3 - 5 + 6 False @@ -2322,7 +2322,7 @@ XtraTabPage1 - 2 + 3 False @@ -2382,7 +2382,7 @@ XtraTabPage1 - 1 + 2 False @@ -2448,7 +2448,7 @@ 17, 17 - 0, 592 + 0, 624 @@ -2496,6 +2496,42 @@ True + + ComboBox3 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox6 + + + 0 + + + 972, 76 + + + 174, 100 + + + 94 + + + Datei überschreiben? + + + GroupBox6 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 0 + 244, 17 @@ -2533,13 +2569,13 @@ GridControl1 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage1 - 0 + 1 False @@ -2566,7 +2602,7 @@ XtraTabPage1 - 3 + 4 False @@ -2596,7 +2632,7 @@ XtraTabPage1 - 4 + 5 212, 340 @@ -2617,7 +2653,7 @@ XtraTabPage1 - 5 + 6 True @@ -2647,7 +2683,7 @@ XtraTabPage1 - 6 + 7 Top, Bottom, Left, Right @@ -2670,6 +2706,33 @@ True + + 17, 95 + + + 677, 87 + + + 104, 30 + + + 92 + + + speichere Input zu Profil + + + SAVE_VALUECheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 0 + True @@ -2695,16 +2758,13 @@ XtraTabPage3 - 0 + 1 - - 17, 95 - False - 677, 82 + 767, 37 180, 41 @@ -2726,7 +2786,7 @@ der Datei XtraTabPage3 - 1 + 2 Segoe UI Semibold, 9pt, style=Bold @@ -2753,7 +2813,7 @@ der Datei XtraTabPage3 - 2 + 3 False @@ -2789,7 +2849,7 @@ der Datei XtraTabPage3 - 3 + 4 True @@ -2822,7 +2882,7 @@ der Datei XtraTabPage3 - 4 + 5 Segoe UI, 9pt, style=Italic @@ -2846,7 +2906,7 @@ der Datei XtraTabPage3 - 6 + 7 Segoe UI, 9pt, style=Italic @@ -2870,7 +2930,7 @@ der Datei XtraTabPage3 - 8 + 9 Segoe UI, 9pt, style=Italic @@ -2894,7 +2954,7 @@ der Datei XtraTabPage3 - 10 + 11 Segoe UI, 9pt, style=Italic @@ -2918,7 +2978,7 @@ der Datei XtraTabPage3 - 12 + 13 False @@ -2945,7 +3005,7 @@ der Datei XtraTabPage3 - 13 + 14 False @@ -2969,7 +3029,7 @@ der Datei XtraTabPage3 - 15 + 16 False @@ -2993,7 +3053,7 @@ der Datei XtraTabPage3 - 17 + 18 False @@ -3020,7 +3080,7 @@ der Datei XtraTabPage3 - 18 + 19 False @@ -3056,7 +3116,7 @@ der Datei XtraTabPage3 - 20 + 21 False @@ -3080,7 +3140,7 @@ der Datei XtraTabPage3 - 22 + 23 False @@ -3104,7 +3164,7 @@ der Datei XtraTabPage3 - 23 + 24 False @@ -3128,7 +3188,7 @@ der Datei XtraTabPage3 - 25 + 26 275, 56 @@ -3169,27 +3229,6 @@ der Datei Die Gesamtanzahl der Elemente. - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC - DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC - rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV - i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG - 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG - QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX - bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - - - True - - - 23, 22 - - - Löschen - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -3293,6 +3332,27 @@ der Datei 6, 25 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC + rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV + i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG + 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG + QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX + bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + + + True + + + 23, 22 + + + Löschen + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -3319,7 +3379,7 @@ der Datei 0, 0 - 957, 25 + 974, 25 3 @@ -3337,7 +3397,7 @@ der Datei XtraTabPage3 - 26 + 27 Segoe UI, 9pt, style=Italic @@ -3361,10 +3421,10 @@ der Datei XtraTabPage3 - 28 + 29 - 974, 218 + 974, 250 manuelle Indexe @@ -3373,7 +3433,7 @@ der Datei XtraTabPage3 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl2 @@ -3382,7 +3442,7 @@ der Datei 0 - 980, 246 + 980, 278 86 @@ -3658,7 +3718,7 @@ der Datei 31 - 974, 257 + 974, 218 Nachbearbeitungsfunktionen manueller Index @@ -3667,7 +3727,7 @@ der Datei XtraTabPage6 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl2 @@ -3928,7 +3988,7 @@ der Datei 26 - 974, 257 + 974, 218 automatische/feste Indexe @@ -3937,7 +3997,7 @@ der Datei XtraTabPage4 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl2 @@ -3994,7 +4054,7 @@ der Datei 3 - 974, 257 + 974, 218 Zuordnung Dokumentenart-Gruppe @@ -4003,7 +4063,7 @@ der Datei XtraTabPage9 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl2 @@ -4011,81 +4071,6 @@ der Datei 3 - - FOLDER_FOR_INDEXTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 0 - - - Label25 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 1 - - - btncrFolder_delete - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 2 - - - GroupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 3 - - - Label17 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 4 - - - Segoe UI, 9pt, style=Bold - - - 3, 3 - - - 820, 228 - - - 81 - - - Create Folder for Index - GroupBox4 @@ -4108,7 +4093,7 @@ der Datei XtraTabPage10 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl2 @@ -4120,13 +4105,13 @@ der Datei XtraTabControl2 - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage1 - 7 + 8 1192, 17 @@ -4153,7 +4138,7 @@ der Datei XtraTabPage1 - 8 + 9 MiddleLeft @@ -4183,7 +4168,7 @@ der Datei XtraTabPage1 - 9 + 10 1025, 56 @@ -4207,7 +4192,7 @@ der Datei XtraTabPage1 - 10 + 11 True @@ -4234,7 +4219,7 @@ der Datei XtraTabPage1 - 11 + 12 True @@ -4261,7 +4246,7 @@ der Datei XtraTabPage1 - 12 + 13 494, 56 @@ -4285,7 +4270,7 @@ der Datei XtraTabPage1 - 13 + 14 True @@ -4318,7 +4303,7 @@ der Datei XtraTabPage1 - 14 + 15 False @@ -4342,7 +4327,7 @@ der Datei XtraTabPage1 - 15 + 16 False @@ -4369,7 +4354,7 @@ der Datei XtraTabPage1 - 16 + 17 False @@ -4396,7 +4381,7 @@ der Datei XtraTabPage1 - 17 + 18 921, 17 @@ -4614,7 +4599,7 @@ der Datei XtraTabPage1 - 18 + 19 Segoe UI, 9pt, style=Italic @@ -4638,7 +4623,7 @@ der Datei XtraTabPage1 - 20 + 21 False @@ -4662,7 +4647,7 @@ der Datei XtraTabPage1 - 22 + 23 False @@ -4686,7 +4671,7 @@ der Datei XtraTabPage1 - 25 + 26 False @@ -4710,7 +4695,7 @@ der Datei XtraTabPage1 - 27 + 28 False @@ -4734,7 +4719,7 @@ der Datei XtraTabPage1 - 29 + 30 False @@ -4761,7 +4746,7 @@ der Datei XtraTabPage1 - 30 + 31 Segoe UI, 9pt, style=Italic @@ -4785,7 +4770,7 @@ der Datei XtraTabPage1 - 33 + 34 Segoe UI, 9pt, style=Italic @@ -4809,7 +4794,7 @@ der Datei XtraTabPage1 - 35 + 36 Segoe UI, 9pt, style=Italic @@ -4833,7 +4818,7 @@ der Datei XtraTabPage1 - 37 + 38 Segoe UI, 9pt, style=Italic @@ -4857,7 +4842,7 @@ der Datei XtraTabPage1 - 39 + 40 False @@ -4881,13 +4866,13 @@ der Datei XtraTabPage1 - 40 + 41 3, 4, 3, 4 - 1255, 564 + 1255, 596 Dokumentarten @@ -4896,7 +4881,7 @@ der Datei XtraTabPage1 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -4905,7 +4890,7 @@ der Datei 0 - 1261, 592 + 1261, 624 1 @@ -4920,7 +4905,7 @@ der Datei GridControl2 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage2 @@ -4968,7 +4953,7 @@ der Datei XtraTabControl3 - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage2 @@ -5169,7 +5154,7 @@ der Datei XtraTabPage2 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -5214,7 +5199,7 @@ der Datei 2 - 1255, 603 + 1255, 564 Andere Einstellungen @@ -5223,7 +5208,7 @@ der Datei XtraTabPage5 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -5235,7 +5220,7 @@ der Datei XtraTabControl1 - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -5243,6 +5228,39 @@ der Datei 0 + + 244, 17 + + + Default + + + New version + + + Question + + + 7, 17 + + + 161, 21 + + + 0 + + + ComboBox3 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox6 + + + 0 + 134, 17 @@ -6065,18 +6083,21 @@ der Datei Dateiname (ohne Endung) - Datei Erstelldatum + Dateiendung - Datei Erstellt wer + Datei Erstelldatum - Aktuelles Datum (DD.MM.YYYY) + Datei Erstellt wer - Username + Aktuelles Datum (DD.MM.YYYY) + Username + + Usercode @@ -6676,6 +6697,15 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei Daten speichern + + Magenta + + + 23, 22 + + + Refresh + 0, 0 @@ -7009,6 +7039,93 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 506, 251 + + FOLDER_FOR_INDEXTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 0 + + + Label25 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 1 + + + btncrFolder_delete + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 2 + + + GroupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 3 + + + Label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 4 + + + Segoe UI, 9pt, style=Bold + + + 3, 3 + + + 820, 228 + + + 81 + + + Create Folder for Index + + + GroupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage10 + + + 0 + Segoe UI, 9.75pt @@ -7435,6 +7552,75 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 494, 56 + + Top, Left, Right + + + 635, 95 + + + 778, 35 + + + Cyan + + + Fuchsia + + + Username + + + True + + + 0 + + + 106 + + + Name + + + True + + + 1 + + + 100 + + + EMail + + + True + + + 2 + + + 105 + + + 333, 241 + + + 87 + + + GridControl2 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage2 + + + 0 + 562, 93 @@ -7456,9 +7642,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 2 - - 635, 95 - de-DE @@ -7583,7 +7766,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3 - 1039, 268 + 1039, 252 Gruppenzuordnung User @@ -7592,7 +7775,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPage7 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl3 @@ -7727,7 +7910,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPage8 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl3 @@ -7739,7 +7922,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabControl3 - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage2 @@ -9896,72 +10079,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 770, 251 - - Top, Left, Right - - - 778, 35 - - - Cyan - - - Fuchsia - - - Username - - - True - - - 0 - - - 106 - - - Name - - - True - - - 1 - - - 100 - - - EMail - - - True - - - 2 - - - 105 - - - 333, 241 - - - 87 - - - GridControl2 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage2 - - - 0 - True @@ -9972,7 +10089,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 7, 17 - 1261, 614 + 1261, 646 Segoe UI, 9.75pt @@ -10037,6 +10154,18 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei Global_Indexer.MyDataset, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + GridView1 + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colBEZEICHNUNG + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + TBDD_INDEX_MANBindingSource @@ -10289,6 +10418,12 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsbtnRefreshAutomatic + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TBDD_USER_GROUPSBindingSource @@ -10415,6 +10550,30 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GridView2 + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colUSERNAME + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colNAME + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colEMAIL + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + VWGI_USER_GROUPS_RELATIONBindingSource @@ -10703,42 +10862,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei Global_Indexer.MyDatasetTableAdapters.VWGI_DOCTYPE_GROUPTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - GridView1 - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colBEZEICHNUNG - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridView2 - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colUSERNAME - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colNAME - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colEMAIL - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmAdministration diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 1a2a956..696ae2a 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -111,6 +111,9 @@ ' Then use the following code to create the Dialog window ' Change the .SelectedPath property to the default location With FolderBrowserDialog1 + If ZIEL_PFADTextBox.Text <> "" Then + .SelectedPath = ZIEL_PFADTextBox.Text + End If ' Desktop is the root folder in the dialog. '.RootFolder = Environment.SpecialFolder.Desktop ' Prompt the user with a custom message. @@ -175,7 +178,7 @@ lblSaveDokart.Visible = False If DOKART_GUIDTextBox.Text <> String.Empty Then CURRENT_DOKART_ID = DOKART_GUIDTextBox.Text - Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) + Load_TabData() End If End Sub @@ -269,10 +272,12 @@ Else btnSQLView.Visible = False End If + Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) End If frmloaded = True tscmbUser.SelectedIndex = 0 TBDD_INDEX_MANBindingNav.Visible = True + TBDD_INDEX_MANBindingNav.Visible = True End Sub Private Sub btndeleteZuordnung_Click(sender As Object, e As EventArgs) Handles btndeleteZuordnung.Click @@ -859,29 +864,18 @@ result = MessageBox.Show("Sind Sie sicher dass Sie diese Dokumentart löschen wollen?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then Try - Dim del As String = "DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID IN (SELECT GUID FROM TBDD_INDEX_MAN WHERE DOK_ID = " & DOKART_GUIDTextBox.Text & ")" + Dim del As String = " EXEC PRDD_GLOBIX_DELETE_DOCTYPE " & DOKART_GUIDTextBox.Text If ClassDatabase.Execute_non_Query(del, True) = True Then - del = "DELETE FROM TBDD_INDEX_MAN WHERE DOK_ID = " & DOKART_GUIDTextBox.Text - If ClassDatabase.Execute_non_Query(del, True) = True Then - del = "DELETE FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = " & DOKART_GUIDTextBox.Text - If ClassDatabase.Execute_non_Query(del, True) = True Then - del = "DELETE FROM TBDD_USRGRP_DOKTYPE WHERE DOCTYPE_ID = " & DOKART_GUIDTextBox.Text - If ClassDatabase.Execute_non_Query(del, True) = True Then - del = "DELETE FROM TBDD_DOKUMENTART_MODULE WHERE DOKART_ID = " & DOKART_GUIDTextBox.Text - If ClassDatabase.Execute_non_Query(del, True) = True Then - del = "DELETE FROM TBDD_DOKUMENTART WHERE GUID = " & DOKART_GUIDTextBox.Text - If ClassDatabase.Execute_non_Query(del, True) = True Then - ' Load_Dokart("Global-Indexer Dokarten") - MsgBox("Die Dokumentart wurde erfolgreich gelöscht!", MsgBoxStyle.Information) - End If - End If - End If - End If + Dim str = "Global-Indexer Dokarten" + If ToolStripComboBox1.Text <> "" Then + str = ToolStripComboBox1.Text End If + Load_Dokart(str) + MsgBox("Die Dokumentart wurde erfolgreich gelöscht!", MsgBoxStyle.Information) End If Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Delete DocType: ") - End Try + MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Delete DocType: ") + End Try End If End Sub @@ -1009,6 +1003,8 @@ value = "$filename_ext" Case "Dateiname (ohne Endung)".ToUpper value = "$filename" + Case "Dateiendung".ToUpper + value = "$extension" Case "Datei Erstelldatum".ToUpper value = "$FileCreateDate" Case "Datei Erstellt wer".ToUpper @@ -1041,4 +1037,44 @@ Private Sub FOLDER_FOR_INDEXTextBox_TextChanged(sender As Object, e As EventArgs) Handles FOLDER_FOR_INDEXTextBox.TextChanged End Sub + + Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click + If GUIDTextBox1.Text <> "" Then + Try + Dim del = "DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & GUIDTextBox1.Text + If ClassDatabase.Execute_non_Query(del) = True Then + del = "DELETE FROM TBDD_INDEX_MAN WHERE GUID = " & GUIDTextBox1.Text + If ClassDatabase.Execute_non_Query(del) = True Then + Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) + End If + End If + Catch ex As Exception + MsgBox("Unexpected Error in deleting manual index: " & ex.Message, MsgBoxStyle.Critical) + End Try + End If + End Sub + + Private Sub ToolStripButton9_Click(sender As Object, e As EventArgs) Handles ToolStripButton9.Click + Dim result As MsgBoxResult + result = MessageBox.Show("Sind Sie sicher dass Sie diesen User löschen wollen?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.Yes Then + Try + Dim del As String = " EXEC PRDD_GLOBIX_DELETE_USER " & USER_GUIDTextBox.Text + If ClassDatabase.Execute_non_Query(del, True) = True Then + If tscmbUser.SelectedIndex = 1 Then + Refresh_User(True) + + Else + Refresh_User(False) + End If + End If + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Delete User: ") + End Try + End If + End Sub + + Private Sub tsbtnRefreshAutomatic_Click(sender As Object, e As EventArgs) Handles tsbtnRefreshAutomatic.Click + Load_INDEXE_AUTO(Me.DOKART_GUIDTextBox.Text) + End Sub End Class \ No newline at end of file diff --git a/Global_Indexer/frmConfig_Basic.designer.vb b/Global_Indexer/frmConfig_Basic.designer.vb index 2559a53..b4dcb8a 100644 --- a/Global_Indexer/frmConfig_Basic.designer.vb +++ b/Global_Indexer/frmConfig_Basic.designer.vb @@ -22,8 +22,8 @@ Partial Class frmConfig_Basic 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic)) - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.chkbxUserAut = New System.Windows.Forms.CheckBox() @@ -42,7 +42,6 @@ Partial Class frmConfig_Basic Me.Button3 = New System.Windows.Forms.Button() Me.cmbLanguage = New System.Windows.Forms.ComboBox() Me.Label9 = New System.Windows.Forms.Label() - Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() Me.CheckBox3 = New System.Windows.Forms.CheckBox() Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.chkLogErrorsOnly = New System.Windows.Forms.CheckBox() @@ -67,6 +66,7 @@ Partial Class frmConfig_Basic Me.btnstartstop2 = New System.Windows.Forms.Button() Me.btnstartstop1 = New System.Windows.Forms.Button() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() + Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() @@ -173,10 +173,10 @@ Partial Class frmConfig_Basic ' 'TabPage2 ' + Me.TabPage2.Controls.Add(Me.LinkLabel1) Me.TabPage2.Controls.Add(Me.Button3) Me.TabPage2.Controls.Add(Me.cmbLanguage) Me.TabPage2.Controls.Add(Me.Label9) - Me.TabPage2.Controls.Add(Me.LinkLabel1) Me.TabPage2.Controls.Add(Me.CheckBox3) Me.TabPage2.Controls.Add(Me.CheckBox2) Me.TabPage2.Controls.Add(Me.chkLogErrorsOnly) @@ -208,12 +208,6 @@ Partial Class frmConfig_Basic resources.ApplyResources(Me.Label9, "Label9") Me.Label9.Name = "Label9" ' - 'LinkLabel1 - ' - resources.ApplyResources(Me.LinkLabel1, "LinkLabel1") - Me.LinkLabel1.Name = "LinkLabel1" - Me.LinkLabel1.TabStop = True - ' 'CheckBox3 ' resources.ApplyResources(Me.CheckBox3, "CheckBox3") @@ -300,8 +294,8 @@ Partial Class frmConfig_Basic ' 'DataGridView1 ' - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 resources.ApplyResources(Me.DataGridView1, "DataGridView1") Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView1.Name = "DataGridView1" @@ -377,6 +371,12 @@ Partial Class frmConfig_Basic ' Me.OpenFileDialog1.FileName = "OpenFileDialog1" ' + 'LinkLabel1 + ' + resources.ApplyResources(Me.LinkLabel1, "LinkLabel1") + Me.LinkLabel1.Name = "LinkLabel1" + Me.LinkLabel1.TabStop = True + ' 'frmConfig_Basic ' resources.ApplyResources(Me, "$this") @@ -434,9 +434,9 @@ Partial Class frmConfig_Basic Friend WithEvents DataGridView1 As System.Windows.Forms.DataGridView Friend WithEvents btnSaveExclusionFiles As System.Windows.Forms.Button Friend WithEvents Label8 As System.Windows.Forms.Label - Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel Friend WithEvents btnLogMail As System.Windows.Forms.Button Friend WithEvents cmbLanguage As System.Windows.Forms.ComboBox Friend WithEvents Label9 As System.Windows.Forms.Label Friend WithEvents Button3 As System.Windows.Forms.Button + Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel End Class diff --git a/Global_Indexer/frmConfig_Basic.en-US.resx b/Global_Indexer/frmConfig_Basic.en-US.resx new file mode 100644 index 0000000..3e10ce6 --- /dev/null +++ b/Global_Indexer/frmConfig_Basic.en-US.resx @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 582, 280 + + + 582, 280 + + + + AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAFKcAABKjAAIo/8AAYHTAA2o/wApsP8AADlzAAeY8QAEbrkAWML/AFTA/wAfmeYAFH3FAGfI + /wCH0/8ASr3/ADm2/wAAXbwAAITeAACM+AAAYsMAFHS1AACO/wAqrf0AAE6UAABCewAAYLIAAEOZAAA5 + awAInPYAADNzAABwzgCB0f8AAFKMAAN7zgC25P8Ae8//ACWHxQAAbcYASLz/AP///wA4nNoAH5LaAACI + 7wAAi/wATrr+AJPX/wB9z/8AUL//AAA6jgAAWrUAAHnzAABu3QAcgM0AhNL/AGfH/wAln/AAJaT9ADOu + /gBEuf4AAH/5ABKJ6wAAdNoAAIT/ABJ+yQAARo4AAFW+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAACBwcHBwAHBwAAAAAAAAAAAkAtQUIHPUMHAAAAAAECAAI6Ozw9IDs+PwcAAAE0NQI2 + LyQvNzc4MTkHAAEsLS4OES8wDg4xMTEyMwABJygpJA4qHR0dHSsGBgYHAAEBJCUmHQAAABodBgYGBwAB + ICEKIgAAABocHQYGIwcBFxgKEBkCAhobHB0GHh8AAQ4PEBEBEhMUFQIWAwMDBwEKCwYGDAEBAgINAwMD + BAcAAQEBBgYGBgYDAwgJAwcAAAAAAQYGAwMDAwMCBwcAAAAAAAEDAwMBBAMFAgAAAAAAAAAAAQEBAAEB + AgAAAAAAAAAAAAAAAAAAAAAAAAAAAPgnAAD4AwAAyAEAAIABAAAAAQAAAAAAAIHAAACDgAAAAAEAAAAA + AAAAAAAAgAEAAOADAADgDwAA8R8AAP//AAA= + + + \ No newline at end of file diff --git a/Global_Indexer/frmConfig_Basic.resx b/Global_Indexer/frmConfig_Basic.resx index 7959145..b891bb9 100644 --- a/Global_Indexer/frmConfig_Basic.resx +++ b/Global_Indexer/frmConfig_Basic.resx @@ -117,11 +117,769 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + chkbxUserAut + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 1 + + + cmbDatenbank + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 2 + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 3 + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 4 + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 5 + + + Label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 6 + + + txtActualConnection + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 7 + + + txtServer + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 8 + + + txtUser + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 9 + + + txtPasswort + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 10 + + + BtnConnect + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 11 + + + + 4, 22 + + + + 3, 3, 3, 3 + + + 582, 280 + + + 0 + + + Datenbank-Verbindung + + + TabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 0 + + + Bottom, Right + + + True + + + 224, 223 + + + 153, 13 + + + 45 + + + Support Portal - Digital Data + + + LinkLabel1 + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 0 + + + 197, 140 + + + 134, 23 + + + 44 + + + Sprache jetzt wechseln + + + Button3 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 1 + + + German + + + English + + + 11, 142 + + + 180, 21 + + + 43 + + + cmbLanguage + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 2 + + + True + + + 8, 126 + + + 96, 13 + + + 42 + + + Aktuelle Sprache: + + + Label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 3 + + + True + + + 11, 56 + + + 249, 17 + + + 7 + + + Dokumente bei Indexierung nicht anzeigen + + + CheckBox3 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 4 + + + True + + + 242, 89 + + + 230, 30 + + + 6 + + + Meldungsfenster für erfolgreiche +Übertragung nach windream anzeigen? + + + CheckBox2 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 5 + + + True + + + 11, 96 + + + 146, 17 + + + 3 + + + LogErrorsOnly (Ja/Nein) + + + chkLogErrorsOnly + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 6 + + + 478, 26 + + + 30, 23 + + + 2 + + + ... + + + btnaddUniversalViewer + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 7 + + + 11, 28 + + + 461, 22 + + + 1 + + + txtuniversalViewer + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 8 + + + True + + + 8, 12 + + + 95, 13 + + + 0 + + + Universal Viewer: + + + lblUniversalViewer + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 9 + + + MiddleLeft + + + 11, 216 + + + 180, 26 + + + 41 + + + Log/Support Mail erzeugen + + + MiddleRight + + + btnLogMail + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 10 + + + MiddleLeft + + + 11, 185 + + + 180, 23 + + + 5 + + + Öffne AppFolder User + + + MiddleRight + + + btnApplicationFolder + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 11 + + + MiddleLeft + + + 197, 185 + + + 180, 23 + + + 4 + + + Öffne Log-Verzeichnis + + + MiddleRight + + + btnopenlog + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 12 + + + 4, 22 + + + 3, 3, 3, 3 + + + 582, 280 + + + 1 + + + Diverse Einstellungen + + + TabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 1 + + + Label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 0 + + + DataGridView1 + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 1 + + + Button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 2 + + + txtScanFolderWatch + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 3 + + + Label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 4 + + + btnsetFW_Folder + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 5 + + + btnFW_OwnFiles + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 6 + + + btnFW_Desktop + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 7 + + + txtFolderWatch + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 8 + + + Label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 9 + + + btnSaveExclusionFiles + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 10 + + + btnstartstop2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 11 + + + btnstartstop1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 12 + + + 4, 22 + + + 3, 3, 3, 3 + + + 582, 280 + + + 2 + + + Überwachte Ordner - Folderwatch + + + TabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 2 + + + Fill + + + 0, 0 + + + 590, 306 + + + 0 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True - 255, 58 @@ -302,7 +1060,6 @@ 6 - Top, Left, Right @@ -420,409 +1177,6 @@ 11 - - 4, 22 - - - 3, 3, 3, 3 - - - 557, 332 - - - 0 - - - Datenbank-Verbindung - - - TabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 0 - - - 197, 140 - - - 134, 23 - - - 44 - - - Sprache jetzt wechseln - - - Button3 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 0 - - - German - - - English - - - 11, 142 - - - 180, 21 - - - 43 - - - cmbLanguage - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 1 - - - True - - - 8, 126 - - - 96, 13 - - - 42 - - - Aktuelle Sprache: - - - Label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 2 - - - True - - - 10, 243 - - - 147, 13 - - - 40 - - - Support-Portal Digital Data - - - LinkLabel1 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 3 - - - True - - - 11, 56 - - - 249, 17 - - - 7 - - - Dokumente bei Indexierung nicht anzeigen - - - CheckBox3 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 4 - - - True - - - 242, 89 - - - 230, 30 - - - 6 - - - Meldungsfenster für erfolgreiche -Übertragung nach windream anzeigen? - - - CheckBox2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 5 - - - True - - - 11, 96 - - - 146, 17 - - - 3 - - - LogErrorsOnly (Ja/Nein) - - - chkLogErrorsOnly - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 6 - - - 478, 26 - - - 30, 23 - - - 2 - - - ... - - - btnaddUniversalViewer - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 7 - - - 11, 28 - - - 461, 22 - - - 1 - - - txtuniversalViewer - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 8 - - - True - - - 8, 12 - - - 95, 13 - - - 0 - - - Universal Viewer: - - - lblUniversalViewer - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 9 - - - MiddleLeft - - - 11, 214 - - - 180, 26 - - - 41 - - - Log/Support Mail erzeugen - - - MiddleRight - - - btnLogMail - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 10 - - - MiddleLeft - - - 11, 185 - - - 180, 23 - - - 5 - - - Öffne AppFolder User - - - MiddleRight - - - btnApplicationFolder - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 11 - - - MiddleLeft - - - 197, 185 - - - 180, 23 - - - 4 - - - Öffne Log-Verzeichnis - - - MiddleRight - - - btnopenlog - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 12 - - - 4, 22 - - - 3, 3, 3, 3 - - - 557, 332 - - - 1 - - - Diverse Einstellungen - - - TabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 1 - True @@ -1163,57 +1517,6 @@ ausgenommen werden sollen: 12 - - 4, 22 - - - 3, 3, 3, 3 - - - 557, 332 - - - 2 - - - Überwachte Ordner - Folderwatch - - - TabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 2 - - - Fill - - - 0, 0 - - - 565, 358 - - - 0 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - 17, 17 @@ -1224,7 +1527,7 @@ ausgenommen werden sollen: 6, 13 - 565, 358 + 590, 306 Segoe UI, 8.25pt diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index cd36ed9..e4f1e95 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/Global_Indexer/frmConfig_Basic.vb @@ -133,6 +133,14 @@ Public Class frmConfig_Basic Try With OpenFileDialog1 ' Do + If txtuniversalViewer.Text <> "" Then + Try + OpenFileDialog1.InitialDirectory = Path.GetDirectoryName(txtuniversalViewer.Text) + Catch ex As Exception + + End Try + + End If .Filter = "Viewer.Exe|*.exe" .FilterIndex = 1 .Title = "Pfad zu Universal Viewer.exe:" @@ -343,6 +351,9 @@ Public Class frmConfig_Basic Private Sub btnsetFW_Folder_Click(sender As Object, e As EventArgs) Handles btnsetFW_Folder.Click Dim fbdialog As New FolderBrowserDialog + If txtFolderWatch.Text <> "" Then + fbdialog.SelectedPath = txtFolderWatch.Text + End If If fbdialog.ShowDialog() = DialogResult.OK Then CheckFolder(fbdialog.SelectedPath, "DEFAULT") End If @@ -415,6 +426,9 @@ Public Class frmConfig_Basic Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Dim fbdialog As New FolderBrowserDialog + If txtScanFolderWatch.Text <> "" Then + fbdialog.SelectedPath = txtScanFolderWatch.Text + End If If fbdialog.ShowDialog() = DialogResult.OK Then CheckFolder(fbdialog.SelectedPath, "SCAN") End If @@ -494,14 +508,6 @@ Public Class frmConfig_Basic End If End Sub - - Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked - ' Specify that the link was visited. - Me.LinkLabel1.LinkVisited = True - ' Navigate to a URL. - System.Diagnostics.Process.Start("http://www.didalog.de/Support") - End Sub - Private Sub chkbxUserAut_CheckedChanged(sender As Object, e As EventArgs) Handles chkbxUserAut.CheckedChanged If chkbxUserAut.Checked Then Me.txtPasswort.Enabled = False @@ -511,4 +517,11 @@ Public Class frmConfig_Basic Me.txtUser.Enabled = True End If End Sub + + Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked + ' Specify that the link was visited. + Me.LinkLabel1.LinkVisited = True + ' Navigate to a URL. + System.Diagnostics.Process.Start("http://www.didalog.de/Support") + End Sub End Class \ No newline at end of file diff --git a/Global_Indexer/frmHistory.resx b/Global_Indexer/frmHistory.resx index c9f4e14..42fb331 100644 --- a/Global_Indexer/frmHistory.resx +++ b/Global_Indexer/frmHistory.resx @@ -362,7 +362,7 @@ GridControl1 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -485,31 +485,31 @@ GridView1 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colGUID - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colFILENAME_ORIGINAL - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colFILENAME_NEW - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colADDED_WHEN - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a frmHistory diff --git a/Global_Indexer/frmHotKey_Add.Designer.vb b/Global_Indexer/frmHotKey_Add.Designer.vb index 8114e4c..575c94d 100644 --- a/Global_Indexer/frmHotKey_Add.Designer.vb +++ b/Global_Indexer/frmHotKey_Add.Designer.vb @@ -104,6 +104,10 @@ Partial Class frmHotKey_Add Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog() Me.TabControlMain = New System.Windows.Forms.TabControl() Me.TabPageUebersicht = New System.Windows.Forms.TabPage() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colString = New DevExpress.XtraGrid.Columns.GridColumn() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.GroupBoxPatterns = New System.Windows.Forms.GroupBox() Me.ListBox1 = New System.Windows.Forms.ListBox() @@ -206,9 +210,18 @@ Partial Class frmHotKey_Add Me.btndeleteUserProfile = New System.Windows.Forms.Button() Me.chklbUserProfile = New System.Windows.Forms.CheckedListBox() Me.btndelete = New System.Windows.Forms.Button() - Me.ListBox_Profiles = New System.Windows.Forms.ListBox() Me.Label9 = New System.Windows.Forms.Label() Me.TabPage_Designer = New System.Windows.Forms.TabPage() + Me.TabControl2 = New System.Windows.Forms.TabControl() + Me.TabPage7 = New System.Windows.Forms.TabPage() + Me.TabPage8 = New System.Windows.Forms.TabPage() + Me.Label20 = New System.Windows.Forms.Label() + Me.lblLinkCopyPaste = New System.Windows.Forms.Label() + Me.btnAddCopypasteConfig = New System.Windows.Forms.Button() + Me.txtcopypastePatter = New System.Windows.Forms.TextBox() + Me.Label19 = New System.Windows.Forms.Label() + Me.Label18 = New System.Windows.Forms.Label() + Me.cmbCopyPasteFunction = New System.Windows.Forms.ComboBox() Me.TabPageTest = New System.Windows.Forms.TabPage() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.chkboxshowfilledControlsOnly_Test = New System.Windows.Forms.CheckBox() @@ -226,16 +239,6 @@ Partial Class frmHotKey_Add Me.TBHOTKEY_PATTERNS_REWORKTableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBHOTKEY_PATTERNS_REWORKTableAdapter() Me.TBHOTKEY_WINDOW_HOOKTableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBHOTKEY_WINDOW_HOOKTableAdapter() Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components) - Me.TabControl2 = New System.Windows.Forms.TabControl() - Me.TabPage7 = New System.Windows.Forms.TabPage() - Me.TabPage8 = New System.Windows.Forms.TabPage() - Me.cmbCopyPasteFunction = New System.Windows.Forms.ComboBox() - Me.Label18 = New System.Windows.Forms.Label() - Me.Label19 = New System.Windows.Forms.Label() - Me.txtcopypastePatter = New System.Windows.Forms.TextBox() - Me.btnAddCopypasteConfig = New System.Windows.Forms.Button() - Me.lblLinkCopyPaste = New System.Windows.Forms.Label() - Me.Label20 = New System.Windows.Forms.Label() GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() WD_SEARCHLabel = New System.Windows.Forms.Label() @@ -274,6 +277,8 @@ Partial Class frmHotKey_Add CType(Me.TBHOTKEY_PATTERNSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabControlMain.SuspendLayout() Me.TabPageUebersicht.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBoxPatterns.SuspendLayout() CType(Me.TBHOTKEY_WINDOW_HOOKBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabControlDetails.SuspendLayout() @@ -293,14 +298,14 @@ Partial Class frmHotKey_Add Me.ContextMenuStrip1.SuspendLayout() Me.TabPage2.SuspendLayout() Me.TabPage_Designer.SuspendLayout() + Me.TabControl2.SuspendLayout() + Me.TabPage7.SuspendLayout() + Me.TabPage8.SuspendLayout() Me.TabPageTest.SuspendLayout() Me.GroupBox3.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBHOTKEY_USER_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - Me.TabControl2.SuspendLayout() - Me.TabPage7.SuspendLayout() - Me.TabPage8.SuspendLayout() Me.SuspendLayout() ' 'GUIDLabel @@ -790,15 +795,59 @@ Partial Class frmHotKey_Add 'TabPageUebersicht ' resources.ApplyResources(Me.TabPageUebersicht, "TabPageUebersicht") + Me.TabPageUebersicht.Controls.Add(Me.GridControl1) Me.TabPageUebersicht.Controls.Add(Me.ToolStrip1) Me.TabPageUebersicht.Controls.Add(Me.GroupBoxPatterns) Me.TabPageUebersicht.Controls.Add(Me.TabControl1) Me.TabPageUebersicht.Controls.Add(Me.btndelete) - Me.TabPageUebersicht.Controls.Add(Me.ListBox_Profiles) Me.TabPageUebersicht.Controls.Add(Me.Label9) Me.TabPageUebersicht.Name = "TabPageUebersicht" Me.TabPageUebersicht.UseVisualStyleBackColor = True ' + 'GridControl1 + ' + Me.GridControl1.DataSource = Me.TBHOTKEY_PROFILEBindingSource + resources.ApplyResources(Me.GridControl1, "GridControl1") + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView1.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colString}) + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsBehavior.Editable = False + Me.GridView1.OptionsBehavior.ReadOnly = True + Me.GridView1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridView1.OptionsSelection.EnableAppearanceFocusedRow = False + Me.GridView1.OptionsSelection.EnableAppearanceHideSelection = False + Me.GridView1.OptionsSelection.MultiSelect = True + Me.GridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect + Me.GridView1.OptionsView.ColumnAutoWidth = False + Me.GridView1.OptionsView.EnableAppearanceEvenRow = True + Me.GridView1.OptionsView.ShowAutoFilterRow = True + Me.GridView1.OptionsView.ShowDetailButtons = False + Me.GridView1.OptionsView.ShowGroupPanel = False + Me.GridView1.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True] + ' + 'colGUID + ' + resources.ApplyResources(Me.colGUID, "colGUID") + Me.colGUID.FieldName = "GUID" + Me.colGUID.Name = "colGUID" + ' + 'colString + ' + resources.ApplyResources(Me.colString, "colString") + Me.colString.FieldName = "String" + Me.colString.Name = "colString" + ' 'ToolStrip1 ' resources.ApplyResources(Me.ToolStrip1, "ToolStrip1") @@ -1548,16 +1597,6 @@ Partial Class frmHotKey_Add Me.btndelete.Name = "btndelete" Me.btndelete.UseVisualStyleBackColor = True ' - 'ListBox_Profiles - ' - resources.ApplyResources(Me.ListBox_Profiles, "ListBox_Profiles") - Me.ListBox_Profiles.BackColor = System.Drawing.SystemColors.ControlLight - Me.ListBox_Profiles.DataSource = Me.TBHOTKEY_PROFILEBindingSource - Me.ListBox_Profiles.DisplayMember = "String" - Me.ListBox_Profiles.FormattingEnabled = True - Me.ListBox_Profiles.Name = "ListBox_Profiles" - Me.ListBox_Profiles.ValueMember = "GUID" - ' 'Label9 ' resources.ApplyResources(Me.Label9, "Label9") @@ -1572,6 +1611,75 @@ Partial Class frmHotKey_Add Me.TabPage_Designer.Name = "TabPage_Designer" Me.TabPage_Designer.UseVisualStyleBackColor = True ' + 'TabControl2 + ' + resources.ApplyResources(Me.TabControl2, "TabControl2") + Me.TabControl2.Controls.Add(Me.TabPage7) + Me.TabControl2.Controls.Add(Me.TabPage8) + Me.TabControl2.Name = "TabControl2" + Me.TabControl2.SelectedIndex = 0 + ' + 'TabPage7 + ' + Me.TabPage7.Controls.Add(Me.GroupBox2_Controls) + resources.ApplyResources(Me.TabPage7, "TabPage7") + Me.TabPage7.Name = "TabPage7" + Me.TabPage7.UseVisualStyleBackColor = True + ' + 'TabPage8 + ' + Me.TabPage8.Controls.Add(Me.Label20) + Me.TabPage8.Controls.Add(Me.lblLinkCopyPaste) + Me.TabPage8.Controls.Add(Me.btnAddCopypasteConfig) + Me.TabPage8.Controls.Add(Me.txtcopypastePatter) + Me.TabPage8.Controls.Add(Me.Label19) + Me.TabPage8.Controls.Add(Me.Label18) + Me.TabPage8.Controls.Add(Me.cmbCopyPasteFunction) + resources.ApplyResources(Me.TabPage8, "TabPage8") + Me.TabPage8.Name = "TabPage8" + Me.TabPage8.UseVisualStyleBackColor = True + ' + 'Label20 + ' + resources.ApplyResources(Me.Label20, "Label20") + Me.Label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Label20.Name = "Label20" + ' + 'lblLinkCopyPaste + ' + resources.ApplyResources(Me.lblLinkCopyPaste, "lblLinkCopyPaste") + Me.lblLinkCopyPaste.BackColor = System.Drawing.Color.Yellow + Me.lblLinkCopyPaste.Name = "lblLinkCopyPaste" + ' + 'btnAddCopypasteConfig + ' + resources.ApplyResources(Me.btnAddCopypasteConfig, "btnAddCopypasteConfig") + Me.btnAddCopypasteConfig.Image = Global.Global_Indexer.My.Resources.Resources.add + Me.btnAddCopypasteConfig.Name = "btnAddCopypasteConfig" + Me.btnAddCopypasteConfig.UseVisualStyleBackColor = True + ' + 'txtcopypastePatter + ' + resources.ApplyResources(Me.txtcopypastePatter, "txtcopypastePatter") + Me.txtcopypastePatter.Name = "txtcopypastePatter" + ' + 'Label19 + ' + resources.ApplyResources(Me.Label19, "Label19") + Me.Label19.Name = "Label19" + ' + 'Label18 + ' + resources.ApplyResources(Me.Label18, "Label18") + Me.Label18.Name = "Label18" + ' + 'cmbCopyPasteFunction + ' + Me.cmbCopyPasteFunction.FormattingEnabled = True + Me.cmbCopyPasteFunction.Items.AddRange(New Object() {resources.GetString("cmbCopyPasteFunction.Items"), resources.GetString("cmbCopyPasteFunction.Items1")}) + resources.ApplyResources(Me.cmbCopyPasteFunction, "cmbCopyPasteFunction") + Me.cmbCopyPasteFunction.Name = "cmbCopyPasteFunction" + ' 'TabPageTest ' Me.TabPageTest.Controls.Add(Me.GroupBox3) @@ -1663,75 +1771,6 @@ Partial Class frmHotKey_Add ' Me.TBHOTKEY_WINDOW_HOOKTableAdapter.ClearBeforeFill = True ' - 'TabControl2 - ' - resources.ApplyResources(Me.TabControl2, "TabControl2") - Me.TabControl2.Controls.Add(Me.TabPage7) - Me.TabControl2.Controls.Add(Me.TabPage8) - Me.TabControl2.Name = "TabControl2" - Me.TabControl2.SelectedIndex = 0 - ' - 'TabPage7 - ' - Me.TabPage7.Controls.Add(Me.GroupBox2_Controls) - resources.ApplyResources(Me.TabPage7, "TabPage7") - Me.TabPage7.Name = "TabPage7" - Me.TabPage7.UseVisualStyleBackColor = True - ' - 'TabPage8 - ' - Me.TabPage8.Controls.Add(Me.Label20) - Me.TabPage8.Controls.Add(Me.lblLinkCopyPaste) - Me.TabPage8.Controls.Add(Me.btnAddCopypasteConfig) - Me.TabPage8.Controls.Add(Me.txtcopypastePatter) - Me.TabPage8.Controls.Add(Me.Label19) - Me.TabPage8.Controls.Add(Me.Label18) - Me.TabPage8.Controls.Add(Me.cmbCopyPasteFunction) - resources.ApplyResources(Me.TabPage8, "TabPage8") - Me.TabPage8.Name = "TabPage8" - Me.TabPage8.UseVisualStyleBackColor = True - ' - 'cmbCopyPasteFunction - ' - Me.cmbCopyPasteFunction.FormattingEnabled = True - Me.cmbCopyPasteFunction.Items.AddRange(New Object() {resources.GetString("cmbCopyPasteFunction.Items"), resources.GetString("cmbCopyPasteFunction.Items1")}) - resources.ApplyResources(Me.cmbCopyPasteFunction, "cmbCopyPasteFunction") - Me.cmbCopyPasteFunction.Name = "cmbCopyPasteFunction" - ' - 'Label18 - ' - resources.ApplyResources(Me.Label18, "Label18") - Me.Label18.Name = "Label18" - ' - 'Label19 - ' - resources.ApplyResources(Me.Label19, "Label19") - Me.Label19.Name = "Label19" - ' - 'txtcopypastePatter - ' - resources.ApplyResources(Me.txtcopypastePatter, "txtcopypastePatter") - Me.txtcopypastePatter.Name = "txtcopypastePatter" - ' - 'btnAddCopypasteConfig - ' - resources.ApplyResources(Me.btnAddCopypasteConfig, "btnAddCopypasteConfig") - Me.btnAddCopypasteConfig.Image = Global.Global_Indexer.My.Resources.Resources.add - Me.btnAddCopypasteConfig.Name = "btnAddCopypasteConfig" - Me.btnAddCopypasteConfig.UseVisualStyleBackColor = True - ' - 'lblLinkCopyPaste - ' - resources.ApplyResources(Me.lblLinkCopyPaste, "lblLinkCopyPaste") - Me.lblLinkCopyPaste.BackColor = System.Drawing.Color.Yellow - Me.lblLinkCopyPaste.Name = "lblLinkCopyPaste" - ' - 'Label20 - ' - resources.ApplyResources(Me.Label20, "Label20") - Me.Label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Label20.Name = "Label20" - ' 'frmHotKey_Add ' resources.ApplyResources(Me, "$this") @@ -1753,6 +1792,8 @@ Partial Class frmHotKey_Add Me.TabControlMain.ResumeLayout(False) Me.TabPageUebersicht.ResumeLayout(False) Me.TabPageUebersicht.PerformLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBoxPatterns.ResumeLayout(False) Me.GroupBoxPatterns.PerformLayout() CType(Me.TBHOTKEY_WINDOW_HOOKBindingSource, System.ComponentModel.ISupportInitialize).EndInit() @@ -1780,16 +1821,16 @@ Partial Class frmHotKey_Add Me.ContextMenuStrip1.ResumeLayout(False) Me.TabPage2.ResumeLayout(False) Me.TabPage_Designer.ResumeLayout(False) + Me.TabControl2.ResumeLayout(False) + Me.TabPage7.ResumeLayout(False) + Me.TabPage8.ResumeLayout(False) + Me.TabPage8.PerformLayout() Me.TabPageTest.ResumeLayout(False) Me.GroupBox3.ResumeLayout(False) Me.GroupBox3.PerformLayout() Me.GroupBox2.ResumeLayout(False) CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBHOTKEY_USER_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - Me.TabControl2.ResumeLayout(False) - Me.TabPage7.ResumeLayout(False) - Me.TabPage8.ResumeLayout(False) - Me.TabPage8.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -1835,7 +1876,6 @@ Partial Class frmHotKey_Add Friend WithEvents ListBox_MainWindows_Test As System.Windows.Forms.ListBox Friend WithEvents TabPageUebersicht As System.Windows.Forms.TabPage Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox - Friend WithEvents ListBox_Profiles As System.Windows.Forms.ListBox Friend WithEvents Label9 As System.Windows.Forms.Label Friend WithEvents btndelete As System.Windows.Forms.Button Friend WithEvents btnUserAdd_Profile As System.Windows.Forms.Button @@ -1977,4 +2017,8 @@ Partial Class frmHotKey_Add Friend WithEvents cmbCopyPasteFunction As System.Windows.Forms.ComboBox Friend WithEvents lblLinkCopyPaste As System.Windows.Forms.Label Friend WithEvents Label20 As System.Windows.Forms.Label + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents colGUID As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colString As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/Global_Indexer/frmHotKey_Add.resx b/Global_Indexer/frmHotKey_Add.resx index 0956c2e..892ed72 100644 --- a/Global_Indexer/frmHotKey_Add.resx +++ b/Global_Indexer/frmHotKey_Add.resx @@ -1031,18 +1031,6 @@ 17, 17 - - 97, 17 - - - Windowname - - - 74, 17 - - - Sequence - 0, 613 @@ -1067,6 +1055,18 @@ 2 + + 97, 17 + + + Windowname + + + 74, 17 + + + Sequence + Segoe UI, 9pt, style=Italic @@ -1094,6 +1094,60 @@ 2 + + chkboxshowfilledControlsOnly + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxMainWindow + + + 0 + + + btnpnlStart_weiter + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxMainWindow + + + 1 + + + Segoe UI, 8.25pt, style=Bold + + + 403, 6 + + + 558, 274 + + + 15 + + + Schritt 2 - Wählen Sie das 'MainWindow' zur Auswahl der Inhalte + + + False + + + GroupBoxMainWindow + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage_Designer + + + 2 + Bottom, Left @@ -1161,35 +1215,227 @@ 1 - - Segoe UI, 8.25pt, style=Bold + + lblMatchadd - - 403, 6 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 558, 274 + + GroupBox2_Controls - + + 0 + + + btnadd_WindowMatch + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 1 + + + txtValueMatch + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 2 + + + Label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 3 + + + Label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 4 + + + Label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 5 + + + txtControl_Match + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 6 + + + Label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 7 + + + ListViewControls + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 8 + + + lblLinkadd + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 9 + + + btnadd_Pattern + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 10 + + + Label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 11 + + + Label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 12 + + + txtPattern + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 13 + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + + 14 + + + txtControl + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2_Controls + + 15 - - Schritt 2 - Wählen Sie das 'MainWindow' zur Auswahl der Inhalte + + Fill - - False + + Segoe UI, 8.25pt, style=Bold - - GroupBoxMainWindow + + 3, 3 - + + 936, 262 + + + 9 + + + Schritt 2 -Wählen Sie das Control mit dem zu übergebenden Wert + + + GroupBox2_Controls + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage_Designer + + TabPage7 - - 2 + + 0 True @@ -1434,21 +1680,6 @@ dem gelesenen Wert ersetzt. Top, Bottom, Left, Right - - # - - - Control-ID: - - - 100 - - - Gelesener Wert - - - 305 - Segoe UI Semibold, 8.25pt, style=Bold, Italic @@ -1473,6 +1704,21 @@ dem gelesenen Wert ersetzt. 8 + + # + + + Control-ID: + + + 100 + + + Gelesener Wert + + + 305 + True @@ -1677,35 +1923,200 @@ dem gelesenen Wert ersetzt. 15 - - Fill + + btnnewProfile - - Segoe UI, 8.25pt, style=Bold + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3, 3 + + GroupBox1 - - 936, 262 + + 0 - + + Button1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 1 + + + lblSaveHotkey + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 2 + + + Label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 3 + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 4 + + + txtKey + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 5 + + + cmbFunktionstaste + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 6 + + + txtWDSearch + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 7 + + + cmbObjekttyp + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 8 + + + txtProfilname + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + 9 - - Schritt 2 -Wählen Sie das Control mit dem zu übergebenden Wert + + Label4 - - GroupBox2_Controls + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + GroupBox1 + + + 10 + + + Label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 11 + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 12 + + + btnGB1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 13 + + + Segoe UI, 8.25pt, style=Bold + + + 6, 6 + + + 391, 275 + + + 16 + + + Schritt 1 - Grundangaben + + + GroupBox1 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage7 + + TabPage_Designer - - 0 + + 1 Segoe UI, 9.75pt, style=Bold, Italic @@ -2125,33 +2536,6 @@ dem gelesenen Wert ersetzt. 13 - - Segoe UI, 8.25pt, style=Bold - - - 6, 6 - - - 391, 275 - - - 16 - - - Schritt 1 - Grundangaben - - - GroupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage_Designer - - - 1 - 134, 17 @@ -2182,6 +2566,54 @@ dem gelesenen Wert ersetzt. True + + 17, 31 + + + Aqua + + + ID + + + True + + + 0 + + + 33 + + + Profilname + + + True + + + 1 + + + 195 + + + 246, 246 + + + 39 + + + GridControl1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPageUebersicht + + + 0 + 1348, 95 @@ -2207,8 +2639,599 @@ dem gelesenen Wert ersetzt. TabPageUebersicht + 1 + + + ListBox1 + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxPatterns + + + 1 + + + TabControlDetails + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxPatterns + + + 3 + + + ListBoxPatterns + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxPatterns + + + 4 + + + 8, 283 + + + 920, 298 + + + 37 + + + Suchpatterns und Control-Matches: + + + GroupBoxPatterns + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageUebersicht + + + 2 + + + True + + + WINDOW_NAMETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 1 + + + Button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 2 + + + lblSave + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 3 + + + btnsave + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 4 + + + CHANGED_WHENTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 6 + + + CHANGED_WHOTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 8 + + + HOTKEY2TextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 10 + + + HOTKEY1ComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 12 + + + WD_SEARCHTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 14 + + + NAMETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 16 + + + GUIDTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 18 + + + 4, 22 + + + 3, 3, 3, 3 + + + 631, 189 + + + 2 + + + Eigenschaften Hotkey-Profil: + + + TabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + 0 + + chklbUser + + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 + + + btnUserAdd_Profile + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 1 + + + 4, 22 + + + 3, 3, 3, 3 + + + 631, 189 + + + 0 + + + User zu Profil zuordnen + + + TabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 1 + + + MiddleLeft + + + 303, 6 + + + 197, 36 + + + 37 + + + Userprofile löschen + + + MiddleRight + + + btndeleteUserProfile + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 0 + + + Top, Bottom, Left + + + 941, 56 + + + 163, 48 + + + ContextMenuStrip1 + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 6, 6 + + + 291, 174 + + + 36 + + + chklbUserProfile + + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 1 + + + 4, 22 + + + 3, 3, 3, 3 + + + 631, 189 + + + 1 + + + Usern Profile entziehen + + + TabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 2 + + + 269, 62 + + + 639, 215 + + + 36 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageUebersicht + + + 3 + + + MiddleLeft + + + 269, 30 + + + 197, 26 + + + 20 + + + Profil löschen (Global und User) + + + MiddleRight + + + btndelete + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageUebersicht + + + 4 + + + True + + + Segoe UI Semibold, 9pt, style=Bold, Italic + + + 5, 12 + + + 142, 15 + + + 3 + + + Aktuelle globale Hotkeys: + + + Label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageUebersicht + + + 5 + + + 4, 22 + + + 3, 3, 3, 3 + + + 964, 587 + + + 2 + + + Übersicht Hot Key-Profile + + + TabPageUebersicht + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControlMain + + + 0 + + + True + + + TabControl2 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage_Designer + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 964, 587 + + + 0 + + + Hotkey-Profil definieren + + + TabPage_Designer + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControlMain + + + 1 + + + GroupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageTest + + + 0 + + + GroupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageTest + + + 1 + + + 4, 22 + + + 3, 3, 3, 3 + + + 964, 587 + + + 1 + + + Test - Auswerten Window-Handle + + + TabPageTest + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControlMain + + + 2 + + + Fill + + + 0, 0 + + + 972, 613 + + + 17 + + + TabControlMain + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + 471, 95 @@ -2233,9 +3256,219 @@ dem gelesenen Wert ersetzt. 1 + + 471, 95 + Top, Bottom, Left + + TabPage6 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControlDetails + + + 0 + + + TabPage4 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControlDetails + + + 1 + + + TabPage5 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControlDetails + + + 2 + + + 261, 21 + + + 639, 271 + + + 1 + + + TabControlDetails + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxPatterns + + + 3 + + + 1040, 95 + + + lblSavePAttern + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 0 + + + ADDED_WHOTextBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 2 + + + CHANGED_WHOTextBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 4 + + + CHANGED_WHENTextBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 6 + + + ADDED_WHENTextBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 7 + + + PATTERN_WDSEARCHTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 10 + + + SEQUENCE_NUMBERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 11 + + + Label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 12 + + + BindingNavigator2 + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 14 + + + GUIDTextBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 16 + + + 4, 22 + + + 3, 3, 3, 3 + + + 631, 245 + + + 2 + + + Suchpatterns + + + TabPage6 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControlDetails + + + 0 + Top, Right @@ -2637,36 +3870,267 @@ Während der Laufzeit wird der Suchpattern der windream-Suche dann mit dem geles 16 - - 4, 22 - - - 3, 3, 3, 3 - - - 631, 245 - - - 2 - - - Suchpatterns - - - TabPage6 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControlDetails - - - 0 - + + 317, 95 + True + + lblHinweisRework1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 0 + + + CHANGED_WHENTextBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 1 + + + Text2Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 2 + + + Text1Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 3 + + + Function2Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 4 + + + Function1Label + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 5 + + + lblsavePatternsRework + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 6 + + + CHANGED_WHOTextBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 9 + + + ADDED_WHENTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 11 + + + ADDED_WHOTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 13 + + + SEQUENCETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 15 + + + TEXT2TextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 16 + + + TEXT1TextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 17 + + + FUNCTION2TextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 18 + + + FUNCTION1TextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 19 + + + TYPEComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 21 + + + GUIDTextBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 23 + + + BindingNavigator1 + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 24 + + + btnRegexTest + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 25 + + + 4, 22 + + + 3, 3, 3, 3 + + + 631, 245 + + + 0 + + + Nachbearbeitungs-Schritte für Suchpattern + + + TabPage4 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControlDetails + + + 1 + True @@ -2724,6 +4188,9 @@ Während der Laufzeit wird der Suchpattern der windream-Suche dann mit dem geles 1 + + 1098, 56 + True @@ -3307,32 +4774,119 @@ Während der Laufzeit wird der Suchpattern der windream-Suche dann mit dem geles 25 - + + 1194, 95 + + + ADDED_WHENTextBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 1 + + + ADDED_WHOTextBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 3 + + + CONTROL_VALUETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 5 + + + SEQUENCE_NUMBERTextBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 7 + + + GUIDTextBox3 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 9 + + + Label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 10 + + + BindingNavigator3 + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 11 + + 4, 22 - + 3, 3, 3, 3 - + 631, 245 - - 0 + + 1 - - Nachbearbeitungs-Schritte für Suchpattern + + Control-Match für Window - - TabPage4 + + TabPage5 - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabControlDetails - - 1 + + 2 Segoe UI, 8.25pt, style=Italic @@ -3636,54 +5190,6 @@ zusätzlich eine Abhängigkeit zwischen dem Control-Inhalt und dem Windownamen g 11 - - 4, 22 - - - 3, 3, 3, 3 - - - 631, 245 - - - 1 - - - Control-Match für Window - - - TabPage5 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControlDetails - - - 2 - - - 261, 21 - - - 639, 271 - - - 1 - - - TabControlDetails - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBoxPatterns - - - 3 - 9, 37 @@ -3705,33 +5211,6 @@ zusätzlich eine Abhängigkeit zwischen dem Control-Inhalt und dem Windownamen g 4 - - 8, 283 - - - 920, 298 - - - 37 - - - Suchpatterns und Control-Matches: - - - GroupBoxPatterns - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPageUebersicht - - - 1 - - - True - Segoe UI Semibold, 9pt, style=Bold, Italic @@ -4005,60 +5484,9 @@ zusätzlich eine Abhängigkeit zwischen dem Control-Inhalt und dem Windownamen g 18 - - 4, 22 - - - 3, 3, 3, 3 - - - 631, 189 - - - 2 - - - Eigenschaften Hotkey-Profil: - - - TabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 0 - Top, Bottom, Left - - 941, 56 - - - 162, 22 - - - Alle auswählen - - - 162, 22 - - - Keine auswählen - - - 163, 48 - - - ContextMenuStrip1 - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 3, 6 @@ -4080,6 +5508,18 @@ zusätzlich eine Abhängigkeit zwischen dem Control-Inhalt und dem Windownamen g 0 + + 162, 22 + + + Alle auswählen + + + 162, 22 + + + Keine auswählen + Segoe UI, 8.25pt @@ -4113,258 +5553,54 @@ zusätzlich eine Abhängigkeit zwischen dem Control-Inhalt und dem Windownamen g 1 - - 4, 22 - - - 3, 3, 3, 3 - - - 631, 189 - - - 0 - - - User zu Profil zuordnen - - - TabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 1 - - - MiddleLeft - - - 303, 6 - - - 197, 26 - - - 37 - - - Userprofile löschen - - - MiddleRight - - - btndeleteUserProfile - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 0 - - - Top, Bottom, Left - - - 6, 6 - - - 291, 174 - - - 36 - - - chklbUserProfile - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 1 - - - 4, 22 - - - 3, 3, 3, 3 - - - 631, 189 - - - 1 - - - Usern Profile entziehen - - - TabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 2 - - - 269, 62 - - - 639, 215 - - - 36 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPageUebersicht - - - 2 - - - MiddleLeft - - - 269, 30 - - - 197, 26 - - - 20 - - - Profil löschen (Global und User) - - - MiddleRight - - - btndelete - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPageUebersicht - - - 3 - - - Top, Bottom, Left, Right - - - Segoe UI Semibold, 9pt, style=Bold, Italic - - - 15 - - - 8, 30 - - - 255, 244 - - - 4 - - - ListBox_Profiles - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPageUebersicht - - - 4 - - - True - - - Segoe UI Semibold, 9pt, style=Bold, Italic - - - 5, 12 - - - 142, 15 - - - 3 - - - Aktuelle globale Hotkeys: - - - Label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPageUebersicht - - - 5 - - - 4, 22 - - - 3, 3, 3, 3 - - - 964, 587 - - - 2 - - - Übersicht Hot Key-Profile - - - TabPageUebersicht - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControlMain - - - 0 - - - True - Bottom, Left, Right + + TabPage7 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl2 + + + 0 + + + TabPage8 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl2 + + + 1 + + + 6, 287 + + + 950, 294 + + + 17 + + + TabControl2 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage_Designer + + + 0 + 4, 22 @@ -4392,6 +5628,117 @@ zusätzlich eine Abhängigkeit zwischen dem Control-Inhalt und dem Windownamen g 0 + + Label20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage8 + + + 0 + + + lblLinkCopyPaste + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage8 + + + 1 + + + btnAddCopypasteConfig + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage8 + + + 2 + + + txtcopypastePatter + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage8 + + + 3 + + + Label19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage8 + + + 4 + + + Label18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage8 + + + 5 + + + cmbCopyPasteFunction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage8 + + + 6 + + + 4, 22 + + + 3, 3, 3, 3 + + + 942, 268 + + + 1 + + + ODER 'Copy and Paste' + + + TabPage8 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl2 + + + 1 + True @@ -4600,102 +5947,6 @@ strA and strgC Zuerst wird der gesamte Text markiert und dann an das pattern 6 - - 4, 22 - - - 3, 3, 3, 3 - - - 942, 268 - - - 1 - - - ODER 'Copy and Paste' - - - TabPage8 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl2 - - - 1 - - - 6, 287 - - - 950, 294 - - - 17 - - - TabControl2 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage_Designer - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 964, 587 - - - 0 - - - Hotkey-Profil definieren - - - TabPage_Designer - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControlMain - - - 1 - - - Bottom, Left - - - True - - - Segoe UI, 9pt, style=Bold, Italic - - - 6, 555 - - - 185, 19 - - - 10 - - - Nur gefüllte Felder anzeigen - chkboxshowfilledControlsOnly_Test @@ -4708,36 +5959,6 @@ strA and strgC Zuerst wird der gesamte Text markiert und dann an das pattern 0 - - Top, Bottom, Left, Right - - - # - - - Control-ID: - - - 80 - - - Gelesener Wert - - - 350 - - - Segoe UI, 8.25pt, style=Italic - - - 6, 27 - - - 414, 514 - - - 82 - ListViewControls_Test @@ -4780,6 +6001,135 @@ strA and strgC Zuerst wird der gesamte Text markiert und dann an das pattern 0 + + Bottom, Left + + + True + + + Segoe UI, 9pt, style=Bold, Italic + + + 6, 555 + + + 185, 19 + + + 10 + + + Nur gefüllte Felder anzeigen + + + chkboxshowfilledControlsOnly_Test + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox3 + + + 0 + + + Top, Bottom, Left, Right + + + Segoe UI, 8.25pt, style=Italic + + + 6, 27 + + + 414, 514 + + + 82 + + + ListViewControls_Test + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox3 + + + 1 + + + # + + + Control-ID: + + + 80 + + + Gelesener Wert + + + 350 + + + Button3 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 0 + + + ListBox_MainWindows_Test + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 1 + + + Left + + + Segoe UI, 8.25pt, style=Bold + + + 3, 3 + + + 535, 581 + + + 16 + + + Schritt 1 - Wählen Sie das 'MainWindow' zur Auswahl der Inhalte + + + GroupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageTest + + + 1 + Bottom, Left @@ -4846,87 +6196,6 @@ strA and strgC Zuerst wird der gesamte Text markiert und dann an das pattern 1 - - Left - - - Segoe UI, 8.25pt, style=Bold - - - 3, 3 - - - 535, 581 - - - 16 - - - Schritt 1 - Wählen Sie das 'MainWindow' zur Auswahl der Inhalte - - - GroupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPageTest - - - 1 - - - 4, 22 - - - 3, 3, 3, 3 - - - 964, 587 - - - 1 - - - Test - Auswerten Window-Handle - - - TabPageTest - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControlMain - - - 2 - - - Fill - - - 0, 0 - - - 972, 613 - - - 17 - - - TabControlMain - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - 17, 56 @@ -4952,7 +6221,7 @@ strA and strgC Zuerst wird der gesamte Text markiert und dann an das pattern True - 67 + 173 6, 13 @@ -5190,6 +6459,24 @@ strA and strgC Zuerst wird der gesamte Text markiert und dann an das pattern System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GridView1 + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colGUID + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colString + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + TBHOTKEY_WINDOW_HOOKBindingSource @@ -5470,7 +6757,7 @@ strA and strgC Zuerst wird der gesamte Text markiert und dann an das pattern ToolTipController1 - DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a frmHotKey_Add diff --git a/Global_Indexer/frmHotKey_Add.vb b/Global_Indexer/frmHotKey_Add.vb index 8c824e0..bac3bff 100644 --- a/Global_Indexer/frmHotKey_Add.vb +++ b/Global_Indexer/frmHotKey_Add.vb @@ -238,11 +238,6 @@ Me.txtWDSearch.Text = Me.OFDWindreamsuche.FileName End If End Sub - - Private Sub txtKey_KeyUp(sender As Object, e As KeyEventArgs) Handles txtKey.KeyUp - Console.WriteLine(e.KeyCode) - End Sub - Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControlMain.SelectedIndexChanged Select Case TabControlMain.SelectedIndex @@ -290,23 +285,29 @@ End Sub Private Sub btndelete_Click(sender As Object, e As EventArgs) Handles btndelete.Click - If ListBox_Profiles.SelectedIndex <> -1 Then + Dim ID + Try + ID = GridView1.GetFocusedRowCellValue(GridView1.Columns("GUID")) + Catch ex As Exception + ID = 0 + End Try + If ID > 1 Then Dim result As MsgBoxResult result = MessageBox.Show("Sind Sie sicher dass Sie dieses Hotkeyprofil löschen wollen?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then Try - Dim del As String = "DELETE FROM TBHOTKEY_USER_PROFILE WHERE HKPROFILE_ID = " & ListBox_Profiles.SelectedValue + Dim del As String = "DELETE FROM TBHOTKEY_USER_PROFILE WHERE HKPROFILE_ID = " & ID If ClassDatabase.Execute_non_Query(del, True) = True Then - del = "DELETE FROM TBHOTKEY_PATTERNS_REWORK WHERE HKPATTERN_ID IN (SELECT GUID FROM TBHOTKEY_PATTERNS WHERE HKPROFILE_ID = " & ListBox_Profiles.SelectedValue & ")" + del = "DELETE FROM TBHOTKEY_PATTERNS_REWORK WHERE HKPATTERN_ID IN (SELECT GUID FROM TBHOTKEY_PATTERNS WHERE HKPROFILE_ID = " & ID & ")" If ClassDatabase.Execute_non_Query(del, True) = True Then - del = "DELETE FROM TBHOTKEY_PATTERNS WHERE HKPROFILE_ID = " & ListBox_Profiles.SelectedValue + del = "DELETE FROM TBHOTKEY_PATTERNS WHERE HKPROFILE_ID = " & ID If ClassDatabase.Execute_non_Query(del, True) = True Then - del = "DELETE FROM TBHOTKEY_WINDOW_HOOK WHERE HKPROFILE_ID = " & ListBox_Profiles.SelectedValue + del = "DELETE FROM TBHOTKEY_WINDOW_HOOK WHERE HKPROFILE_ID = " & ID If ClassDatabase.Execute_non_Query(del, True) = True Then - del = "DELETE FROM TBHOTKEY_PROFILE WHERE GUID = " & ListBox_Profiles.SelectedValue + del = "DELETE FROM TBHOTKEY_PROFILE WHERE GUID = " & ID If ClassDatabase.Execute_non_Query(del, True) = True Then - ClassLogger.Add(">> Hotkey-Profil: " & ListBox_Profiles.SelectedValue & " wurde gelöscht!", False) + ClassLogger.Add(">> Hotkey-Profil: " & ID & " wurde gelöscht!", False) Load_Profiles() Load_UserForProfiles() MsgBox("Profil wurde erfolgreich gelöscht!", MsgBoxStyle.Information, "Erfolgsmeldung") @@ -326,16 +327,22 @@ Try Dim added As Integer = 0 Dim items As CheckedListBox.CheckedItemCollection = chklbUser.CheckedItems - If ListBox_Profiles.SelectedIndex <> -1 And items.Count > 0 Then + Dim ID + Try + ID = GridView1.GetFocusedRowCellValue(GridView1.Columns("GUID")) + Catch ex As Exception + ID = 0 + End Try + If ID > 1 And items.Count > 0 Then For Each item In items Dim SQL SQL = "SELECT GUID FROM TBDD_USER WHERE USERNAME = '" & item.ToString & "'" Dim userid = ClassDatabase.Execute_Scalar(SQL, MyConnectionString, True) - SQL = "SELECT COUNT(*) FROM TBHOTKEY_USER_PROFILE WHERE USER_ID = " & userid & " and HKPROFILE_ID = " & ListBox_Profiles.SelectedValue + SQL = "SELECT COUNT(*) FROM TBHOTKEY_USER_PROFILE WHERE USER_ID = " & userid & " and HKPROFILE_ID = " & ID Dim exists = ClassDatabase.Execute_Scalar(SQL, MyConnectionString, True) If exists = 0 Then - TBHOTKEY_USER_PROFILETableAdapter.cmdInsert(userid, ListBox_Profiles.SelectedValue) + TBHOTKEY_USER_PROFILETableAdapter.cmdInsert(userid, ID) added += 1 End If @@ -359,15 +366,29 @@ End Sub Private Sub AlleAuswählenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AlleAuswählenToolStripMenuItem.Click - For i = 0 To chklbUser.Items.Count - 1 - chklbUser.SetItemChecked(i, True) - Next + If TabControl1.SelectedIndex = 1 Then + For i = 0 To chklbUser.Items.Count - 1 + chklbUser.SetItemChecked(i, True) + Next + ElseIf TabControl1.SelectedIndex = 2 Then + For i = 0 To chklbUserProfile.Items.Count - 1 + chklbUserProfile.SetItemChecked(i, True) + Next + End If + End Sub Private Sub KeineAuswählenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KeineAuswählenToolStripMenuItem.Click - For i = 0 To chklbUser.Items.Count - 1 - chklbUser.SetItemChecked(i, False) - Next + If TabControl1.SelectedIndex = 1 Then + For i = 0 To chklbUser.Items.Count - 1 + chklbUser.SetItemChecked(i, False) + Next + ElseIf TabControl1.SelectedIndex = 2 Then + For i = 0 To chklbUserProfile.Items.Count - 1 + chklbUserProfile.SetItemChecked(i, False) + Next + End If + End Sub Private Sub TabControl2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged @@ -381,9 +402,15 @@ End Sub Sub Load_UserForProfiles() Try - If ListBox_Profiles.SelectedIndex <> -1 Then + Dim ID + Try + ID = GridView1.GetFocusedRowCellValue(GridView1.Columns("GUID")) + Catch ex As Exception + ID = 0 + End Try + If ID > 1 Then chklbUserProfile.Items.Clear() - Dim SQL = "SELECT T.USERNAME FROM TBHOTKEY_USER_PROFILE T1, TBDD_USER T WHERE T.GUID = T1.USER_ID and T1.HKPROFILE_ID = " & ListBox_Profiles.SelectedValue + Dim SQL = "SELECT T.USERNAME FROM TBHOTKEY_USER_PROFILE T1, TBDD_USER T WHERE T.GUID = T1.USER_ID and T1.HKPROFILE_ID = " & ID Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True) If Not IsNothing(DT) Then For Each dr As DataRow In DT.Rows @@ -396,9 +423,14 @@ End Try End Sub - Private Sub ListBox_Profiles_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBox_Profiles.SelectedIndexChanged - - If ListBox_Profiles.SelectedIndex <> -1 Then + Private Sub ListBox_Profiles_SelectedIndexChanged(sender As Object, e As EventArgs) + Dim ID + Try + ID = GridView1.GetFocusedRowCellValue(GridView1.Columns("GUID")) + Catch ex As Exception + ID = 0 + End Try + If ID > 0 Then Select Case TabControl1.SelectedIndex Case 1 'Try @@ -436,7 +468,13 @@ Try Dim deleted As Integer = 0 Dim items As CheckedListBox.CheckedItemCollection = chklbUserProfile.CheckedItems - If ListBox_Profiles.SelectedIndex <> -1 And items.Count > 0 Then + Dim ID + Try + ID = GridView1.GetFocusedRowCellValue(GridView1.Columns("GUID")) + Catch ex As Exception + ID = 0 + End Try + If ID > 1 And items.Count > 0 Then For Each item In items Dim SQL SQL = "SELECT GUID FROM TBDD_USER WHERE USERNAME = '" & item.ToString & "'" @@ -445,10 +483,10 @@ MsgBox("Unerwarteter Unexpected error inm Holen der User-ID!", MsgBoxStyle.Exclamation) Exit Sub End If - SQL = "SELECT GUID FROM TBHOTKEY_USER_PROFILE WHERE USER_ID = " & userid & " and HKPROFILE_ID = " & ListBox_Profiles.SelectedValue - Dim ID = ClassDatabase.Execute_Scalar(SQL, MyConnectionString, True) - If ID > 0 Then - TBHOTKEY_USER_PROFILETableAdapter.Delete(ID) + SQL = "SELECT GUID FROM TBHOTKEY_USER_PROFILE WHERE USER_ID = " & userid & " and HKPROFILE_ID = " & ID + Dim ID1 = ClassDatabase.Execute_Scalar(SQL, MyConnectionString, True) + If ID1 > 0 Then + TBHOTKEY_USER_PROFILETableAdapter.Delete(ID1) deleted += 1 End If Next @@ -778,4 +816,12 @@ Private Sub cmbCopyPasteFunction_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbCopyPasteFunction.SelectedIndexChanged End Sub + + Private Sub chklbUserProfile_MouseEnter(sender As Object, e As EventArgs) Handles chklbUserProfile.MouseEnter + ToolTipController1.ShowHint("Rechtsklick für weitere Funktionen", "Hinweis:", DevExpress.Utils.ToolTipLocation.RightCenter) + End Sub + + Private Sub chklbUserProfile_MouseLeave(sender As Object, e As EventArgs) Handles chklbUserProfile.MouseLeave + ToolTipController1.HideHint() + End Sub End Class \ No newline at end of file diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx index 84f5e28..ea2aae9 100644 --- a/Global_Indexer/frmIndex.resx +++ b/Global_Indexer/frmIndex.resx @@ -805,7 +805,7 @@ PdfViewer1 - DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlPDF @@ -868,7 +868,7 @@ RibbonControl1 - DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pnlPDF @@ -1033,175 +1033,175 @@ PdfFileOpenBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfFileSaveAsBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfFileSaveAsBarItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFileSaveAsBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfFilePrintBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfFilePrintBarItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFilePrintBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfPreviousPageBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfPreviousPageBarItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfPreviousPageBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfNextPageBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfNextPageBarItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfNextPageBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfFindTextBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfFindTextBarItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFindTextBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoomOutBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoomOutBarItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoomOutBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoomInBarItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoomInBarItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoomInBarItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfExactZoomListBarSubItem1 - DevExpress.XtraPdfViewer.Bars.PdfExactZoomListBarSubItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfExactZoomListBarSubItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom10CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom10CheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom10CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom25CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom25CheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom25CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom50CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom50CheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom50CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom75CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom75CheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom75CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom100CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom100CheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom100CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom125CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom125CheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom125CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom150CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom150CheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom150CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom200CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom200CheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom200CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom400CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom400CheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom400CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoom500CheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfZoom500CheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoom500CheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetActualSizeZoomModeCheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfSetActualSizeZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetActualSizeZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetPageLevelZoomModeCheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfSetPageLevelZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetPageLevelZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetFitWidthZoomModeCheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfSetFitVisibleZoomModeCheckItem1 - DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfRibbonPage1 - DevExpress.XtraPdfViewer.Bars.PdfRibbonPage, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfRibbonPage, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfFileRibbonPageGroup1 - DevExpress.XtraPdfViewer.Bars.PdfFileRibbonPageGroup, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfFileRibbonPageGroup, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfNavigationRibbonPageGroup1 - DevExpress.XtraPdfViewer.Bars.PdfNavigationRibbonPageGroup, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfNavigationRibbonPageGroup, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfZoomRibbonPageGroup1 - DevExpress.XtraPdfViewer.Bars.PdfZoomRibbonPageGroup, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfZoomRibbonPageGroup, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfBarController1 - DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a PdfBarController2 - DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraPdfViewer.Bars.PdfBarController, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a frmIndex diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 285af01..b3a8c57 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -7,6 +7,7 @@ Imports Oracle.ManagedDataAccess.Client Imports System.Text Imports System.Security.AccessControl Imports System.Security.Principal +Imports System.DirectoryServices Public Class frmIndex #Region "+++++ Variablen ++++++" @@ -337,7 +338,7 @@ Public Class frmIndex ' Return 99 ' End Try ' End Function - Function GetManIndex_Value(indexname As String, RequestFor As String) + Function GetManIndex_Value(indexname As String, RequestFor As String, opt As Boolean) Try Dim DT As DataTable Dim DR As DataRow @@ -355,15 +356,16 @@ Public Class frmIndex Else If DR.Item("Indexwert").ToString <> String.Empty Then If LogErrorsOnly = False Then ClassLogger.Add(" >>Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"), False) - Console.WriteLine("Rückgabe manueller wert: " & DR.Item("Indexwert")) Return DR.Item("Indexwert") Else - Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & indexname & "')", MyConnectionString, True) - If optional_index = False Then + If opt = False Then ClassLogger.Add(" >> Achtung, der Indexwert des manuellen Indexes '" & indexname & "' ist String.empty!", False) showlblhinweis("Indexiert = True - Der Index: " & DR.Item("INDEXNAME") & " wurde nicht ordnungsgemäss indexiert! - Automatischer Index konnte nicht gesetzt werden!") + Return Nothing + Else + Return "" End If - Return Nothing + End If End If Case Else @@ -371,12 +373,14 @@ Public Class frmIndex If LogErrorsOnly = False Then ClassLogger.Add(" >>Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"), False) Return DR.Item("Indexwert") Else - Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & indexname & "')", MyConnectionString, True) - If optional_index = False Then + 'Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & indexname & "')", MyConnectionString, True) + If opt = False Then ClassLogger.Add(" >> Achtung, der Indexwert des manuellen Indexes '" & indexname & "' ist String.empty!", False) showlblhinweis("Indexiert = True - Der Index: " & DR.Item("INDEXNAME") & " wurde nicht ordnungsgemäss indexiert! - Automatischer Index konnte nicht gesetzt werden!") + Return Nothing + Else + Return "" End If - Return Nothing End If End Select Else @@ -438,7 +442,7 @@ Public Class frmIndex End If If ergebnis Is Nothing Then - showlblhinweis("Kein Ergebnis für automatisches SQL: " & vsqlstatement) + 'showlblhinweis("Kein Ergebnis für automatisches SQL: " & vsqlstatement) Return "" Else Return ergebnis @@ -952,13 +956,13 @@ Public Class frmIndex End If ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen For Each element As System.Text.RegularExpressions.Match In elemente - Console.WriteLine(element.ToString) Select Case element.Value.Substring(2, 1).ToUpper 'Manueller Indexwert Case "M" If LogErrorsOnly = False Then ClassLogger.Add(" >>Manueller Index wird geprüft...", False) Dim Indexname = element.Value.Substring(3, element.Value.Length - 4) - Dim value As String = GetManIndex_Value(element.Value.Substring(3, element.Value.Length - 4), "FILE") + Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & Indexname & "')", MyConnectionString, True) + Dim value As String = GetManIndex_Value(Indexname, "FILE", optional_index) If value <> String.Empty Then DATEINAME = DATEINAME.Replace(element.Value, value) NewFileString = DATEINAME @@ -966,7 +970,7 @@ Public Class frmIndex AnzahlIndexe += 1 sql_history_Index_Values = sql_history_Index_Values & ", '" & value & "'" Else - Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & Indexname & "')", MyConnectionString, True) + If optional_index = True Then Dim result As MsgBoxResult result = MessageBox.Show("Achtung der optionale Index ist leer, wird aber für die Benennung der Datei benutzt." & vbNewLine & "Wollen Sie stattdessen den Originaldateinamen verwenden?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) @@ -993,11 +997,16 @@ Public Class frmIndex Case "A" Dim value As String = GetAutoIndex_Value(element.Value.Substring(3, element.Value.Length - 4)) If value <> String.Empty Then - DATEINAME = DATEINAME.Replace(element.Value, value) - NewFileString = DATEINAME - sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString - AnzahlIndexe += 1 - sql_history_Index_Values = sql_history_Index_Values & ", '" & value & "'" + If value = "EMPTY_OI" Then + DATEINAME = DATEINAME.Replace(element.Value, "") + NewFileString = DATEINAME + Else + DATEINAME = DATEINAME.Replace(element.Value, value) + NewFileString = DATEINAME + sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString + AnzahlIndexe += 1 + sql_history_Index_Values = sql_history_Index_Values & ", '" & value & "'" + End If Else err = True End If @@ -1024,12 +1033,21 @@ Public Class frmIndex datetemp = _day & "_" & _Month & "_" & My.Computer.Clock.LocalTime.Year.ToString.Substring(2) Case "DD_MM_YYYY" datetemp = _day & "_" & _Month & "_" & My.Computer.Clock.LocalTime.Year + Case "YYMMDD" + datetemp = My.Computer.Clock.LocalTime.Year.ToString.Substring(2) & _Month & _day + Case "YYYYMMDD" + datetemp = My.Computer.Clock.LocalTime.Year & _Month & _day + Case "DDMMYY" + datetemp = _day & _Month & My.Computer.Clock.LocalTime.Year.ToString.Substring(2) + Case "DDMMYYYY" + datetemp = _day & _Month & My.Computer.Clock.LocalTime.Year Case "OFilename" DATEINAME = DATEINAME.Replace(element.Value, System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE)) - Case "Username" + Case "Username".ToUpper DATEINAME = DATEINAME.Replace(element.Value, Environment.UserName) - Case "Usercode" + Case "Usercode".ToUpper DATEINAME = DATEINAME.Replace(element.Value, CURRENT_USER_SHORT) + Case "" End Select If datetemp <> "" Then DATEINAME = DATEINAME.Replace(element.Value, datetemp) @@ -1063,9 +1081,24 @@ Public Class frmIndex MsgBox("Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:") End Select Next - CURRENT_NEWFILENAME = ClassFilehandle.CleanFilename(CURRENT_NEWFILENAME, "") - CURRENT_NEWFILENAME = NewFileString & extension + CURRENT_NEWFILENAME = ClassFilehandle.CleanFilename(NewFileString, "") + If CURRENT_NEWFILENAME.EndsWith("_") Then + CURRENT_NEWFILENAME = CURRENT_NEWFILENAME.Substring(0, CURRENT_NEWFILENAME.Length - 1) + End If + If CURRENT_NEWFILENAME.StartsWith("_") Then + CURRENT_NEWFILENAME = CURRENT_NEWFILENAME.Substring(1) + End If + If CURRENT_NEWFILENAME.Contains("__") Then + CURRENT_NEWFILENAME = CURRENT_NEWFILENAME.Replace("__", "_") + End If + CURRENT_NEWFILENAME &= extension + Dim sollfilename = System.IO.Path.GetFileName(CURRENT_NEWFILENAME) + If sollfilename.StartsWith("_") Then + sollfilename = sollfilename.Substring(1) + Dim _path = System.IO.Path.GetDirectoryName(CURRENT_NEWFILENAME) + CURRENT_NEWFILENAME = _path & "\" & sollfilename + End If Dim path = System.IO.Path.GetDirectoryName(CURRENT_NEWFILENAME) If folder_Created = False Then ' Den Zielordner erstellen @@ -1108,26 +1141,29 @@ Public Class frmIndex Dim idxvalue = row.Item("Indexwert") Dim indexname = row.Item("WD_INDEX").ToString Dim optional_Index = CBool(row.Item("OPTIONAL")) - If CBool(row.Item("Indexiert")) = True And idxvalue.ToString <> "" Then + Dim indexiert = CBool(row.Item("Indexiert")) + If indexiert And idxvalue.ToString <> "" And idxvalue <> "EMPTY_OI" Then If indexname <> String.Empty Then - 'Den Indexwert zwischenspeichern - Dim DTTemp As DataTable = MyDataset.TBTEMP_INDEXRESULTS - Dim rowexists As Boolean = False - For Each rowTemp As DataRow In DTTemp.Rows - 'Wenn bereits ein Eintrag existiert..... - If rowTemp.Item("Dokumentart") = row.Item("DOKUMENTART") And rowTemp.Item("Indexname") = row.Item("INDEXNAME") Then - rowexists = True - '......überschreiben - rowTemp.Item("Value") = row.Item("Indexwert") + If row.Item("SAVE_VALUE") = True Then + 'Den Indexwert zwischenspeichern + Dim DTTemp As DataTable = MyDataset.TBTEMP_INDEXRESULTS + Dim rowexists As Boolean = False + For Each rowTemp As DataRow In DTTemp.Rows + 'Wenn bereits ein Eintrag existiert..... + If rowTemp.Item("Dokumentart") = row.Item("DOKUMENTART") And rowTemp.Item("Indexname") = row.Item("INDEXNAME") Then + rowexists = True + '......überschreiben + rowTemp.Item("Value") = row.Item("Indexwert") + End If + Next + '.....ansonsten neu anlegen + If rowexists = False Then + Dim newRow As DataRow = DTTemp.NewRow() + newRow("Dokumentart") = row.Item("DOKUMENTART").ToString + newRow("Indexname") = row.Item("INDEXNAME").ToString + newRow("Value") = row.Item("Indexwert") + DTTemp.Rows.Add(newRow) End If - Next - '.....ansonsten neu anlegen - If rowexists = False Then - Dim newRow As DataRow = DTTemp.NewRow() - newRow("Dokumentart") = row.Item("DOKUMENTART").ToString - newRow("Indexname") = row.Item("INDEXNAME").ToString - newRow("Value") = row.Item("Indexwert") - DTTemp.Rows.Add(newRow) End If If LogErrorsOnly = False Then ClassLogger.Add(" >> Manueller Indexvalue: " & idxvalue.ToString, False) @@ -1155,28 +1191,31 @@ Public Class frmIndex If DTAut.Rows.Count > 0 Then Dim Count As Integer = 0 For Each row As DataRow In DTAut.Rows - If CBool(row.Item("Indexiert")) = True And row.Item("Indexwert").ToString <> "" Then - Dim indexname = row.Item("INDEXNAME").ToString - Dim idxvalue = row.Item("Indexwert") - If LogErrorsOnly = False Then ClassLogger.Add(" >> Auto Indexvalue: " & idxvalue.ToString, False) - If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexvalue: " & idxvalue.ToString, False) - Count += 1 - indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, idxvalue) - If indexierung_erfolgreich = False Then - MsgBox("Error in indexing file - See log", MsgBoxStyle.Critical) - Return False - Exit For + Dim indexiert = CBool(row.Item("Indexiert")) + Dim Indexvalue = row.Item("Indexwert").ToString + Dim indexname = row.Item("INDEXNAME").ToString + If indexiert = True And Indexvalue <> "" Then + If Indexvalue <> "EMPTY_OI" Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> Auto Indexname: " & indexname.ToString, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexvalue: " & Indexvalue.ToString, False) + Count += 1 + indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, Indexvalue) + If indexierung_erfolgreich = False Then + MsgBox("Error in indexing file - See log", MsgBoxStyle.Critical) + Return False + Exit For + End If End If End If Next End If - If DropType = "@OUTLOOK_MESSAGE@" Or DropType = "@FW_MSGONLY@" Or DropType = "@MSGONLY@" Or CURRENT_NEWFILENAME.EndsWith(".msg") Then + If DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Or DropType = "|MSGONLY|" Or CURRENT_NEWFILENAME.EndsWith(".msg") Then indexierung_erfolgreich = SetEmailIndices() If indexierung_erfolgreich = False Then MsgBox("Error in SetEmailIndices - See log", MsgBoxStyle.Critical) Return False End If - ElseIf DropType = "@ATTMNTEXTRACTED@" Or DropType = "@OUTLOOK_ATTACHMENT@" Then + ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then indexierung_erfolgreich = SetAttachmentIndices() If indexierung_erfolgreich = False Then MsgBox("Error in SetEmailIndices - See log", MsgBoxStyle.Critical) @@ -1206,7 +1245,20 @@ Public Class frmIndex Private Function SetEmailIndices() Dim indexierung_erfolgreich As Boolean = False Try - Dim msg As New Msg.Message(CURRENT_NEWFILENAME) + Dim msg As Msg.Message = New Msg.Message(CURRENT_NEWFILENAME) + Dim msgDisplayTo = msg.DisplayTo + Dim msgInternetAccountName = msg.InternetAccountName + If LogErrorsOnly = False Then + ClassLogger.Add("", False) + ClassLogger.Add(" >> msgInternetAccountName: " & msgInternetAccountName, False) + ClassLogger.Add(" >> SenderName: " & msg.SenderName, False) + ClassLogger.Add(" >> SenderEmailAddress: " & msg.SenderEmailAddress, False) + ClassLogger.Add(" >> ReceivedByName: " & msg.ReceivedByName, False) + ClassLogger.Add(" >> ReceivedByEmailAddress: " & msg.ReceivedByEmailAddress, False) + ClassLogger.Add("", False) + End If + + 'Console.WriteLine("Subject: " + msg.Subject) 'Console.WriteLine("MessageDeliveryTime:" & msg.MessageDeliveryTime) 'Console.WriteLine("SenderName: " + msg.SenderName) @@ -1247,7 +1299,7 @@ Public Class frmIndex ' Regular Expressions vorbereiten Dim fromPattern As String = ClassDatabase.Execute_Scalar("SELECT REGEX FROM TBGI_FUNCTION_REGEX WHERE FUNCTION_NAME = 'FROM_EMAIL_HEADER'", MyConnectionString) Dim toPattern As String = ClassDatabase.Execute_Scalar("SELECT REGEX FROM TBGI_FUNCTION_REGEX WHERE FUNCTION_NAME = 'TO_EMAIL_HEADER'", MyConnectionString) - + Dim finalize_pattern As String = ClassDatabase.Execute_Scalar("SELECT REGEX FROM TBGI_FUNCTION_REGEX WHERE FUNCTION_NAME = 'FINALIZE'", MyConnectionString) If fromPattern <> "" And toPattern <> "" Then Dim FromRegexList As New List(Of Regex) Dim ToRegexList As New List(Of Regex) @@ -1259,30 +1311,86 @@ Public Class frmIndex ' Email Header auslesen Dim headers As String = ClassEmailHeaderExtractor.getMessageHeaders(msg) - Dim emailFrom As String - Dim emailTo As String + Dim emailFrom + Dim emailTo ' Email Absender und Empfänger If headers Is Nothing Then - If msg.DisplayTo Is Nothing Then + If IsNothing(msgDisplayTo) Then ClassLogger.Add(" >> DisplayTo in email is nothing - default will be set", False) emailTo = "NO RECIPIENT" Else - emailTo = msg.DisplayTo.Replace("'", "") + emailTo = msgDisplayTo.ToString.Replace("'", "") End If - If msg.InternetAccountName Is Nothing Then + If IsNothing(msgInternetAccountName) Then ClassLogger.Add(" >> InternetAccountName in email is nothing - default will be set", False) emailFrom = "" Else - emailFrom = msg.InternetAccountName.Replace("'", "") + emailFrom = msgInternetAccountName.ToString.Replace("'", "") End If Else - emailFrom = ClassEmailHeaderExtractor.extractFromAddress(headers, FromRegexList) - emailTo = ClassEmailHeaderExtractor.extractToAddress(headers, ToRegexList) - End If + If LogErrorsOnly = False Then ClassLogger.Add(" >> emailTo and From Extraction via messageheader.", False) + emailFrom = ClassEmailHeaderExtractor.extractFromAddress1(headers, fromPattern) 'FromRegexList) + emailFrom = ClassEmailHeaderExtractor.extractFromAddress1(emailFrom, finalize_pattern) + emailTo = ClassEmailHeaderExtractor.extractFromAddress1(headers, toPattern) ' extractToAddress(headers, ToRegexList) + emailTo = ClassEmailHeaderExtractor.extractFromAddress1(emailTo, finalize_pattern) - If IsNothing(emailFrom) Or IsNothing(emailTo) Then - MsgBox("Unhandled Exception in SetEmailIndices - emailfrom or recipiant are empty and defaults could not be set." & vbNewLine & "Please check the dropped email and Configuration of Email-Indexing!", MsgBoxStyle.Exclamation) - Return False + emailFrom = emailFrom.Replace("<", "") + emailFrom = emailFrom.Replace(">", "") + If Not IsNothing(emailTo) Then + emailTo = emailTo.Replace("<", "") + emailTo = emailTo.Replace(">", "") + End If + If Not IsNothing(emailTo) Then + Dim _duplicatesCheck As List(Of String) = New List(Of String) + _duplicatesCheck = emailTo.ToString.Split(";").ToList + ' Filter distinct elements, and convert back into list. + Dim result As List(Of String) = _duplicatesCheck.Distinct().ToList + ' Display result. + Dim i As Integer = 0 + For Each element As String In result + If i = 0 Then + emailTo = element + Else + emailTo = emailTo & ";" & element + End If + i += 1 + Next + End If + + If LogErrorsOnly = False Then ClassLogger.Add("", True) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Headers-Content: ", True) + If LogErrorsOnly = False Then ClassLogger.Add(headers.ToString, False) + If LogErrorsOnly = False Then ClassLogger.Add("", True) + End If + 'Handler für leere emailFrom-Adresse + If IsNothing(emailFrom) Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> emailFrom couldn't be extracted from messageheader...", False) + If Not IsNothing(msg.SenderEmailAddress) Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> emailFrom via msg.SenderEmailAddress will be used instead!", False) + emailFrom = msg.SenderEmailAddress.ToString.Replace("'", "") + Else + MsgBox("Could't get 'emailfrom' from messageHeader." & vbNewLine & "Please check the dropped email and Configuration of Email-Indexing!", MsgBoxStyle.Exclamation) + Return False + End If + End If + 'Handler für leere emailTo-Adresse + If IsNothing(emailTo) Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> emailTo couldn't be extracted from messageheader...", False) + If (headers.Contains("exc") Or headers.Contains("exchange")) Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> ...try with LDAP-option", False) + Dim _email = GetUserEmailfromLDAP(msgDisplayTo) + If _email <> "" Then + emailTo = _email + Else + ClassLogger.Add(">> email-adress couldn't be read from LDAP with name '" & msgDisplayTo & "'", False) + MsgBox("Could't get 'emailto' from messageHeader and later on with LDAP-Option." & vbNewLine & "Please check the dropped email and Configuration of Email-Indexing!", MsgBoxStyle.Exclamation) + Return False + End If + Else + If LogErrorsOnly = False Then ClassLogger.Add(" >> no exchange patterns found in headers!", False) + MsgBox("Could't get 'emailto' from messageHeader and exhange-Patterns weren't found." & vbNewLine & "Please check the dropped email and Configuration of Email-Indexing!", MsgBoxStyle.Exclamation) + Return False + End If End If If LogErrorsOnly = False Then ClassLogger.Add(" >> emailFrom: " & emailFrom, False) If LogErrorsOnly = False Then ClassLogger.Add(" >> emailTo: " & emailTo, False) @@ -1338,6 +1446,37 @@ Public Class frmIndex + End Function + Public Function GetUserEmailfromLDAP(ByVal userName As String) As String + + Dim domainName As String = Environment.UserDomainName '"PutYourDomainNameHere" '< Change this value to your actual domain name. For example: "yahoo" + Dim dommain As String = "com" '> Unexpected Error in GetUserEmail from LDAP: " & ex.Message, False) + End Try + End Using + + Return userEmail + End Function Private Function SetAttachmentIndices() Dim indexierung_erfolgreich As Boolean = True @@ -1498,26 +1637,26 @@ Public Class frmIndex CURRENT_ISATTACHMENT = False DropType = ClassDatabase.Execute_Scalar("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID, MyConnectionString, True) chkdelete_origin.Visible = False - If DropType = "@DROPFROMFSYSTEM@" Then + If DropType = "|DROPFROMFSYSTEM|" Then chkdelete_origin.Visible = True chkdelete_origin.Checked = Delete_OriginFile Me.Text = "Indexierung der gedroppten Datei:" - ElseIf DropType = "@OUTLOOK_MESSAGE@" Or DropType = "@FW_MSGONLY@" Then + ElseIf DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Then Select Case DropType - Case "@FW_MSGONLY@" + Case "|FW_MSGONLY|" If LogErrorsOnly = False Then ClassLogger.Add(" >> .msg-file from folderwatch", False) Me.Text = "Indexierung der msg-Datei (ohne Anhang) - aus Folderwatch:" - Case "@OUTLOOK_MESSAGE@" + Case "|OUTLOOK_MESSAGE|" If LogErrorsOnly = False Then ClassLogger.Add(" >> .msg-file through dragdrop", False) Me.Text = "Indexierung der msg-Datei (ohne Anhang):" End Select - ElseIf DropType = "@MSGONLY@" Then + ElseIf DropType = "|MSGONLY|" Then Me.Text = "Indexierung der msg-Datei (ohne Anhang):" - ElseIf DropType = "@ATTMNTEXTRACTED@" Or DropType = "@OUTLOOK_ATTACHMENT@" Then + ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then CURRENT_ISATTACHMENT = True Me.Text = "Indexierung eines Email-Attachments:" - ElseIf DropType = "@FW_SIMPLEINDEXER@" Then + ElseIf DropType = "|FW_SIMPLEINDEXER|" Then Me.Text = "Indexierung einer Folderwatch-Datei:" End If txtIndexfilepath.Text = CURRENT_WORKFILE @@ -1602,8 +1741,11 @@ Public Class frmIndex lblhinweis.Visible = False lblerror.Visible = False Me.pnlIndex.Controls.Clear() - Dim sql As String = "Select WINDREAM_DIRECT from TBDD_DOKUMENTART WHERE GUID = " & cmbDokumentart.SelectedValue - WDDirect = ClassDatabase.Execute_Scalar(sql, MyConnectionString) + Dim sql As String = "Select WINDREAM_DIRECT, DUPLICATE_HANDLING from TBDD_DOKUMENTART WHERE GUID = " & cmbDokumentart.SelectedValue + Dim DT_DOKART As DataTable = ClassDatabase.Return_Datatable(sql) + + WDDirect = DT_DOKART.Rows(0).Item("WINDREAM_DIRECT") + CURRENT_DOKART_DUPLICATE_HANDLING = DT_DOKART.Rows(0).Item("DUPLICATE_HANDLING") Refresh_IndexeMan(cmbDokumentart.SelectedValue) End If @@ -1613,12 +1755,12 @@ Public Class frmIndex Private Sub Refresh_IndexeMan(dokartid As Integer) Dim sql Try - Sql = "select T1.BEZEICHNUNG AS DOKUMENTART,T.* from TBDD_INDEX_MAN T, TBDD_DOKUMENTART T1 where T.ACTIVE = 1 AND T.DOK_ID = T1.GUID AND T.DOK_ID = " & dokartid & " ORDER BY T.SEQUENCE" + sql = "select T1.BEZEICHNUNG AS DOKUMENTART,T.* from TBDD_INDEX_MAN T, TBDD_DOKUMENTART T1 where T.ACTIVE = 1 AND T.DOK_ID = T1.GUID AND T.DOK_ID = " & dokartid & " ORDER BY T.SEQUENCE" DT_INDEXEMAN = ClassDatabase.Return_Datatable(sql) pnlIndex.Visible = True LoadIndexe_Man() Catch ex As System.Exception - ClassLogger.Add(" - Fehler Refresh_IndexeMan: DOKART-ID: " & dokartid & " - Fehler: " & vbNewLine & ex.Message & vbNewLine & Sql) + ClassLogger.Add(" - Fehler Refresh_IndexeMan: DOKART-ID: " & dokartid & " - Fehler: " & vbNewLine & ex.Message & vbNewLine & sql) MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Refresh_IndexeMan:") End Try End Sub @@ -1723,6 +1865,7 @@ Public Class frmIndex If DT_INDEXAUTOM.Rows.Count > 0 Then ' MsgBox(DT.Rows.Count.ToString) For Each DR_AUTOINDEX As DataRow In DT_INDEXAUTOM.Rows + Dim optionalIndex As Boolean Dim indexname As String = DR_AUTOINDEX.Item("INDEXNAME") If LogErrorsOnly = False Then ClassLogger.Add(" >> Build Automatischer Index '" & indexname & "'", False) If DR_AUTOINDEX.Item("SQL_RESULT").ToString <> String.Empty And CBool(DR_AUTOINDEX.Item("SQL_ACTIVE")) = True Then @@ -1736,6 +1879,7 @@ Public Class frmIndex Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(SqlString) ' alle Vorkommen der Indexe im SQL-String durchlaufen For Each element As System.Text.RegularExpressions.Match In elemente + ' MsgBox(element.Value.ToUpper) If LogErrorsOnly = False Then ClassLogger.Add(" >> Element: '" & element.Value & "'", False) '' wenn es sich nicht um dedizeirte Werte handelt (es sollen ja nur die Indexe ausgelesen werden) @@ -1743,17 +1887,60 @@ Public Class frmIndex 'die Zeichen [% und ] entfernen (liefert den wirklichen windream-Index) Dim elementOhneSonderzeichen As String = element.Value.Substring(2, element.Value.Length - 3) If LogErrorsOnly = False Then ClassLogger.Add(" >> elementOhneSonderzeichen: '" & elementOhneSonderzeichen & "'", False) - 'den Platzhalter im SQL-String durch den Wert ersetzen - Dim manIndexwert = GetManIndex_Value(elementOhneSonderzeichen, "IDX_AUTO") + optionalIndex = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & elementOhneSonderzeichen & "')", MyConnectionString, True) + If elementOhneSonderzeichen.StartsWith("$") Then 'windowsParameter + Dim result = "" + Try + Select Case elementOhneSonderzeichen.ToString.ToUpper + Case "$filename_ext".ToUpper + result = Path.GetFileName(CURRENT_WORKFILE) + Case "$filename".ToUpper + result = Path.GetFileNameWithoutExtension(CURRENT_WORKFILE) + Case "$extension".ToUpper + result = Path.GetExtension(CURRENT_WORKFILE) + result = result.Replace(".", "") + Case "$FileCreateDate".ToUpper + Dim FI As New FileInfo(CURRENT_WORKFILE) + Dim CreationDate As Date = FI.CreationTime + result = CreationDate.ToShortDateString + Case "$FileCreatedWho".ToUpper + Dim fs As FileSecurity = File.GetAccessControl(CURRENT_WORKFILE) + Dim sid As IdentityReference = fs.GetOwner(GetType(SecurityIdentifier)) + Dim ntaccount As IdentityReference = sid.Translate(GetType(NTAccount)) + Dim owner As String = ntaccount.ToString() + result = owner + Case "$DateDDMMYYY".ToUpper + result = System.DateTime.Now.ToShortDateString + Case "$Username" + result = Environment.UserName + Case "$Usercode" + result = CURRENT_USER_SHORT + End Select + Catch ex As Exception + result = "XXX" + ClassLogger.Add(" - Unexpected error in FillIndexe_Autom - WindowsFilePatterns - Fehler: " & vbNewLine & ex.Message) + MsgBox("Unexpected error in Replacement WindowsFilePatterns: " & vbNewLine & ex.Message & vbNewLine & vbNewLine & "Routine will continue - Please check logfile", MsgBoxStyle.Exclamation, ) + End Try + If result <> "" Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> file-related parameter found: '" & elementOhneSonderzeichen & "' - Result: '" & result & "'", False) + SqlString = SqlString.Replace(element.Value, result) + Else + ClassLogger.Add(">> Attention: file-related parameter '" & elementOhneSonderzeichen & "' returned an empty string!", False) + End If + Else 'ganz normaler manueller Index + 'den Platzhalter im SQL-String durch den Wert ersetzen + Dim manIndexwert = GetManIndex_Value(elementOhneSonderzeichen, "IDX_AUTO", optionalIndex) + If Not IsNothing(manIndexwert) Then + SqlString = SqlString.Replace(element.Value, manIndexwert) - If Not IsNothing(manIndexwert) Then - SqlString = SqlString.Replace(element.Value, manIndexwert) - If LogErrorsOnly = False Then ClassLogger.Add(" >> zusammengesetzter SQL-String: " & SqlString, False) - Else - ClassLogger.Add(">> Attention: manIndexwert is NOTHING - Funktion: FillIndexe_Autom", False) - Return False + Else + ClassLogger.Add(">> Attention: manIndexwert is NOTHING - Funktion: FillIndexe_Autom", False) + ' Return False + End If End If + Next + If LogErrorsOnly = False Then ClassLogger.Add(" >> Replaced and complete SQL-result: " & SqlString, False) If LogErrorsOnly = False Then ClassLogger.Add(" >> Ausführen SQL....", False) Dim automatischerValue As String = "" automatischerValue = Get_AutomatischerIndex_SQL(SqlString, DR_AUTOINDEX.Item("CONNECTION_ID"), DR_AUTOINDEX.Item("SQL_PROVIDER")) @@ -1762,9 +1949,16 @@ Public Class frmIndex DR_AUTOINDEX.Item("Indexiert") = True DR_AUTOINDEX.Item("Indexwert") = automatischerValue Else - ClassLogger.Add(" - ACHTUNG: automatischerValue = String.Empty - Funktion: FillIndexe_Autom", False) - ClassLogger.Add(" - SqlString: " & SqlString, False) - Return False + If optionalIndex = True Then + DR_AUTOINDEX.Item("Indexiert") = True + DR_AUTOINDEX.Item("Indexwert") = "EMPTY_OI" + ' Return True + Else + ClassLogger.Add(" - ACHTUNG: automatischerValue = String.Empty - Funktion: FillIndexe_Autom", False) + ClassLogger.Add(" - SqlString: " & SqlString, False) + ' Return False + End If + End If Else If Not IsDBNull(DR_AUTOINDEX.Item("VALUE")) Then @@ -1778,6 +1972,8 @@ Public Class frmIndex DEFAULTVALUE = Path.GetFileName(CURRENT_WORKFILE) Case "$filename".ToUpper DEFAULTVALUE = Path.GetFileNameWithoutExtension(CURRENT_WORKFILE) + Case "$extension".ToUpper + DEFAULTVALUE = Path.GetExtension(CURRENT_WORKFILE) Case "$FileCreateDate".ToUpper Dim FI As New FileInfo(CURRENT_WORKFILE) Dim CreationDate As Date = FI.CreationTime @@ -1851,7 +2047,6 @@ Public Class frmIndex End If Next Case ".xlsx" - Console.WriteLine("xlsx file") Dim pProcess() As Process = System.Diagnostics.Process.GetProcessesByName("excel") Dim filename As String = Path.GetFileNameWithoutExtension(CURRENT_WORKFILE) For Each p As Process In pProcess @@ -1862,7 +2057,6 @@ Public Class frmIndex Case Else If My.Settings.DoNot_Show_Documents = False And UniversalViewer_Path <> "" Then If File.Exists(UniversalViewer_Path) Then - Console.WriteLine(Path.GetExtension(CURRENT_WORKFILE)) Dim psi As New ProcessStartInfo(UniversalViewer_Path, """" & CURRENT_WORKFILE & """") Proc.EnableRaisingEvents = True Proc.StartInfo = psi @@ -1978,6 +2172,7 @@ Public Class frmIndex If LogErrorsOnly = False Then ClassLogger.Add(" >> Datei " & CURRENT_WORKFILE & " wird nun indexiert...", False) If FillIndexe_Autom(Me.cmbDokumentart.SelectedValue) = True Then If LogErrorsOnly = False Then ClassLogger.Add(" ...FillIndexe_Autom durchlaufen", False) + 'Den Zielnamen zusammenbauen If Name_Generieren() = True Then If LogErrorsOnly = False Then ClassLogger.Add(" ...Name_Generieren durchlaufen", False) @@ -1988,23 +2183,23 @@ Public Class frmIndex If Move_File2_Target() = True Then If LogErrorsOnly = False Then ClassLogger.Add(" ...Move_File2_Target durchlaufen", False) 'Die Originaldatei löschen - If DropType = "@DROPFROMFSYSTEM@" Then + If DropType = "|DROPFROMFSYSTEM|" Then If chkdelete_origin.Checked = True Then 'Die temporäre Datei löschen DeleteFile() End If - ElseIf DropType = "@ATTMNTEXTRACTED@" Or DropType = "@OUTLOOK_ATTACHMENT@" Then + ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then 'Die temporäre Datei löschen If CURRENT_WORKFILE.EndsWith("pdf") Then Me.PdfViewer1.DocumentFilePath = "" End If DeleteFile() - ElseIf (DropType = "@OUTLOOK_MESSAGE@" Or DropType = "@FW_MSGONLY@" Or DropType = "@MSGONLY@") Then + ElseIf (DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Or DropType = "|MSGONLY|") Then 'Die temporäre Datei löschen DeleteFile() - ElseIf DropType = "@FW_SIMPLEINDEXER@" Then + ElseIf DropType = "|FW_SIMPLEINDEXER|" Then 'Die temporäre Datei löschen DeleteFile() @@ -2059,11 +2254,11 @@ Public Class frmIndex CURRENT_WORKFILE = filerow.Item("FILENAME2WORK") DropType = filerow.Item("HANDLE_TYPE") 'Dim HandleType As String = filerow.Item("HANDLE_TYPE") - 'If HandleType = "@DROPFROMFSYSTEM@" Then + 'If HandleType = "|DROPFROMFSYSTEM|" Then ' DropType = "dragdrop file" - 'ElseIf HandleType = "@OUTLOOK_ATTMNT@" Then + 'ElseIf HandleType = "|OUTLOOK_ATTMNT|" Then ' DropType = "dragdrop attachment" - 'ElseIf HandleType = "@OUTLOOKMESSAGE@" Then + 'ElseIf HandleType = "|OUTLOOKMESSAGE|" Then ' DropType = "dragdrop message" 'End If If WORK_FILE() = False Then @@ -2115,9 +2310,9 @@ Public Class frmIndex End If End If - If DropType = "@DROPFROMFSYSTEM@" Or DropType = "@OUTLOOK_ATTACHMENT@" Or DropType = "@ATTMNTEXTRACTED@" Or DropType = "@FW_SIMPLEINDEXER@" Then + If DropType = "|DROPFROMFSYSTEM|" Or DropType = "|OUTLOOK_ATTACHMENT|" Or DropType = "|ATTMNTEXTRACTED|" Or DropType = "|FW_SIMPLEINDEXER|" Then exp2WD = SINGLEFILE_2_WINDREAM(CURR_DOKART_OBJECTTYPE) - ElseIf DropType = "@OUTLOOK_MESSAGE@" Or DropType = "@FW_MSGONLY@" Or DropType = "@MSGONLY@" Then + ElseIf DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Or DropType = "|MSGONLY|" Then exp2WD = SINGLEFILE_2_WINDREAM(CURR_DOKART_OBJECTTYPE) End If If exp2WD = True Then @@ -2136,14 +2331,14 @@ Public Class frmIndex Try Insert_String = sql_history_INSERT_INTO & ",ADDED_WHO) VALUES ('" & CURRENT_WORKFILE & "','" & CURRENT_NEWFILENAME & "'" & sql_history_Index_Values & ",'" & Environment.UserDomainName & "\" & Environment.UserName & "')" ClassDatabase.Execute_Scalar(Insert_String, MyConnectionString, True) - If DropType.Contains("MSG") Or DropType = "@ATTMNTEXTRACTED@" Or DropType = "@OUTLOOK_ATTACHMENT@" Then + If DropType.Contains("MSG") Or DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then If CURRENT_MESSAGEID <> "" Then Dim max As String = "SELECT MAX(GUID) FROM TBGI_HISTORY" Dim GUID = ClassDatabase.Execute_Scalar(max, MyConnectionString, True) Try If GUID > 0 Then Dim sqlUpdate As String - If DropType = "@ATTMNTEXTRACTED@" Or DropType = "@OUTLOOK_ATTACHMENT@" Then + If DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then sqlUpdate = "Update TBGI_HISTORY SET ATTACHMENT = 1, MSG_ID = '" & CURRENT_MESSAGEID & "' WHERE GUID = " & GUID ClassDatabase.Execute_non_Query(sqlUpdate, True) Else @@ -2187,7 +2382,6 @@ Public Class frmIndex Private Sub PdfViewer1_ZoomChanged(sender As Object, e As DevExpress.XtraPdfViewer.PdfZoomChangedEventArgs) If Not PdfViewer1.ZoomMode = DevExpress.XtraPdfViewer.PdfZoomMode.Custom Then - Console.WriteLine(PdfViewer1.ZoomMode) 'SaveMySettingsValue("PDFViewer_ZoomMode", PdfViewer1.ZoomMode) 'PDFViewer_ZoomMode = PdfViewer1.ZoomMode End If @@ -2221,14 +2415,14 @@ Public Class frmIndex ' alle Vorkommen innerhalb des Ordnerstrings durchlaufen For Each element As System.Text.RegularExpressions.Match In elemente If LogErrorsOnly = False Then ClassLogger.Add(" >> Elementname in FolderString: '" & element.ToString & "'", False) - Console.WriteLine(element.ToString) Select Case element.Value.Substring(2, 1).ToUpper 'Manueller Indexwert Case "M" Dim ManIndexname = element.Value.Substring(3, element.Value.Length - 4) + Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & ManIndexname & "')", MyConnectionString, True) If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch den Indexwert aus '" & ManIndexname & "' auszulesen.", False) - Dim ManIndex_Value As String = GetManIndex_Value(ManIndexname, "FILE") + Dim ManIndex_Value As String = GetManIndex_Value(ManIndexname, "FILE", optional_index) If LogErrorsOnly = False Then ClassLogger.Add(" >> Ergebnis/Wert für neuen Ordner: '" & ManIndexname & "'", False) If Not ManIndex_Value = String.Empty Then If IsDate(ManIndex_Value) Then @@ -2237,7 +2431,7 @@ Public Class frmIndex folderindex = folderindex.Replace(element.ToString, ManIndex_Value) If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPattern: '" & folderindex & "'", False) Else - Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & ManIndexname & "')", MyConnectionString, True) + If optional_index = True Then If LogErrorsOnly = False Then ClassLogger.Add(" >> Optionaler Indexwert ist NICHT gefüllt", False) Else @@ -2251,8 +2445,13 @@ Public Class frmIndex Dim AutoIndex_Value As String = GetAutoIndex_Value(AutoIndexname) If LogErrorsOnly = False Then ClassLogger.Add(" >> Ergebnis/Wert für neuen Ordner: '" & AutoIndexname & "'", False) If Not AutoIndex_Value = String.Empty Then - folderindex = folderindex.Replace(element.ToString, AutoIndex_Value) - If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPattern: '" & folderindex & "'", False) + If AutoIndex_Value = "EMPTY_OI" Then + folderindex = folderindex.Replace(element.ToString, "") + Else + folderindex = folderindex.Replace(element.ToString, AutoIndex_Value) + If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPattern: '" & folderindex & "'", False) + End If + Else ClassLogger.Add(" - Achtung Ausnahme in 'CrFolderForIndex': der Index ist leer!", True) End If @@ -2316,38 +2515,65 @@ Public Class frmIndex End If - 'Die aktuelle Datei soll gleichzeitig verschoben werden - Dim extension As String = Path.GetExtension(CURRENT_NEWFILENAME) - Dim Dateiname As String = Path.GetFileName(CURRENT_NEWFILENAME) - Dim _Pfad, _WDLaufwerk, _Ziel As String - _Ziel = fullpath & Dateiname - If LogErrorsOnly = False Then ClassLogger.Add(" >> Ziel: " & _Ziel, False) - 'Nur verschieben und überprüfen wenn Pfad ungleich - Dim quell = Path.GetDirectoryName(CURRENT_NEWFILENAME) - Dim ziel = Path.GetDirectoryName(_Ziel) - If quell <> ziel Then - Dim Stammname As String = _Ziel.Substring(0, _Ziel.LastIndexOf(".")) - Dim version As Integer = 2 - Do While File.Exists(_Ziel) = True - If LogErrorsOnly = False Then ClassLogger.Add(" >> Achtung: Datei ' " & Path.GetFileName(_Ziel) & "' existiert bereits!", False) - Dim neuername As String = Stammname & "~" & version & extension - _Ziel = neuername - version = version + 1 - Loop - CURRENT_NEWFILENAME = _Ziel - ' My.Computer.FileSystem.MoveFile(fullfilename, _Ziel) - ClassLogger.Add(" >> Dateiname wurde nach CrFolderIndex-Methode erzeugt", False) - CURRENT_NEWFILENAME = _Ziel - Else - ClassLogger.Add(" >> Quell- und Zielordner identisch", False) - 'ClassLogger.Add(" >> (CrFolderForIndex) Quell- und Zielordner identisch", False) - 'If Path.GetFileName(fullfilename) <> Path.GetFileName(_Ziel) And File.Exists(_Ziel) Then - ' ClassLogger.Add(" >> (CrFolderForIndex) Quell- und Zielname nicht identisch", False) - ' FileSystem.Rename(_Ziel, Path.GetDirectoryName(_Ziel) & Path.GetFileName(fullfilename)) - ' ClassLogger.Add(" >> Datei wurde nach CrFolderIndex-Methode umbenannt", False) - ' CURRENT_NEWFILENAME = _Ziel - 'End If - End If + ''Die aktuelle Datei soll gleichzeitig verschoben werden + 'Dim extension As String = Path.GetExtension(CURRENT_NEWFILENAME) + 'Dim Dateiname As String = Path.GetFileName(CURRENT_NEWFILENAME) + 'Dim _Pfad, _WDLaufwerk, _Ziel As String + '_Ziel = fullpath & Dateiname + 'If LogErrorsOnly = False Then ClassLogger.Add(" >> Ziel: " & _Ziel, False) + ''Nur verschieben und überprüfen wenn Pfad ungleich + 'Dim quell = Path.GetDirectoryName(CURRENT_NEWFILENAME) + 'Dim ziel = Path.GetDirectoryName(_Ziel) + 'If quell <> ziel Then + ' If CURRENT_DOKART_DUPLICATE_HANDLING = "Default" Or CURRENT_DOKART_DUPLICATE_HANDLING = "Question" Then + ' ''########## + ' Dim msg = "Eine Datei mit identischem Namen existiert bereits! Wollen Sie die bestehende Datei ersetzen?" + ' If USER_LANGUAGE <> "de-DE" Then + ' msg = "Ther is already a file with the same name! Would You like to replace the file?" + ' End If + ' Dim result As MsgBoxResult + ' result = MessageBox.Show(msg, "File alredy exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + ' If result = MsgBoxResult.No Then + ' _Ziel = ClassFilehandle.Versionierung_Datei(_Ziel).ToString.Substring(2) + ' Else + ' If ClassWindream.Delete_WDFile(_Ziel.Substring(2)) = False Then + ' Return False + ' End If + ' End If + ' ElseIf CURRENT_DOKART_DUPLICATE_HANDLING = "New version" Then + ' _Ziel = ClassFilehandle.Versionierung_Datei(_Ziel).ToString.Substring(2) + ' End If + + + + + + ' 'Dim Stammname As String = _Ziel.Substring(0, _Ziel.LastIndexOf(".")) + ' 'Dim version As Integer = 2 + ' 'Do While File.Exists(_Ziel) = True + ' ' If LogErrorsOnly = False Then ClassLogger.Add(" >> Achtung: Datei ' " & Path.GetFileName(_Ziel) & "' existiert bereits!", False) + ' ' Dim neuername As String = Stammname & "~" & version & extension + ' ' _Ziel = neuername + ' ' version = version + 1 + ' 'Loop + ' If _Ziel.StartsWith("\") Then + ' CURRENT_NEWFILENAME = "W:" & _Ziel + ' Else + ' CURRENT_NEWFILENAME = _Ziel + ' End If + + ' ' My.Computer.FileSystem.MoveFile(fullfilename, _Ziel) + ' ClassLogger.Add(" >> Dateiname wurde nach CrFolderIndex-Methode erzeugt", False) + 'Else + ' ClassLogger.Add(" >> Quell- und Zielordner identisch", False) + ' 'ClassLogger.Add(" >> (CrFolderForIndex) Quell- und Zielordner identisch", False) + ' 'If Path.GetFileName(fullfilename) <> Path.GetFileName(_Ziel) And File.Exists(_Ziel) Then + ' ' ClassLogger.Add(" >> (CrFolderForIndex) Quell- und Zielname nicht identisch", False) + ' ' FileSystem.Rename(_Ziel, Path.GetDirectoryName(_Ziel) & Path.GetFileName(fullfilename)) + ' ' ClassLogger.Add(" >> Datei wurde nach CrFolderIndex-Methode umbenannt", False) + ' ' CURRENT_NEWFILENAME = _Ziel + ' 'End If + 'End If Return True 'Else diff --git a/Global_Indexer/frmIndexFileList.resx b/Global_Indexer/frmIndexFileList.resx index 3131e64..ea8c1d5 100644 --- a/Global_Indexer/frmIndexFileList.resx +++ b/Global_Indexer/frmIndexFileList.resx @@ -227,7 +227,7 @@ Sie haben nun Möglichkeit die Indexierung für ausgewählte Dateien zu verhinde CheckedListBoxControl1 - DevExpress.XtraEditors.CheckedListBoxControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.CheckedListBoxControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this diff --git a/Global_Indexer/frmIndexFileList.vb b/Global_Indexer/frmIndexFileList.vb index fe6b99f..ae77c59 100644 --- a/Global_Indexer/frmIndexFileList.vb +++ b/Global_Indexer/frmIndexFileList.vb @@ -25,7 +25,7 @@ Dim _file = row.Item(1) Dim handletype As String = row.Item("HANDLE_TYPE") - If handletype = "@MSGONLY@" Or handletype = "@ATTMNTEXTRACTED@" Then + If handletype = "|MSGONLY|" Or handletype = "|ATTMNTEXTRACTED|" Then Try IO.File.Delete(_file) Catch ex As Exception diff --git a/Global_Indexer/frmNamenkonvention.designer.vb b/Global_Indexer/frmNamenkonvention.designer.vb index 56b5c97..bed2bb1 100644 --- a/Global_Indexer/frmNamenkonvention.designer.vb +++ b/Global_Indexer/frmNamenkonvention.designer.vb @@ -231,7 +231,7 @@ Partial Class frmNamenkonvention ' resources.ApplyResources(Me.cmbDate, "cmbDate") Me.cmbDate.FormattingEnabled = True - Me.cmbDate.Items.AddRange(New Object() {resources.GetString("cmbDate.Items"), resources.GetString("cmbDate.Items1"), resources.GetString("cmbDate.Items2"), resources.GetString("cmbDate.Items3")}) + Me.cmbDate.Items.AddRange(New Object() {resources.GetString("cmbDate.Items"), resources.GetString("cmbDate.Items1"), resources.GetString("cmbDate.Items2"), resources.GetString("cmbDate.Items3"), resources.GetString("cmbDate.Items4"), resources.GetString("cmbDate.Items5"), resources.GetString("cmbDate.Items6"), resources.GetString("cmbDate.Items7")}) Me.cmbDate.Name = "cmbDate" ' 'Label20 diff --git a/Global_Indexer/frmNamenkonvention.resx b/Global_Indexer/frmNamenkonvention.resx index 4904680..c23bbe0 100644 --- a/Global_Indexer/frmNamenkonvention.resx +++ b/Global_Indexer/frmNamenkonvention.resx @@ -640,6 +640,18 @@ Indizes und Textbausteinen zusammenzustellen. DD_MM_YYYY + + YYMMDD + + + YYYYMMDD + + + DDMMYY + + + DDMMYYYY + 21, 259 diff --git a/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb b/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb index 4f70689..0d58945 100644 --- a/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb +++ b/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb @@ -58,6 +58,9 @@ Partial Class SQLConfigAutoIndex Me.cmbFromTables = New System.Windows.Forms.ComboBox() Me.cmbWhereColumns = New System.Windows.Forms.ComboBox() Me.Label8 = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.cmbwindowsParam = New System.Windows.Forms.ComboBox() + Me.btnaddWindowPAram = New System.Windows.Forms.Button() SQL_ERGEBNISLabel = New System.Windows.Forms.Label() Label3 = New System.Windows.Forms.Label() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -297,10 +300,32 @@ Partial Class SQLConfigAutoIndex resources.ApplyResources(Me.Label8, "Label8") Me.Label8.Name = "Label8" ' + 'Label5 + ' + resources.ApplyResources(Me.Label5, "Label5") + Me.Label5.Name = "Label5" + ' + 'cmbwindowsParam + ' + Me.cmbwindowsParam.FormattingEnabled = True + Me.cmbwindowsParam.Items.AddRange(New Object() {resources.GetString("cmbwindowsParam.Items"), resources.GetString("cmbwindowsParam.Items1"), resources.GetString("cmbwindowsParam.Items2"), resources.GetString("cmbwindowsParam.Items3"), resources.GetString("cmbwindowsParam.Items4"), resources.GetString("cmbwindowsParam.Items5"), resources.GetString("cmbwindowsParam.Items6"), resources.GetString("cmbwindowsParam.Items7")}) + resources.ApplyResources(Me.cmbwindowsParam, "cmbwindowsParam") + Me.cmbwindowsParam.Name = "cmbwindowsParam" + ' + 'btnaddWindowPAram + ' + Me.btnaddWindowPAram.Image = Global.Global_Indexer.My.Resources.Resources.action_add_16xMD + resources.ApplyResources(Me.btnaddWindowPAram, "btnaddWindowPAram") + Me.btnaddWindowPAram.Name = "btnaddWindowPAram" + Me.btnaddWindowPAram.UseVisualStyleBackColor = True + ' 'SQLConfigAutoIndex ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.btnaddWindowPAram) + Me.Controls.Add(Me.cmbwindowsParam) + Me.Controls.Add(Me.Label5) Me.Controls.Add(Label3) Me.Controls.Add(Me.GroupBox4) Me.Controls.Add(Me.Label2) @@ -360,4 +385,7 @@ Partial Class SQLConfigAutoIndex Friend WithEvents radioTable As System.Windows.Forms.RadioButton Friend WithEvents radioView As System.Windows.Forms.RadioButton Friend WithEvents Label4 As System.Windows.Forms.Label + Friend WithEvents Label5 As System.Windows.Forms.Label + Friend WithEvents cmbwindowsParam As System.Windows.Forms.ComboBox + Friend WithEvents btnaddWindowPAram As System.Windows.Forms.Button End Class diff --git a/Global_Indexer/frmSQLConfigAutoIndex.resx b/Global_Indexer/frmSQLConfigAutoIndex.resx index fd46b58..d9eee6e 100644 --- a/Global_Indexer/frmSQLConfigAutoIndex.resx +++ b/Global_Indexer/frmSQLConfigAutoIndex.resx @@ -147,7 +147,7 @@ $this - 12 + 15 False @@ -177,7 +177,7 @@ $this - 0 + 3 MiddleLeft @@ -207,7 +207,7 @@ $this - 11 + 14 Consolas, 8.25pt @@ -238,7 +238,7 @@ $this - 13 + 16 127, 17 @@ -265,7 +265,7 @@ $this - 10 + 13 371, 17 @@ -301,7 +301,7 @@ $this - 9 + 12 Segoe UI, 8.25pt, style=Bold @@ -334,7 +334,7 @@ $this - 8 + 11 True @@ -367,7 +367,7 @@ $this - 7 + 10 True @@ -394,7 +394,7 @@ $this - 6 + 9 782, 17 @@ -418,7 +418,7 @@ $this - 5 + 8 1017, 17 @@ -442,7 +442,7 @@ $this - 4 + 7 True @@ -472,7 +472,7 @@ $this - 2 + 5 True @@ -508,7 +508,7 @@ $this - 3 + 6 True @@ -847,8 +847,104 @@ $this + 4 + + + True + + + 12, 365 + + + 165, 13 + + + 88 + + + Platzhalter windows-variablen: + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Dateiname (mit Endung) + + + Dateiname (ohne Endung) + + + Dateiendung + + + Datei Erstelldatum + + + Datei Erstellt wer + + + Aktuelles Datum (DD.MM.YYYY) + + + Username + + + Usercode + + + 15, 381 + + + 204, 21 + + + 89 + + + cmbwindowsParam + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 1 + + NoControl + + + 225, 381 + + + 27, 21 + + + 90 + + + btnaddWindowPAram + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True diff --git a/Global_Indexer/frmSQLConfigAutoIndex.vb b/Global_Indexer/frmSQLConfigAutoIndex.vb index 5f4092c..c3fd769 100644 --- a/Global_Indexer/frmSQLConfigAutoIndex.vb +++ b/Global_Indexer/frmSQLConfigAutoIndex.vb @@ -374,4 +374,36 @@ Public Class SQLConfigAutoIndex Dim table = cmbFromTables.Text GetColumns(table, cmbWhereColumns) End Sub + + Private Sub btnaddWindowPAram_Click(sender As Object, e As EventArgs) Handles btnaddWindowPAram.Click + If cmbwindowsParam.SelectedIndex <> -1 Then + If Not cmbwindowsParam.Text = String.Empty Then + Dim placeholder As String + Dim pattern As String = "" + Select Case cmbwindowsParam.Text.ToString.ToUpper + Case "Dateiname (mit Endung)".ToUpper + pattern = "$filename_ext".ToUpper + Case "Dateiname (ohne Endung)".ToUpper + pattern = "$filename".ToUpper + Case "Dateiendung".ToUpper + pattern = "$extension".ToUpper + Case "Datei Erstelldatum".ToUpper + pattern = "$FileCreateDate".ToUpper + Case "Datei Erstellt wer".ToUpper + pattern = "$FileCreatedWho".ToUpper + Case "Aktuelles Datum (DD.MM.YYYY)".ToUpper + pattern = "$DateDDMMYYY".ToUpper + Case "Username" + pattern = "$Username".ToUpper + Case "Usercode" + pattern = "$Usercode".ToUpper + End Select + placeholder = "[%" & pattern & "]" + If placeholder <> "" Then + SQL_ERGEBNISTextBox.Text = SQL_ERGEBNISTextBox.Text.Insert(CurrentPosition, placeholder) + End If + + End If + End If + End Sub End Class \ No newline at end of file diff --git a/Global_Indexer/frmSQL_Admin.resx b/Global_Indexer/frmSQL_Admin.resx index 616d3c3..7ef544d 100644 --- a/Global_Indexer/frmSQL_Admin.resx +++ b/Global_Indexer/frmSQL_Admin.resx @@ -289,7 +289,7 @@ XtraTabPage1 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -328,7 +328,7 @@ GridControl1 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage2 @@ -482,7 +482,7 @@ XtraTabPage2 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -494,7 +494,7 @@ XtraTabControl1 - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -664,7 +664,7 @@ GridView1 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BindingNavigatorCountItem diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index 75354c0..818d09c 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -559,7 +559,7 @@ in diesen Bereich oder LabelControl1 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -1634,31 +1634,31 @@ in diesen Bereich oder LabelMachine - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelUser - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelLoggedIn - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelVersion - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a RibbonMiniToolbar1 - DevExpress.XtraBars.Ribbon.RibbonMiniToolbar, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonMiniToolbar, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a MyDataset diff --git a/Global_Indexer/frmStart.resx.bak b/Global_Indexer/frmStart.resx.bak index 1bc92dc..75354c0 100644 --- a/Global_Indexer/frmStart.resx.bak +++ b/Global_Indexer/frmStart.resx.bak @@ -146,13 +146,13 @@ 217, 22 - Grundeinstellungen User + User Basis Einstellungen 217, 22 - Hotkey-Funktion User + Hotkeys User 217, 22 @@ -176,7 +176,7 @@ 0, 0 - 393, 24 + 335, 24 @@ -209,17 +209,11 @@ False - - 121, 17 - - - ToolStripStatusLabel1 - - 0, 188 + 0, 126 - 393, 22 + 335, 22 6 @@ -549,23 +543,23 @@ Comic Sans MS, 12pt - 53, 63 + 24, 32 - 282, 46 + 280, 46 8 - Ziehen Sie Dateien per Drag and Drop -hierher oder + Ziehen Sie Dateien mit Drag and Drop +in diesen Bereich oder LabelControl1 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -613,7 +607,7 @@ hierher oder NoControl - 53, 115 + 24, 84 282, 37 @@ -646,7 +640,7 @@ hierher oder 6, 13 - 393, 210 + 335, 148 Segoe UI, 8.25pt @@ -1606,12 +1600,6 @@ hierher oder System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tslblCultureInfo - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TimerFolderWatch @@ -1646,31 +1634,31 @@ hierher oder LabelMachine - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelUser - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelLoggedIn - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelVersion - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a RibbonMiniToolbar1 - DevExpress.XtraBars.Ribbon.RibbonMiniToolbar, DevExpress.XtraBars.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonMiniToolbar, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a MyDataset diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index ae3af29..29f7bd3 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -222,14 +222,14 @@ Public Class frmStart Sub Drag_Enter(sender As Object, e As DragEventArgs) If e.Data.GetDataPresent(DataFormats.FileDrop) Then e.Effect = DragDropEffects.All - Console.WriteLine("DragEnter ...DragDrop") + ' Console.WriteLine("DragEnter ...DragDrop") ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then 'handle a message dragged from Outlook e.Effect = DragDropEffects.Copy - Console.WriteLine("DragEnter ...OutlookMessage") + ' Console.WriteLine("DragEnter ...OutlookMessage") ElseIf e.Data.GetDataPresent("aryFileGroupDescriptor") AndAlso (e.Data.GetDataPresent("FileContents")) Then e.Effect = DragDropEffects.Copy - Console.WriteLine("DragEnter ...Attachment from Outlook") + ' Console.WriteLine("DragEnter ...Attachment from Outlook") Else 'otherwise, do not handle e.Effect = DragDropEffects.None @@ -245,13 +245,13 @@ Public Class frmStart For Each Str As Object In ClassDragDrop.files_dropped If Not Str Is Nothing Then If LogErrorsOnly = False Then ClassLogger.Add(">> Check Drop-File: " & Str.ToString, False) - Dim handleType As String = Str.Substring(0, Str.LastIndexOf("@") + 1) - Dim filename As String = Str.Substring(Str.LastIndexOf("@") + 1) + Dim handleType As String = Str.Substring(0, Str.LastIndexOf("|") + 1) + Dim filename As String = Str.Substring(Str.LastIndexOf("|") + 1) If ClassIndexFunctions.FileExistsinDropTable(filename) = False Then ClassFilehandle.Decide_FileHandle(filename, handleType) i += 1 Else - Console.WriteLine("File gibt es bereits") + ' Console.WriteLine("File gibt es bereits") End If End If @@ -324,14 +324,14 @@ Public Class frmStart Dim filestring As String = Filerow.Item("FILENAME2WORK") Dim handletype As String = Filerow.Item("HANDLE_TYPE") - If handletype = "@MSGONLY@" Or handletype = "@ATTMNTEXTRACTED@" Then + If handletype = "|MSGONLY|" Or handletype = "|ATTMNTEXTRACTED|" Then Try System.IO.File.Delete(filestring) Catch ex As Exception End Try - ElseIf handletype.StartsWith("@FW") Then + ElseIf handletype.StartsWith("|FW") Then containsfw_file = True End If Next @@ -609,7 +609,7 @@ Public Class frmStart Try If FW_started = True Then 'Prüfen ob alle Files abgearbeitet wurden - Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%@FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')" + Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')" DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True) If DTACTUAL_FILES.Rows.Count > 0 Then ABORT_INDEXING = False @@ -735,7 +735,7 @@ Public Class frmStart For Each fName In openFileDialog1.FileNames ReDim Preserve ClassDragDrop.files_dropped(i) ClassLogger.Add(">> Chosen File: " & fName, False) - ClassDragDrop.files_dropped(i) = "@DROPFROMFSYSTEM@" & fName + ClassDragDrop.files_dropped(i) = "|DROPFROMFSYSTEM|" & fName i += 1 Next TimerCheckDroppedFiles.Start() diff --git a/Global_Indexer/frmUserKonfig_AddUsers.designer.vb b/Global_Indexer/frmUserKonfig_AddUsers.designer.vb index 4ac2089..490da22 100644 --- a/Global_Indexer/frmUserKonfig_AddUsers.designer.vb +++ b/Global_Indexer/frmUserKonfig_AddUsers.designer.vb @@ -28,6 +28,15 @@ Partial Class frmUserKonfig_AddUsers Me.lbGroups = New System.Windows.Forms.ListBox() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel() + Me.GridControlUsers = New DevExpress.XtraGrid.GridControl() + Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.MyDataset = New Global_Indexer.MyDataset() + Me.GridViewUsers = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colSelect = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colUsername = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colPrename = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colSurname = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colEmail = New DevExpress.XtraGrid.Columns.GridColumn() Me.ToolStrip2 = New System.Windows.Forms.ToolStrip() Me.ToolStripLabel2 = New System.Windows.Forms.ToolStripLabel() Me.tbSelectEverything = New System.Windows.Forms.ToolStripButton() @@ -35,25 +44,16 @@ Partial Class frmUserKonfig_AddUsers Me.btnCancel = New System.Windows.Forms.Button() Me.btnAddUsers = New System.Windows.Forms.Button() Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components) - Me.MyDataset = New Global_Indexer.MyDataset() - Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.GridControlUsers = New DevExpress.XtraGrid.GridControl() - Me.GridViewUsers = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colSelect = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colUsername = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colPrename = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colSurname = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colEmail = New DevExpress.XtraGrid.Columns.GridColumn() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() Me.ToolStrip1.SuspendLayout() - Me.ToolStrip2.SuspendLayout() - CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlUsers, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewUsers, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ToolStrip2.SuspendLayout() Me.SuspendLayout() ' 'SplitContainer1 @@ -92,53 +92,6 @@ Partial Class frmUserKonfig_AddUsers resources.ApplyResources(Me.ToolStripLabel1, "ToolStripLabel1") Me.ToolStripLabel1.Name = "ToolStripLabel1" ' - 'ToolStrip2 - ' - Me.ToolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabel2, Me.tbSelectEverything, Me.tbSelectNone}) - resources.ApplyResources(Me.ToolStrip2, "ToolStrip2") - Me.ToolStrip2.Name = "ToolStrip2" - ' - 'ToolStripLabel2 - ' - resources.ApplyResources(Me.ToolStripLabel2, "ToolStripLabel2") - Me.ToolStripLabel2.Name = "ToolStripLabel2" - ' - 'tbSelectEverything - ' - Me.tbSelectEverything.Image = Global.Global_Indexer.My.Resources.Resources.CheckOutforEdit_13187_32x - resources.ApplyResources(Me.tbSelectEverything, "tbSelectEverything") - Me.tbSelectEverything.Name = "tbSelectEverything" - ' - 'tbSelectNone - ' - Me.tbSelectNone.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text - resources.ApplyResources(Me.tbSelectNone, "tbSelectNone") - Me.tbSelectNone.Name = "tbSelectNone" - ' - 'btnCancel - ' - resources.ApplyResources(Me.btnCancel, "btnCancel") - Me.btnCancel.Name = "btnCancel" - Me.btnCancel.UseVisualStyleBackColor = True - ' - 'btnAddUsers - ' - Me.btnAddUsers.Image = Global.Global_Indexer.My.Resources.Resources.add - resources.ApplyResources(Me.btnAddUsers, "btnAddUsers") - Me.btnAddUsers.Name = "btnAddUsers" - Me.btnAddUsers.UseVisualStyleBackColor = True - ' - 'MyDataset - ' - Me.MyDataset.DataSetName = "MyDataset" - Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' - 'TBAD_UsersBindingSource - ' - Me.TBAD_UsersBindingSource.DataMember = "TBAD_Users" - Me.TBAD_UsersBindingSource.DataSource = Me.MyDataset - ' 'GridControlUsers ' resources.ApplyResources(Me.GridControlUsers, "GridControlUsers") @@ -148,6 +101,16 @@ Partial Class frmUserKonfig_AddUsers Me.GridControlUsers.ShowOnlyPredefinedDetails = True Me.GridControlUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUsers}) ' + 'TBAD_UsersBindingSource + ' + Me.TBAD_UsersBindingSource.DataMember = "TBAD_Users" + Me.TBAD_UsersBindingSource.DataSource = Me.MyDataset + ' + 'MyDataset + ' + Me.MyDataset.DataSetName = "MyDataset" + Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' 'GridViewUsers ' Me.GridViewUsers.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewUsers.Appearance.EvenRow.BackColor"), System.Drawing.Color) @@ -200,6 +163,43 @@ Partial Class frmUserKonfig_AddUsers Me.colEmail.OptionsColumn.AllowEdit = False resources.ApplyResources(Me.colEmail, "colEmail") ' + 'ToolStrip2 + ' + Me.ToolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden + Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabel2, Me.tbSelectEverything, Me.tbSelectNone}) + resources.ApplyResources(Me.ToolStrip2, "ToolStrip2") + Me.ToolStrip2.Name = "ToolStrip2" + ' + 'ToolStripLabel2 + ' + resources.ApplyResources(Me.ToolStripLabel2, "ToolStripLabel2") + Me.ToolStripLabel2.Name = "ToolStripLabel2" + ' + 'tbSelectEverything + ' + Me.tbSelectEverything.Image = Global.Global_Indexer.My.Resources.Resources.CheckOutforEdit_13187_32x + resources.ApplyResources(Me.tbSelectEverything, "tbSelectEverything") + Me.tbSelectEverything.Name = "tbSelectEverything" + ' + 'tbSelectNone + ' + Me.tbSelectNone.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text + resources.ApplyResources(Me.tbSelectNone, "tbSelectNone") + Me.tbSelectNone.Name = "tbSelectNone" + ' + 'btnCancel + ' + resources.ApplyResources(Me.btnCancel, "btnCancel") + Me.btnCancel.Name = "btnCancel" + Me.btnCancel.UseVisualStyleBackColor = True + ' + 'btnAddUsers + ' + resources.ApplyResources(Me.btnAddUsers, "btnAddUsers") + Me.btnAddUsers.Image = Global.Global_Indexer.My.Resources.Resources.add + Me.btnAddUsers.Name = "btnAddUsers" + Me.btnAddUsers.UseVisualStyleBackColor = True + ' 'frmUserKonfig_AddUsers ' resources.ApplyResources(Me, "$this") @@ -214,12 +214,12 @@ Partial Class frmUserKonfig_AddUsers Me.SplitContainer1.ResumeLayout(False) Me.ToolStrip1.ResumeLayout(False) Me.ToolStrip1.PerformLayout() + CType(Me.GridControlUsers, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewUsers, System.ComponentModel.ISupportInitialize).EndInit() Me.ToolStrip2.ResumeLayout(False) Me.ToolStrip2.PerformLayout() - CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridControlUsers, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridViewUsers, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub diff --git a/Global_Indexer/frmUserKonfig_AddUsers.resx b/Global_Indexer/frmUserKonfig_AddUsers.resx index aa5cd6e..de71ef0 100644 --- a/Global_Indexer/frmUserKonfig_AddUsers.resx +++ b/Global_Indexer/frmUserKonfig_AddUsers.resx @@ -262,7 +262,7 @@ GridControlUsers - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainer1.Panel2 @@ -339,6 +339,9 @@ 1 + + Bottom, Right + 220, 425 @@ -363,6 +366,9 @@ 2 + + Bottom, Right + MiddleLeft @@ -875,6 +881,54 @@ System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + TBAD_UsersBindingSource + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MyDataset + + + Global_Indexer.MyDataset, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + GridViewUsers + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colSelect + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colUsername + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colPrename + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colSurname + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colEmail + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ToolStripLabel2 @@ -897,55 +951,7 @@ ToolTipController1 - DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - MyDataset - - - Global_Indexer.MyDataset, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - TBAD_UsersBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GridViewUsers - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colSelect - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colUsername - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colPrename - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colSurname - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colEmail - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a frmUserKonfig_AddUsers diff --git a/Global_Indexer/frmUserKonfig_AddUsers.vb b/Global_Indexer/frmUserKonfig_AddUsers.vb index abe13d3..dc7025b 100644 --- a/Global_Indexer/frmUserKonfig_AddUsers.vb +++ b/Global_Indexer/frmUserKonfig_AddUsers.vb @@ -278,12 +278,20 @@ Public Class frmUserKonfig_AddUsers Dim PRENAME As String = userldap.GivenName Dim NAME As String = userldap.Surname Dim USERNAME As String = userldap.SamAccountName + Dim _name = userldap.DisplayName + Dim _name1 = userldap.Name + Dim _name3 = userldap.Name Try newUserRow.Username = userldap.SamAccountName Catch ex As Exception newUserRow.Username = user.ToString End Try - Dim email As String = userldap.EmailAddress + Dim email As String + Try + email = userldap.EmailAddress + Catch ex As Exception + email = "" + End Try newUserRow.Prename = PRENAME newUserRow.Surname = NAME newUserRow.Email = email @@ -301,7 +309,7 @@ Public Class frmUserKonfig_AddUsers Dim usersAdded As Integer = 0 For Each row As DataRow In MyDataset.TBAD_Users.Rows - If row.Item(0) = CBool(True) Then + If CBool(row.Item(0)) = CBool(True) Then Dim USERNAME As String = row.Item(1) Dim PRENAME As String = row.Item(2) diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs index 098a384..0c374c0 100644 --- a/SetupWix/Product.wxs +++ b/SetupWix/Product.wxs @@ -92,29 +92,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -129,29 +129,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -203,6 +203,8 @@ + +