diff --git a/Global_Indexer/AboutBox1.vb b/Global_Indexer/AboutBox1.vb index ac62ff8..4d25095 100644 --- a/Global_Indexer/AboutBox1.vb +++ b/Global_Indexer/AboutBox1.vb @@ -23,4 +23,10 @@ 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") + End Sub End Class diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index 1ff7695..c832c67 100644 --- a/Global_Indexer/ClassInit.vb +++ b/Global_Indexer/ClassInit.vb @@ -13,7 +13,7 @@ Public Class ClassInit 'Throw New Exception("Dummy Fehler!") End Sub - Public Sub InitDatabase() + Public Function InitDatabase() Dim dbResult As Boolean LoadMyConfig() If LoadFileExclusion() = False Then @@ -29,9 +29,12 @@ Public Class ClassInit If dbResult = False Then ERROR_STATE = "FAILED DBCONNECTION" - Throw New Exception("Fehler beim Initialisieren der Datenbank. Weitere Informationen finden Sie in der Logdatei.") + MsgBox("Fehler beim Initialisieren der Datenbank. Weitere Informationen finden Sie in der Logdatei.", MsgBoxStyle.Critical) + Return False + Else + Return True End If - End Sub + End Function _ Public Sub InitBasics() Dim configResult As Boolean @@ -78,74 +81,80 @@ Public Class ClassInit CURRENT_USERID = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) If IsDBNull(CURRENT_USERID) Then - ClassLogger.Add(" - User: " & Environment.UserName & " nicht in der Userverwaltung hinterlegt!", False) + ClassLogger.Add(" - User: " & Environment.UserName & " nicht in der Userverwaltung hinterlegt! (DBNull)", False) 'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") 'Me.Close() START_INCOMPLETE = True - Throw New Exception("Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!") + Throw New Exception("Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung oder konfigurieren Ihren Usernamen für dieses Modul!") Else - sql = "SELECT MODULE_GI FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('@user'))" - sql = sql.Replace("@user", Environment.UserName) - If ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) = False Then - ClassLogger.Add(" - User: " & Environment.UserName & " nicht für Modul freigegben!", False) + If IsNothing(CURRENT_USERID) Then + ClassLogger.Add(" - User: " & Environment.UserName & " nicht in der Userverwaltung hinterlegt! (nothing)", False) START_INCOMPLETE = True - 'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") - Throw New Exception("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!") - 'Me.Close() + Throw New Exception("Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung oder konfigurieren Ihren Usernamen für dieses Modul!") Else - 'Am System anmelden - ClassLicence.Refresh_Licence() - Dim sql1 = "SELECT COUNT(T.GUID) FROM TBDD_DOKUMENTART T, TBDD_DOKUMENTART_MODULE T1 WHERE T.AKTIV = 1 AND T.GUID = T1.DOKART_ID AND T1.MODULE_ID = 1" - DOCTYPE_COUNT_ACTUAL = ClassDatabase.Execute_Scalar(sql1, MyConnectionString, True) - If DOCTYPE_COUNT_ACTUAL > LICENSE_DOCTYPE_COUNT Then - If USER_LANGUAGE = "de-DE" Then - MsgBox("Ihre Anzahl von konfigurierbaren Dokumentarten ist limitiert auf: '" & LICENSE_DOCTYPE_COUNT.ToString & "'." & vbNewLine & "Bitte kontaktieren Sie Digital Data für weitere Details.", MsgBoxStyle.Information) - Else - MsgBox("Your amount of configurable documenttypes is limited to " & LICENSE_DOCTYPE_COUNT.ToString & " doctypes. You can not add more doctypes!" & vbNewLine & "Please contact Digital Data for further licensedetails", MsgBoxStyle.Information) - End If - End If - Try - USER_LANGUAGE = ClassDatabase.Execute_Scalar("SELECT LANGUAGE FROM TBDD_USER WHERE GUID = " & CURRENT_USERID, MyConnectionString, True) - Catch ex As Exception - ClassLogger.Add("LANGUAGE COULD NOT BE READ - " & ex.Message, True) - USER_LANGUAGE = "de-DE" - End Try - - - sql = "UPDATE TBDD_USER SET LOGGED_IN = @LogInOut, LOGGED_WHERE = '@ANGEMELDETWO' WHERE (LOWER(USERNAME) = LOWER('@user'))" - sql = sql.Replace("@LogInOut", 1) - sql = sql.Replace("@ANGEMELDETWO", Environment.MachineName) + sql = "SELECT MODULE_GI FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('@user'))" sql = sql.Replace("@user", Environment.UserName) - ClassDatabase.Execute_non_Query(sql) - sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & CURRENT_USERID & " AND UPPER(MODULE) = UPPER('Global-Indexer')" - If ClassDatabase.Execute_non_Query(sql, True) = True Then - - End If - - sql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE) VALUES (" & CURRENT_USERID & ",'Global-Indexer')" - ClassDatabase.Execute_non_Query(sql) - sql = "SELECT GI_ADMIN FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('@user'))" - sql = sql.Replace("@user", Environment.UserName) - CURRENT_USER_IS_ADMIN = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) - - sql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE Upper(MODULE) = UPPER('Global-Indexer')" - Dim anzahl = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) - If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl Angemeldete User: " & anzahl.ToString, False) - UserLoggedin = CInt(anzahl) - If LICENSE_COUNT < UserLoggedin And LICENSE_EXPIRED = False Then - MsgBox("Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") - ClassLogger.Add(" >> Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Global Indexer!", False) - If CURRENT_USER_IS_ADMIN = False Then - 'Anmeldung wieder herausnehmen - sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & CURRENT_USER_IS_ADMIN & " AND MODULE= 'Global-Indexer'" - ClassDatabase.Execute_non_Query(sql, True) - ClassLogger.Add(" - Wieder abgemeldet", False) - START_INCOMPLETE = True + If ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) = False Then + ClassLogger.Add(" - User: " & Environment.UserName & " nicht für Modul freigegben!", False) + START_INCOMPLETE = True + 'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") + Throw New Exception("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!") + 'Me.Close() + Else + 'Am System anmelden + ClassLicence.Refresh_Licence() + Dim sql1 = "SELECT COUNT(T.GUID) FROM TBDD_DOKUMENTART T, TBDD_DOKUMENTART_MODULE T1 WHERE T.AKTIV = 1 AND T.GUID = T1.DOKART_ID AND T1.MODULE_ID = 1" + DOCTYPE_COUNT_ACTUAL = ClassDatabase.Execute_Scalar(sql1, MyConnectionString, True) + If DOCTYPE_COUNT_ACTUAL > LICENSE_DOCTYPE_COUNT Then + If USER_LANGUAGE = "de-DE" Then + MsgBox("Ihre Anzahl von konfigurierbaren Dokumentarten ist limitiert auf: '" & LICENSE_DOCTYPE_COUNT.ToString & "'." & vbNewLine & "Bitte kontaktieren Sie Digital Data für weitere Details.", MsgBoxStyle.Information) + Else + MsgBox("Your amount of configurable documenttypes is limited to " & LICENSE_DOCTYPE_COUNT.ToString & " doctypes. You can not add more doctypes!" & vbNewLine & "Please contact Digital Data for further licensedetails", MsgBoxStyle.Information) + End If End If + Try + USER_LANGUAGE = ClassDatabase.Execute_Scalar("SELECT LANGUAGE FROM TBDD_USER WHERE GUID = " & CURRENT_USERID, MyConnectionString, True) + Catch ex As Exception + ClassLogger.Add("LANGUAGE COULD NOT BE READ - " & ex.Message, True) + USER_LANGUAGE = "de-DE" + End Try + + + sql = "UPDATE TBDD_USER SET LOGGED_IN = @LogInOut, LOGGED_WHERE = '@ANGEMELDETWO' WHERE (LOWER(USERNAME) = LOWER('@user'))" + sql = sql.Replace("@LogInOut", 1) + sql = sql.Replace("@ANGEMELDETWO", Environment.MachineName) + sql = sql.Replace("@user", Environment.UserName) + ClassDatabase.Execute_non_Query(sql) + sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & CURRENT_USERID & " AND UPPER(MODULE) = UPPER('Global-Indexer')" + If ClassDatabase.Execute_non_Query(sql, True) = True Then + + End If + + sql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE) VALUES (" & CURRENT_USERID & ",'Global-Indexer')" + ClassDatabase.Execute_non_Query(sql) + sql = "SELECT GI_ADMIN FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('@user'))" + sql = sql.Replace("@user", Environment.UserName) + CURRENT_USER_IS_ADMIN = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + + sql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE Upper(MODULE) = UPPER('Global-Indexer')" + Dim anzahl = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl Angemeldete User: " & anzahl.ToString, False) + UserLoggedin = CInt(anzahl) + If LICENSE_COUNT < UserLoggedin And LICENSE_EXPIRED = False Then + MsgBox("Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") + ClassLogger.Add(" >> Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Global Indexer!", False) + If CURRENT_USER_IS_ADMIN = False Then + 'Anmeldung wieder herausnehmen + sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & CURRENT_USER_IS_ADMIN & " AND MODULE= 'Global-Indexer'" + ClassDatabase.Execute_non_Query(sql, True) + ClassLogger.Add(" - Wieder abgemeldet", False) + START_INCOMPLETE = True + End If + End If + 'Alles OK bis hierhin...nun die FolderwatchKonfig laden + Init_Folderwatch() + 'LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & anzahl.ToString End If - 'Alles OK bis hierhin...nun die FolderwatchKonfig laden - Init_Folderwatch() - 'LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & anzahl.ToString End If End If Catch ex As Exception diff --git a/Global_Indexer/ClassLayout.vb b/Global_Indexer/ClassLayout.vb index 2c31be6..c210af9 100644 --- a/Global_Indexer/ClassLayout.vb +++ b/Global_Indexer/ClassLayout.vb @@ -5,8 +5,7 @@ Public Class ClassWindowLocation Public Shared Sub LoadFormLocationSize(ByRef form As Form) Try Dim _path As String - _path = Path.Combine(Application.UserAppDataPath(), "FORM" & form.Name & "-PositionSize.xml") - + _path = Path.Combine(Application.UserAppDataPath(), "frm" & form.Name & "-Layout.xml") Dim layout As ClassLayout = New ClassLayout(_path) Dim settings As System.Collections.Generic.List(Of ClassSetting) settings = layout.Load() @@ -32,10 +31,12 @@ Public Class ClassWindowLocation h = Integer.Parse(s._value) End Select Next + Dim screenWidth As Integer = Screen.PrimaryScreen.Bounds.Width + Dim screenHeight As Integer = Screen.PrimaryScreen.Bounds.Height If x = 5000 Then form.WindowState = FormWindowState.Maximized Else - If x > 0 And y > 0 Then + If x >= 0 And y >= 0 Then form.Location = New Point(x, y) End If If w > 0 And h > 0 Then @@ -54,7 +55,7 @@ Public Class ClassWindowLocation Public Shared Sub SaveFormLocationSize(ByRef form As Form) Try Dim _path As String - _path = Path.Combine(Application.UserAppDataPath(), "FORM" & form.Name & "-PositionSize.xml") + _path = Path.Combine(Application.UserAppDataPath(), "frm" & form.Name & "-Layout.xml") Dim layout As ClassLayout = New ClassLayout(_path) Dim settings As System.Collections.Generic.List(Of ClassSetting) = New System.Collections.Generic.List(Of ClassSetting) @@ -88,8 +89,6 @@ Public Class ClassWindowLocation End Sub - - End Class diff --git a/Global_Indexer/ClassWindream.vb b/Global_Indexer/ClassWindream.vb index 5dfb437..8a0392b 100644 --- a/Global_Indexer/ClassWindream.vb +++ b/Global_Indexer/ClassWindream.vb @@ -600,7 +600,7 @@ Public Class ClassWindream Return -10 End If - If LogErrorsOnly = False Then ClassLogger.Add(" ...Datei kopieren von " & filenameQuelle & " nach " & Zielverzeichnis.Substring(2) & "\" & Quelldatei_Name & ".", False) + If LogErrorsOnly = False Then ClassLogger.Add(" ...Datei kopieren von '" & filenameQuelle & "' nach '" & newfilename & "'.", False) Dim Connect Dim Session Dim WMObject diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index 67872fd..1cd12ba 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -99,6 +99,7 @@ False D:\Programme\DB\Oracle\ora12.1\Client\ODP.NET\managed\common\Oracle.ManagedDataAccess.dll + @@ -107,12 +108,14 @@ + + @@ -295,6 +298,9 @@ frmAdministration.vb + + frmConfig_Basic.vb + frmConfig_Basic.vb diff --git a/Global_Indexer/Global_Indexer.vbproj.bak b/Global_Indexer/Global_Indexer.vbproj.bak index 9e69573..1291007 100644 --- a/Global_Indexer/Global_Indexer.vbproj.bak +++ b/Global_Indexer/Global_Indexer.vbproj.bak @@ -64,7 +64,6 @@ - @@ -72,11 +71,9 @@ - + False - D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraEditors.v14.2.dll - @@ -84,9 +81,9 @@ - - ..\..\..\Kunden - Produktiv\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DLLLicenseManager.dll - False + + False + ..\..\..\Bibliotheken\DLL\DLLLicenseManager.dll False @@ -104,6 +101,7 @@ False D:\Programme\DB\Oracle\ora12.1\Client\ODP.NET\managed\common\Oracle.ManagedDataAccess.dll + @@ -112,12 +110,14 @@ + + diff --git a/Global_Indexer/ModuleCURRENT.vb b/Global_Indexer/ModuleCURRENT.vb index b6df1d6..b000455 100644 --- a/Global_Indexer/ModuleCURRENT.vb +++ b/Global_Indexer/ModuleCURRENT.vb @@ -20,7 +20,7 @@ Public CURRENT_MESSAGESUBJECT As String Public CURRENT_ISATTACHMENT As Boolean = False - Public CURRENT_USERID As Integer + Public CURRENT_USERID Public CURRENT_USER_IS_ADMIN As Boolean = False Public UserLoggedin As Integer = 0 Public USER_LANGUAGE As String = "DE" diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index dc3e6f3..e23aaf7 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/Global_Indexer/My Project/licenses.licx b/Global_Indexer/My Project/licenses.licx index 395f626..245de9b 100644 --- a/Global_Indexer/My Project/licenses.licx +++ b/Global_Indexer/My Project/licenses.licx @@ -1,3 +1,2 @@ -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.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Global_Indexer/My Project/licenses.licx.bak b/Global_Indexer/My Project/licenses.licx.bak index adb46c6..395f626 100644 --- a/Global_Indexer/My Project/licenses.licx.bak +++ b/Global_Indexer/My Project/licenses.licx.bak @@ -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.XtraEditors.TextEdit, DevExpress.XtraEditors.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 diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index 8736fb4..31bedaa 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -348,24 +348,25 @@ Partial Class frmAdministration Me.Button4 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.pnlObjekttype_Config = New System.Windows.Forms.Panel() Me.IDX_CHECK_ATTACHMENTComboBox = New System.Windows.Forms.ComboBox() Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.CHANGED_WHENTextBox2 = New System.Windows.Forms.TextBox() + Me.CHANGED_WHOTextBox2 = New System.Windows.Forms.TextBox() + Me.ADDED_WHENTextBox2 = New System.Windows.Forms.TextBox() + Me.ADDED_WHOTextBox2 = New System.Windows.Forms.TextBox() + Me.GUIDTextBox3 = New System.Windows.Forms.TextBox() + Me.IDX_EMAIL_DATE_INComboBox = New System.Windows.Forms.ComboBox() + Me.OBJECTTYPETextBox = New System.Windows.Forms.TextBox() + Me.IDX_EMAIL_SUBJECTComboBox = New System.Windows.Forms.ComboBox() + Me.IDX_EMAIL_IDComboBox = New System.Windows.Forms.ComboBox() + Me.IDX_EMAIL_TOComboBox = New System.Windows.Forms.ComboBox() + Me.IDX_EMAIL_FROMComboBox = New System.Windows.Forms.ComboBox() Me.Label3 = New System.Windows.Forms.Label() Me.lblsavezuordnungIndex = New System.Windows.Forms.Label() Me.btnidxemail_delete = New System.Windows.Forms.Button() Me.btnidxemail_Save = New System.Windows.Forms.Button() Me.btnidxemail_add = New System.Windows.Forms.Button() - Me.GUIDTextBox3 = New System.Windows.Forms.TextBox() - Me.OBJECTTYPETextBox = New System.Windows.Forms.TextBox() - Me.IDX_EMAIL_IDComboBox = New System.Windows.Forms.ComboBox() - Me.IDX_EMAIL_FROMComboBox = New System.Windows.Forms.ComboBox() - Me.IDX_EMAIL_TOComboBox = New System.Windows.Forms.ComboBox() - Me.IDX_EMAIL_SUBJECTComboBox = New System.Windows.Forms.ComboBox() - Me.IDX_EMAIL_DATE_INComboBox = New System.Windows.Forms.ComboBox() - Me.ADDED_WHOTextBox2 = New System.Windows.Forms.TextBox() - Me.ADDED_WHENTextBox2 = New System.Windows.Forms.TextBox() - Me.CHANGED_WHOTextBox2 = New System.Windows.Forms.TextBox() - Me.CHANGED_WHENTextBox2 = New System.Windows.Forms.TextBox() Me.ListBoxObjekttypen = New System.Windows.Forms.ListBox() Me.TBGI_CONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_DOKUMENTARTTableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBDD_DOKUMENTARTTableAdapter() @@ -502,6 +503,7 @@ Partial Class frmAdministration Me.BindingNavigator1.SuspendLayout() Me.XtraTabPage5.SuspendLayout() Me.GroupBox1.SuspendLayout() + Me.pnlObjekttype_Config.SuspendLayout() 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() @@ -830,7 +832,7 @@ Partial Class frmAdministration ' GUIDLabel3.AutoSize = True GUIDLabel3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - GUIDLabel3.Location = New System.Drawing.Point(245, 44) + GUIDLabel3.Location = New System.Drawing.Point(3, 2) GUIDLabel3.Name = "GUIDLabel3" GUIDLabel3.Size = New System.Drawing.Size(23, 17) GUIDLabel3.TabIndex = 1 @@ -840,7 +842,7 @@ Partial Class frmAdministration ' OBJECTTYPELabel.AutoSize = True OBJECTTYPELabel.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - OBJECTTYPELabel.Location = New System.Drawing.Point(336, 44) + OBJECTTYPELabel.Location = New System.Drawing.Point(94, 2) OBJECTTYPELabel.Name = "OBJECTTYPELabel" OBJECTTYPELabel.Size = New System.Drawing.Size(67, 17) OBJECTTYPELabel.TabIndex = 3 @@ -850,7 +852,7 @@ Partial Class frmAdministration ' IDX_EMAIL_IDLabel.AutoSize = True IDX_EMAIL_IDLabel.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - IDX_EMAIL_IDLabel.Location = New System.Drawing.Point(245, 92) + IDX_EMAIL_IDLabel.Location = New System.Drawing.Point(3, 50) IDX_EMAIL_IDLabel.Name = "IDX_EMAIL_IDLabel" IDX_EMAIL_IDLabel.Size = New System.Drawing.Size(136, 17) IDX_EMAIL_IDLabel.TabIndex = 5 @@ -860,7 +862,7 @@ Partial Class frmAdministration ' IDX_EMAIL_FROMLabel.AutoSize = True IDX_EMAIL_FROMLabel.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - IDX_EMAIL_FROMLabel.Location = New System.Drawing.Point(442, 92) + IDX_EMAIL_FROMLabel.Location = New System.Drawing.Point(200, 50) IDX_EMAIL_FROMLabel.Name = "IDX_EMAIL_FROMLabel" IDX_EMAIL_FROMLabel.Size = New System.Drawing.Size(135, 17) IDX_EMAIL_FROMLabel.TabIndex = 7 @@ -870,7 +872,7 @@ Partial Class frmAdministration ' IDX_EMAIL_TOLabel.AutoSize = True IDX_EMAIL_TOLabel.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - IDX_EMAIL_TOLabel.Location = New System.Drawing.Point(245, 140) + IDX_EMAIL_TOLabel.Location = New System.Drawing.Point(3, 98) IDX_EMAIL_TOLabel.Name = "IDX_EMAIL_TOLabel" IDX_EMAIL_TOLabel.Size = New System.Drawing.Size(122, 17) IDX_EMAIL_TOLabel.TabIndex = 9 @@ -880,7 +882,7 @@ Partial Class frmAdministration ' IDX_EMAIL_SUBJECTLabel.AutoSize = True IDX_EMAIL_SUBJECTLabel.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - IDX_EMAIL_SUBJECTLabel.Location = New System.Drawing.Point(442, 140) + IDX_EMAIL_SUBJECTLabel.Location = New System.Drawing.Point(200, 98) IDX_EMAIL_SUBJECTLabel.Name = "IDX_EMAIL_SUBJECTLabel" IDX_EMAIL_SUBJECTLabel.Size = New System.Drawing.Size(149, 17) IDX_EMAIL_SUBJECTLabel.TabIndex = 11 @@ -890,7 +892,7 @@ Partial Class frmAdministration ' IDX_EMAIL_DATE_INLabel.AutoSize = True IDX_EMAIL_DATE_INLabel.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - IDX_EMAIL_DATE_INLabel.Location = New System.Drawing.Point(245, 186) + IDX_EMAIL_DATE_INLabel.Location = New System.Drawing.Point(3, 144) IDX_EMAIL_DATE_INLabel.Name = "IDX_EMAIL_DATE_INLabel" IDX_EMAIL_DATE_INLabel.Size = New System.Drawing.Size(119, 17) IDX_EMAIL_DATE_INLabel.TabIndex = 13 @@ -900,7 +902,7 @@ Partial Class frmAdministration ' ADDED_WHOLabel2.AutoSize = True ADDED_WHOLabel2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - ADDED_WHOLabel2.Location = New System.Drawing.Point(245, 234) + ADDED_WHOLabel2.Location = New System.Drawing.Point(3, 192) ADDED_WHOLabel2.Name = "ADDED_WHOLabel2" ADDED_WHOLabel2.Size = New System.Drawing.Size(74, 17) ADDED_WHOLabel2.TabIndex = 15 @@ -910,7 +912,7 @@ Partial Class frmAdministration ' ADDED_WHENLabel2.AutoSize = True ADDED_WHENLabel2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - ADDED_WHENLabel2.Location = New System.Drawing.Point(442, 234) + ADDED_WHENLabel2.Location = New System.Drawing.Point(200, 192) ADDED_WHENLabel2.Name = "ADDED_WHENLabel2" ADDED_WHENLabel2.Size = New System.Drawing.Size(81, 17) ADDED_WHENLabel2.TabIndex = 17 @@ -920,7 +922,7 @@ Partial Class frmAdministration ' CHANGED_WHOLabel2.AutoSize = True CHANGED_WHOLabel2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - CHANGED_WHOLabel2.Location = New System.Drawing.Point(245, 282) + CHANGED_WHOLabel2.Location = New System.Drawing.Point(3, 240) CHANGED_WHOLabel2.Name = "CHANGED_WHOLabel2" CHANGED_WHOLabel2.Size = New System.Drawing.Size(89, 17) CHANGED_WHOLabel2.TabIndex = 19 @@ -930,7 +932,7 @@ Partial Class frmAdministration ' CHANGED_WHENLabel2.AutoSize = True CHANGED_WHENLabel2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - CHANGED_WHENLabel2.Location = New System.Drawing.Point(442, 282) + CHANGED_WHENLabel2.Location = New System.Drawing.Point(200, 240) CHANGED_WHENLabel2.Name = "CHANGED_WHENLabel2" CHANGED_WHENLabel2.Size = New System.Drawing.Size(96, 17) CHANGED_WHENLabel2.TabIndex = 21 @@ -940,7 +942,7 @@ Partial Class frmAdministration ' IDX_CHECK_ATTACHMENTLabel.AutoSize = True IDX_CHECK_ATTACHMENTLabel.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - IDX_CHECK_ATTACHMENTLabel.Location = New System.Drawing.Point(442, 186) + IDX_CHECK_ATTACHMENTLabel.Location = New System.Drawing.Point(200, 144) IDX_CHECK_ATTACHMENTLabel.Name = "IDX_CHECK_ATTACHMENTLabel" IDX_CHECK_ATTACHMENTLabel.Size = New System.Drawing.Size(304, 17) IDX_CHECK_ATTACHMENTLabel.TabIndex = 80 @@ -3778,50 +3780,59 @@ Partial Class frmAdministration 'GroupBox1 ' Me.GroupBox1.BackColor = System.Drawing.Color.WhiteSmoke - Me.GroupBox1.Controls.Add(Me.IDX_CHECK_ATTACHMENTComboBox) - Me.GroupBox1.Controls.Add(IDX_CHECK_ATTACHMENTLabel) + Me.GroupBox1.Controls.Add(Me.pnlObjekttype_Config) Me.GroupBox1.Controls.Add(Me.Label3) Me.GroupBox1.Controls.Add(Me.lblsavezuordnungIndex) Me.GroupBox1.Controls.Add(Me.btnidxemail_delete) Me.GroupBox1.Controls.Add(Me.btnidxemail_Save) Me.GroupBox1.Controls.Add(Me.btnidxemail_add) - Me.GroupBox1.Controls.Add(GUIDLabel3) - Me.GroupBox1.Controls.Add(Me.GUIDTextBox3) - Me.GroupBox1.Controls.Add(OBJECTTYPELabel) - Me.GroupBox1.Controls.Add(Me.OBJECTTYPETextBox) - Me.GroupBox1.Controls.Add(IDX_EMAIL_IDLabel) - Me.GroupBox1.Controls.Add(Me.IDX_EMAIL_IDComboBox) - Me.GroupBox1.Controls.Add(IDX_EMAIL_FROMLabel) - Me.GroupBox1.Controls.Add(Me.IDX_EMAIL_FROMComboBox) - Me.GroupBox1.Controls.Add(IDX_EMAIL_TOLabel) - Me.GroupBox1.Controls.Add(Me.IDX_EMAIL_TOComboBox) - Me.GroupBox1.Controls.Add(IDX_EMAIL_SUBJECTLabel) - Me.GroupBox1.Controls.Add(Me.IDX_EMAIL_SUBJECTComboBox) - Me.GroupBox1.Controls.Add(IDX_EMAIL_DATE_INLabel) - Me.GroupBox1.Controls.Add(Me.IDX_EMAIL_DATE_INComboBox) - Me.GroupBox1.Controls.Add(ADDED_WHOLabel2) - Me.GroupBox1.Controls.Add(Me.ADDED_WHOTextBox2) - Me.GroupBox1.Controls.Add(ADDED_WHENLabel2) - Me.GroupBox1.Controls.Add(Me.ADDED_WHENTextBox2) - Me.GroupBox1.Controls.Add(CHANGED_WHOLabel2) - Me.GroupBox1.Controls.Add(Me.CHANGED_WHOTextBox2) - Me.GroupBox1.Controls.Add(CHANGED_WHENLabel2) - Me.GroupBox1.Controls.Add(Me.CHANGED_WHENTextBox2) Me.GroupBox1.Controls.Add(Me.ListBoxObjekttypen) Me.GroupBox1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox1.Location = New System.Drawing.Point(3, 3) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(1056, 334) + Me.GroupBox1.Size = New System.Drawing.Size(1056, 356) Me.GroupBox1.TabIndex = 0 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Indexzuordnung für die Email-Indexierung:" ' + 'pnlObjekttype_Config + ' + Me.pnlObjekttype_Config.Controls.Add(GUIDLabel3) + Me.pnlObjekttype_Config.Controls.Add(Me.IDX_CHECK_ATTACHMENTComboBox) + Me.pnlObjekttype_Config.Controls.Add(Me.CHANGED_WHENTextBox2) + Me.pnlObjekttype_Config.Controls.Add(IDX_CHECK_ATTACHMENTLabel) + Me.pnlObjekttype_Config.Controls.Add(CHANGED_WHENLabel2) + Me.pnlObjekttype_Config.Controls.Add(Me.CHANGED_WHOTextBox2) + Me.pnlObjekttype_Config.Controls.Add(CHANGED_WHOLabel2) + Me.pnlObjekttype_Config.Controls.Add(Me.ADDED_WHENTextBox2) + Me.pnlObjekttype_Config.Controls.Add(ADDED_WHENLabel2) + Me.pnlObjekttype_Config.Controls.Add(Me.ADDED_WHOTextBox2) + Me.pnlObjekttype_Config.Controls.Add(ADDED_WHOLabel2) + Me.pnlObjekttype_Config.Controls.Add(Me.GUIDTextBox3) + Me.pnlObjekttype_Config.Controls.Add(Me.IDX_EMAIL_DATE_INComboBox) + Me.pnlObjekttype_Config.Controls.Add(OBJECTTYPELabel) + Me.pnlObjekttype_Config.Controls.Add(IDX_EMAIL_DATE_INLabel) + Me.pnlObjekttype_Config.Controls.Add(Me.OBJECTTYPETextBox) + Me.pnlObjekttype_Config.Controls.Add(Me.IDX_EMAIL_SUBJECTComboBox) + Me.pnlObjekttype_Config.Controls.Add(IDX_EMAIL_IDLabel) + Me.pnlObjekttype_Config.Controls.Add(IDX_EMAIL_SUBJECTLabel) + Me.pnlObjekttype_Config.Controls.Add(Me.IDX_EMAIL_IDComboBox) + Me.pnlObjekttype_Config.Controls.Add(Me.IDX_EMAIL_TOComboBox) + Me.pnlObjekttype_Config.Controls.Add(IDX_EMAIL_FROMLabel) + Me.pnlObjekttype_Config.Controls.Add(IDX_EMAIL_TOLabel) + Me.pnlObjekttype_Config.Controls.Add(Me.IDX_EMAIL_FROMComboBox) + Me.pnlObjekttype_Config.Enabled = False + Me.pnlObjekttype_Config.Location = New System.Drawing.Point(219, 44) + Me.pnlObjekttype_Config.Name = "pnlObjekttype_Config" + Me.pnlObjekttype_Config.Size = New System.Drawing.Size(573, 300) + Me.pnlObjekttype_Config.TabIndex = 82 + ' 'IDX_CHECK_ATTACHMENTComboBox ' Me.IDX_CHECK_ATTACHMENTComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "IDX_CHECK_ATTACHMENT", True)) Me.IDX_CHECK_ATTACHMENTComboBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.IDX_CHECK_ATTACHMENTComboBox.FormattingEnabled = True - Me.IDX_CHECK_ATTACHMENTComboBox.Location = New System.Drawing.Point(445, 206) + Me.IDX_CHECK_ATTACHMENTComboBox.Location = New System.Drawing.Point(203, 164) Me.IDX_CHECK_ATTACHMENTComboBox.Name = "IDX_CHECK_ATTACHMENTComboBox" Me.IDX_CHECK_ATTACHMENTComboBox.Size = New System.Drawing.Size(189, 25) Me.IDX_CHECK_ATTACHMENTComboBox.TabIndex = 81 @@ -3831,6 +3842,116 @@ Partial Class frmAdministration Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource.DataMember = "TBGI_OBJECTTYPE_EMAIL_INDEX" Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource.DataSource = Me.MyDataset ' + 'CHANGED_WHENTextBox2 + ' + Me.CHANGED_WHENTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "CHANGED_WHEN", True)) + Me.CHANGED_WHENTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CHANGED_WHENTextBox2.Location = New System.Drawing.Point(203, 260) + Me.CHANGED_WHENTextBox2.Name = "CHANGED_WHENTextBox2" + Me.CHANGED_WHENTextBox2.ReadOnly = True + Me.CHANGED_WHENTextBox2.Size = New System.Drawing.Size(189, 25) + Me.CHANGED_WHENTextBox2.TabIndex = 22 + ' + 'CHANGED_WHOTextBox2 + ' + Me.CHANGED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "CHANGED_WHO", True)) + Me.CHANGED_WHOTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CHANGED_WHOTextBox2.Location = New System.Drawing.Point(6, 260) + Me.CHANGED_WHOTextBox2.Name = "CHANGED_WHOTextBox2" + Me.CHANGED_WHOTextBox2.ReadOnly = True + Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(189, 25) + Me.CHANGED_WHOTextBox2.TabIndex = 20 + ' + 'ADDED_WHENTextBox2 + ' + Me.ADDED_WHENTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "ADDED_WHEN", True)) + Me.ADDED_WHENTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ADDED_WHENTextBox2.Location = New System.Drawing.Point(203, 212) + Me.ADDED_WHENTextBox2.Name = "ADDED_WHENTextBox2" + Me.ADDED_WHENTextBox2.ReadOnly = True + Me.ADDED_WHENTextBox2.Size = New System.Drawing.Size(189, 25) + Me.ADDED_WHENTextBox2.TabIndex = 18 + ' + 'ADDED_WHOTextBox2 + ' + Me.ADDED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "ADDED_WHO", True)) + Me.ADDED_WHOTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ADDED_WHOTextBox2.Location = New System.Drawing.Point(6, 212) + Me.ADDED_WHOTextBox2.Name = "ADDED_WHOTextBox2" + Me.ADDED_WHOTextBox2.ReadOnly = True + Me.ADDED_WHOTextBox2.Size = New System.Drawing.Size(189, 25) + Me.ADDED_WHOTextBox2.TabIndex = 16 + ' + 'GUIDTextBox3 + ' + Me.GUIDTextBox3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "GUID", True)) + Me.GUIDTextBox3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GUIDTextBox3.Location = New System.Drawing.Point(6, 22) + Me.GUIDTextBox3.Name = "GUIDTextBox3" + Me.GUIDTextBox3.ReadOnly = True + Me.GUIDTextBox3.Size = New System.Drawing.Size(71, 25) + Me.GUIDTextBox3.TabIndex = 2 + ' + 'IDX_EMAIL_DATE_INComboBox + ' + Me.IDX_EMAIL_DATE_INComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "IDX_EMAIL_DATE_IN", True)) + Me.IDX_EMAIL_DATE_INComboBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.IDX_EMAIL_DATE_INComboBox.FormattingEnabled = True + Me.IDX_EMAIL_DATE_INComboBox.Location = New System.Drawing.Point(6, 164) + Me.IDX_EMAIL_DATE_INComboBox.Name = "IDX_EMAIL_DATE_INComboBox" + Me.IDX_EMAIL_DATE_INComboBox.Size = New System.Drawing.Size(189, 25) + Me.IDX_EMAIL_DATE_INComboBox.TabIndex = 14 + ' + 'OBJECTTYPETextBox + ' + Me.OBJECTTYPETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "OBJECTTYPE", True)) + Me.OBJECTTYPETextBox.Enabled = False + Me.OBJECTTYPETextBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.OBJECTTYPETextBox.Location = New System.Drawing.Point(97, 22) + Me.OBJECTTYPETextBox.Name = "OBJECTTYPETextBox" + Me.OBJECTTYPETextBox.Size = New System.Drawing.Size(291, 25) + Me.OBJECTTYPETextBox.TabIndex = 4 + ' + 'IDX_EMAIL_SUBJECTComboBox + ' + Me.IDX_EMAIL_SUBJECTComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "IDX_EMAIL_SUBJECT", True)) + Me.IDX_EMAIL_SUBJECTComboBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.IDX_EMAIL_SUBJECTComboBox.FormattingEnabled = True + Me.IDX_EMAIL_SUBJECTComboBox.Location = New System.Drawing.Point(203, 116) + Me.IDX_EMAIL_SUBJECTComboBox.Name = "IDX_EMAIL_SUBJECTComboBox" + Me.IDX_EMAIL_SUBJECTComboBox.Size = New System.Drawing.Size(189, 25) + Me.IDX_EMAIL_SUBJECTComboBox.TabIndex = 12 + ' + 'IDX_EMAIL_IDComboBox + ' + Me.IDX_EMAIL_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "IDX_EMAIL_ID", True)) + Me.IDX_EMAIL_IDComboBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.IDX_EMAIL_IDComboBox.FormattingEnabled = True + Me.IDX_EMAIL_IDComboBox.Location = New System.Drawing.Point(6, 70) + Me.IDX_EMAIL_IDComboBox.Name = "IDX_EMAIL_IDComboBox" + Me.IDX_EMAIL_IDComboBox.Size = New System.Drawing.Size(189, 25) + Me.IDX_EMAIL_IDComboBox.TabIndex = 6 + ' + 'IDX_EMAIL_TOComboBox + ' + Me.IDX_EMAIL_TOComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "IDX_EMAIL_TO", True)) + Me.IDX_EMAIL_TOComboBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.IDX_EMAIL_TOComboBox.FormattingEnabled = True + Me.IDX_EMAIL_TOComboBox.Location = New System.Drawing.Point(6, 116) + Me.IDX_EMAIL_TOComboBox.Name = "IDX_EMAIL_TOComboBox" + Me.IDX_EMAIL_TOComboBox.Size = New System.Drawing.Size(189, 25) + Me.IDX_EMAIL_TOComboBox.TabIndex = 10 + ' + 'IDX_EMAIL_FROMComboBox + ' + Me.IDX_EMAIL_FROMComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "IDX_EMAIL_FROM", True)) + Me.IDX_EMAIL_FROMComboBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.IDX_EMAIL_FROMComboBox.FormattingEnabled = True + Me.IDX_EMAIL_FROMComboBox.Location = New System.Drawing.Point(203, 70) + Me.IDX_EMAIL_FROMComboBox.Name = "IDX_EMAIL_FROMComboBox" + Me.IDX_EMAIL_FROMComboBox.Size = New System.Drawing.Size(189, 25) + Me.IDX_EMAIL_FROMComboBox.TabIndex = 8 + ' 'Label3 ' Me.Label3.AutoSize = True @@ -3892,123 +4013,13 @@ Partial Class frmAdministration Me.btnidxemail_add.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnidxemail_add.UseVisualStyleBackColor = True ' - 'GUIDTextBox3 - ' - Me.GUIDTextBox3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "GUID", True)) - Me.GUIDTextBox3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GUIDTextBox3.Location = New System.Drawing.Point(248, 64) - Me.GUIDTextBox3.Name = "GUIDTextBox3" - Me.GUIDTextBox3.ReadOnly = True - Me.GUIDTextBox3.Size = New System.Drawing.Size(71, 25) - Me.GUIDTextBox3.TabIndex = 2 - ' - 'OBJECTTYPETextBox - ' - Me.OBJECTTYPETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "OBJECTTYPE", True)) - Me.OBJECTTYPETextBox.Enabled = False - Me.OBJECTTYPETextBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.OBJECTTYPETextBox.Location = New System.Drawing.Point(339, 64) - Me.OBJECTTYPETextBox.Name = "OBJECTTYPETextBox" - Me.OBJECTTYPETextBox.Size = New System.Drawing.Size(291, 25) - Me.OBJECTTYPETextBox.TabIndex = 4 - ' - 'IDX_EMAIL_IDComboBox - ' - Me.IDX_EMAIL_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "IDX_EMAIL_ID", True)) - Me.IDX_EMAIL_IDComboBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.IDX_EMAIL_IDComboBox.FormattingEnabled = True - Me.IDX_EMAIL_IDComboBox.Location = New System.Drawing.Point(248, 112) - Me.IDX_EMAIL_IDComboBox.Name = "IDX_EMAIL_IDComboBox" - Me.IDX_EMAIL_IDComboBox.Size = New System.Drawing.Size(189, 25) - Me.IDX_EMAIL_IDComboBox.TabIndex = 6 - ' - 'IDX_EMAIL_FROMComboBox - ' - Me.IDX_EMAIL_FROMComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "IDX_EMAIL_FROM", True)) - Me.IDX_EMAIL_FROMComboBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.IDX_EMAIL_FROMComboBox.FormattingEnabled = True - Me.IDX_EMAIL_FROMComboBox.Location = New System.Drawing.Point(445, 112) - Me.IDX_EMAIL_FROMComboBox.Name = "IDX_EMAIL_FROMComboBox" - Me.IDX_EMAIL_FROMComboBox.Size = New System.Drawing.Size(189, 25) - Me.IDX_EMAIL_FROMComboBox.TabIndex = 8 - ' - 'IDX_EMAIL_TOComboBox - ' - Me.IDX_EMAIL_TOComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "IDX_EMAIL_TO", True)) - Me.IDX_EMAIL_TOComboBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.IDX_EMAIL_TOComboBox.FormattingEnabled = True - Me.IDX_EMAIL_TOComboBox.Location = New System.Drawing.Point(248, 158) - Me.IDX_EMAIL_TOComboBox.Name = "IDX_EMAIL_TOComboBox" - Me.IDX_EMAIL_TOComboBox.Size = New System.Drawing.Size(189, 25) - Me.IDX_EMAIL_TOComboBox.TabIndex = 10 - ' - 'IDX_EMAIL_SUBJECTComboBox - ' - Me.IDX_EMAIL_SUBJECTComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "IDX_EMAIL_SUBJECT", True)) - Me.IDX_EMAIL_SUBJECTComboBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.IDX_EMAIL_SUBJECTComboBox.FormattingEnabled = True - Me.IDX_EMAIL_SUBJECTComboBox.Location = New System.Drawing.Point(445, 158) - Me.IDX_EMAIL_SUBJECTComboBox.Name = "IDX_EMAIL_SUBJECTComboBox" - Me.IDX_EMAIL_SUBJECTComboBox.Size = New System.Drawing.Size(189, 25) - Me.IDX_EMAIL_SUBJECTComboBox.TabIndex = 12 - ' - 'IDX_EMAIL_DATE_INComboBox - ' - Me.IDX_EMAIL_DATE_INComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "IDX_EMAIL_DATE_IN", True)) - Me.IDX_EMAIL_DATE_INComboBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.IDX_EMAIL_DATE_INComboBox.FormattingEnabled = True - Me.IDX_EMAIL_DATE_INComboBox.Location = New System.Drawing.Point(248, 206) - Me.IDX_EMAIL_DATE_INComboBox.Name = "IDX_EMAIL_DATE_INComboBox" - Me.IDX_EMAIL_DATE_INComboBox.Size = New System.Drawing.Size(189, 25) - Me.IDX_EMAIL_DATE_INComboBox.TabIndex = 14 - ' - 'ADDED_WHOTextBox2 - ' - Me.ADDED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "ADDED_WHO", True)) - Me.ADDED_WHOTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ADDED_WHOTextBox2.Location = New System.Drawing.Point(248, 254) - Me.ADDED_WHOTextBox2.Name = "ADDED_WHOTextBox2" - Me.ADDED_WHOTextBox2.ReadOnly = True - Me.ADDED_WHOTextBox2.Size = New System.Drawing.Size(189, 25) - Me.ADDED_WHOTextBox2.TabIndex = 16 - ' - 'ADDED_WHENTextBox2 - ' - Me.ADDED_WHENTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "ADDED_WHEN", True)) - Me.ADDED_WHENTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ADDED_WHENTextBox2.Location = New System.Drawing.Point(445, 254) - Me.ADDED_WHENTextBox2.Name = "ADDED_WHENTextBox2" - Me.ADDED_WHENTextBox2.ReadOnly = True - Me.ADDED_WHENTextBox2.Size = New System.Drawing.Size(189, 25) - Me.ADDED_WHENTextBox2.TabIndex = 18 - ' - 'CHANGED_WHOTextBox2 - ' - Me.CHANGED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "CHANGED_WHO", True)) - Me.CHANGED_WHOTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CHANGED_WHOTextBox2.Location = New System.Drawing.Point(248, 302) - Me.CHANGED_WHOTextBox2.Name = "CHANGED_WHOTextBox2" - Me.CHANGED_WHOTextBox2.ReadOnly = True - Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(189, 25) - Me.CHANGED_WHOTextBox2.TabIndex = 20 - ' - 'CHANGED_WHENTextBox2 - ' - Me.CHANGED_WHENTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, "CHANGED_WHEN", True)) - Me.CHANGED_WHENTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CHANGED_WHENTextBox2.Location = New System.Drawing.Point(445, 302) - Me.CHANGED_WHENTextBox2.Name = "CHANGED_WHENTextBox2" - Me.CHANGED_WHENTextBox2.ReadOnly = True - Me.CHANGED_WHENTextBox2.Size = New System.Drawing.Size(189, 25) - Me.CHANGED_WHENTextBox2.TabIndex = 22 - ' 'ListBoxObjekttypen ' Me.ListBoxObjekttypen.FormattingEnabled = True Me.ListBoxObjekttypen.ItemHeight = 17 Me.ListBoxObjekttypen.Location = New System.Drawing.Point(8, 44) Me.ListBoxObjekttypen.Name = "ListBoxObjekttypen" - Me.ListBoxObjekttypen.Size = New System.Drawing.Size(205, 276) + Me.ListBoxObjekttypen.Size = New System.Drawing.Size(205, 293) Me.ListBoxObjekttypen.TabIndex = 0 ' 'TBGI_CONFIGURATIONBindingSource @@ -4180,6 +4191,8 @@ Partial Class frmAdministration Me.XtraTabPage5.ResumeLayout(False) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() + Me.pnlObjekttype_Config.ResumeLayout(False) + Me.pnlObjekttype_Config.PerformLayout() 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() @@ -4478,4 +4491,5 @@ Partial Class frmAdministration Friend WithEvents btnAddWindowsVariable As System.Windows.Forms.Button Friend WithEvents ToolStripButton41 As System.Windows.Forms.ToolStripButton Friend WithEvents lblWDINDEX As System.Windows.Forms.Label + Friend WithEvents pnlObjekttype_Config As System.Windows.Forms.Panel End Class diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index c71c76f..68cf388 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -330,17 +330,41 @@ 17, 17 + + 921, 17 + + + 481, 95 + + + 244, 17 + 244, 17 134, 17 - - 1207, 56 + + 134, 17 - 17, 56 + 275, 56 + + + 325, 134 + + + 1248, 134 + + + 17, 95 + + + 17, 95 + + + 275, 56 @@ -415,13 +439,19 @@ - 967, 134 + 511, 173 + + + 511, 173 - 1643, 134 + 1187, 173 + + + 1187, 173 - 1217, 95 + 325, 134 @@ -495,10 +525,13 @@ - 473, 134 + 17, 173 + + + 17, 173 - 319, 134 + 1248, 134 @@ -572,19 +605,34 @@ - 266, 173 + 266, 212 + + + 266, 212 - 17, 212 + 506, 251 + + + 506, 251 + + + 1192, 17 1192, 17 - 767, 56 + 1025, 56 + + + 1025, 56 - 236, 56 + 494, 56 + + + 494, 56 921, 17 @@ -660,11 +708,17 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + 682, 134 + - 755, 173 + 755, 212 + + + 755, 212 - 1574, 95 + 682, 134 @@ -738,10 +792,13 @@ - 17, 95 + 635, 95 + + + 635, 95 - 1671, 56 + 481, 95 @@ -815,10 +872,13 @@ - 909, 95 + 17, 134 + + + 17, 134 - 401, 95 + 1019, 95 499, 17 @@ -827,52 +887,52 @@ 748, 17 - 1455, 17 + 17, 56 - 504, 56 + 762, 56 - 990, 56 + 1248, 56 - 1442, 56 + 252, 95 - 212, 95 + 830, 95 - 658, 95 + 1276, 95 - 17, 134 + 946, 134 - 723, 134 + 267, 173 - 1308, 134 + 852, 173 - 17, 173 + 17, 212 - 513, 173 + 513, 212 - 1063, 173 + 1063, 212 - 1366, 173 + 17, 251 - 1613, 173 + 264, 251 - 281, 212 + 770, 251 - 173 + 207 diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 8f7f3c4..e1fcad3 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -9,9 +9,28 @@ Private Sub frmAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load 'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.TBDD_USER_GROUPS". Sie können sie bei Bedarf verschieben oder entfernen. - If ClassWindream.Init() = True Then + Try + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Me.TBDD_DOKUMENTARTTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_EINGANGSARTENTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_DOKART_MODULETableAdapter.Connection.ConnectionString = MyConnectionString + TBDD_INDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString + TBDD_INDEX_AUTOMTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBGI_CONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBWHDD_INDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_USER_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString + Me.VWGI_USER_GROUPS_RELATIONTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_GROUPS_USERTableAdapter.Connection.ConnectionString = MyConnectionString + Me.VWGI_DOCTYPE_GROUPTableAdapter.Connection.ConnectionString = MyConnectionString + Catch ex As Exception + MsgBox("Error in load Connection-Strings - Check Database Connection - Form will be closed: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) + Me.Close() + End Try - End If XtraTabControl1.SelectedTabPageIndex = 0 ToolStripComboBox1.SelectedIndex = 0 Try @@ -524,6 +543,7 @@ Private Sub ListBoxObjekttypen_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBoxObjekttypen.SelectedIndexChanged If ListBoxObjekttypen.SelectedIndex <> -1 Then + pnlObjekttype_Config.Enabled = True LoadIDXEmail(ListBoxObjekttypen.SelectedItem) load_WDIndicesemail(ListBoxObjekttypen.SelectedItem) lblsavezuordnungIndex.Visible = False @@ -531,6 +551,7 @@ End Sub Private Sub btnidxemail_add_Click(sender As Object, e As EventArgs) Handles btnidxemail_add.Click + pnlObjekttype_Config.Enabled = True Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource.AddNew() End Sub @@ -629,28 +650,8 @@ Public Sub New() ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() - Try - ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - Me.TBDD_DOKUMENTARTTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBDD_EINGANGSARTENTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBDD_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBDD_DOKART_MODULETableAdapter.Connection.ConnectionString = MyConnectionString - TBDD_INDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString - TBDD_INDEX_AUTOMTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBGI_CONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBWHDD_INDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBDD_USER_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString - Me.VWGI_USER_GROUPS_RELATIONTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBDD_GROUPS_USERTableAdapter.Connection.ConnectionString = MyConnectionString - Me.VWGI_DOCTYPE_GROUPTableAdapter.Connection.ConnectionString = MyConnectionString - Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in load Connection-Strings: ") - End Try - + End Sub Private Sub TYPEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TYPEComboBox.SelectedIndexChanged diff --git a/Global_Indexer/frmConfig_Basic.de.resx b/Global_Indexer/frmConfig_Basic.de.resx new file mode 100644 index 0000000..7782a6d --- /dev/null +++ b/Global_Indexer/frmConfig_Basic.de.resx @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + 238, 190 + + + + 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 1ba390b..674c64d 100644 --- a/Global_Indexer/frmConfig_Basic.resx +++ b/Global_Indexer/frmConfig_Basic.resx @@ -237,6 +237,9 @@ 41 + + 4, 22 + 4, 4, 4, 4 @@ -955,9 +958,6 @@ 295, 13 - - 150, 13 - 5, 115 @@ -1145,8 +1145,8 @@ Meldungsfenster für erfolgreiche Übertragung nach windream anzeigen? - - 4, 22 + + 150, 13 Überwachung starten diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index c87070c..83c4eba 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/Global_Indexer/frmConfig_Basic.vb @@ -440,4 +440,11 @@ 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 End Class \ No newline at end of file diff --git a/Global_Indexer/frmConnections.Designer.vb b/Global_Indexer/frmConnections.Designer.vb index c5ef429..5a7f0e9 100644 --- a/Global_Indexer/frmConnections.Designer.vb +++ b/Global_Indexer/frmConnections.Designer.vb @@ -50,7 +50,6 @@ Partial Class frmConnections Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.TBDD_CONNECTIONBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.GUIDTextBox = New System.Windows.Forms.TextBox() Me.BEZEICHNUNGTextBox = New System.Windows.Forms.TextBox() Me.SERVERTextBox = New System.Windows.Forms.TextBox() Me.DATENBANKTextBox = New System.Windows.Forms.TextBox() @@ -74,6 +73,7 @@ Partial Class frmConnections Me.btnCheck_Con = New System.Windows.Forms.Button() Me.chkOR_ohne_TNS = New System.Windows.Forms.CheckBox() Me.lblSave = New System.Windows.Forms.Label() + Me.GUIDTextBox = New System.Windows.Forms.TextBox() GUIDLabel = New System.Windows.Forms.Label() BEZEICHNUNGLabel = New System.Windows.Forms.Label() SQL_PROVIDERLabel = New System.Windows.Forms.Label() @@ -309,20 +309,12 @@ Partial Class frmConnections 'ToolStripButton1 ' Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton1.Image = Global.Global_Indexer.My.Resources.Resources.arrow_refresh + Me.ToolStripButton1.Image = Global.Global_Indexer.My.Resources.Resources.refresh_16xLG Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22) Me.ToolStripButton1.Text = "Refresh" ' - 'GUIDTextBox - ' - Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GUID", True)) - Me.GUIDTextBox.Location = New System.Drawing.Point(188, 41) - Me.GUIDTextBox.Name = "GUIDTextBox" - Me.GUIDTextBox.Size = New System.Drawing.Size(46, 22) - Me.GUIDTextBox.TabIndex = 2 - ' 'BEZEICHNUNGTextBox ' Me.BEZEICHNUNGTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "BEZEICHNUNG", True)) @@ -384,33 +376,41 @@ Partial Class frmConnections ' 'ERSTELLTWERTextBox ' + Me.ERSTELLTWERTextBox.BackColor = System.Drawing.Color.WhiteSmoke Me.ERSTELLTWERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "ERSTELLTWER", True)) Me.ERSTELLTWERTextBox.Location = New System.Drawing.Point(188, 267) Me.ERSTELLTWERTextBox.Name = "ERSTELLTWERTextBox" + Me.ERSTELLTWERTextBox.ReadOnly = True Me.ERSTELLTWERTextBox.Size = New System.Drawing.Size(144, 22) Me.ERSTELLTWERTextBox.TabIndex = 20 ' 'ERSTELLTWANNTextBox ' + Me.ERSTELLTWANNTextBox.BackColor = System.Drawing.Color.WhiteSmoke Me.ERSTELLTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "ERSTELLTWANN", True)) Me.ERSTELLTWANNTextBox.Location = New System.Drawing.Point(337, 267) Me.ERSTELLTWANNTextBox.Name = "ERSTELLTWANNTextBox" + Me.ERSTELLTWANNTextBox.ReadOnly = True Me.ERSTELLTWANNTextBox.Size = New System.Drawing.Size(144, 22) Me.ERSTELLTWANNTextBox.TabIndex = 22 ' 'GEANDERTWERTextBox ' + Me.GEANDERTWERTextBox.BackColor = System.Drawing.Color.WhiteSmoke Me.GEANDERTWERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GEANDERTWER", True)) Me.GEANDERTWERTextBox.Location = New System.Drawing.Point(487, 267) Me.GEANDERTWERTextBox.Name = "GEANDERTWERTextBox" + Me.GEANDERTWERTextBox.ReadOnly = True Me.GEANDERTWERTextBox.Size = New System.Drawing.Size(134, 22) Me.GEANDERTWERTextBox.TabIndex = 24 ' 'GEAENDERTWANNTextBox ' + Me.GEAENDERTWANNTextBox.BackColor = System.Drawing.Color.WhiteSmoke Me.GEAENDERTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GEAENDERTWANN", True)) Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(627, 267) Me.GEAENDERTWANNTextBox.Name = "GEAENDERTWANNTextBox" + Me.GEAENDERTWANNTextBox.ReadOnly = True Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(134, 22) Me.GEAENDERTWANNTextBox.TabIndex = 26 ' @@ -542,11 +542,22 @@ Partial Class frmConnections Me.lblSave.Text = "Connection erfolgreich gespeichert!" Me.lblSave.Visible = False ' + 'GUIDTextBox + ' + Me.GUIDTextBox.BackColor = System.Drawing.Color.WhiteSmoke + Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GUID", True)) + Me.GUIDTextBox.Location = New System.Drawing.Point(189, 41) + Me.GUIDTextBox.Name = "GUIDTextBox" + Me.GUIDTextBox.ReadOnly = True + Me.GUIDTextBox.Size = New System.Drawing.Size(57, 22) + Me.GUIDTextBox.TabIndex = 80 + ' 'frmConnections ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(827, 300) + Me.ClientSize = New System.Drawing.Size(827, 309) + Me.Controls.Add(Me.GUIDTextBox) Me.Controls.Add(Me.lblSave) Me.Controls.Add(Me.chkOR_ohne_TNS) Me.Controls.Add(Me.btnCheck_Con) @@ -559,7 +570,6 @@ Partial Class frmConnections Me.Controls.Add(Me.ListBox1) Me.Controls.Add(Me.SQL_PROVIDERComboBox) Me.Controls.Add(GUIDLabel) - Me.Controls.Add(Me.GUIDTextBox) Me.Controls.Add(BEZEICHNUNGLabel) Me.Controls.Add(Me.BEZEICHNUNGTextBox) Me.Controls.Add(SQL_PROVIDERLabel) @@ -612,7 +622,6 @@ End Sub Friend WithEvents BindingNavigatorMoveLastItem As System.Windows.Forms.ToolStripButton Friend WithEvents BindingNavigatorSeparator2 As System.Windows.Forms.ToolStripSeparator Friend WithEvents TBDD_CONNECTIONBindingNavigatorSaveItem As System.Windows.Forms.ToolStripButton - Friend WithEvents GUIDTextBox As System.Windows.Forms.TextBox Friend WithEvents BEZEICHNUNGTextBox As System.Windows.Forms.TextBox Friend WithEvents SERVERTextBox As System.Windows.Forms.TextBox Friend WithEvents DATENBANKTextBox As System.Windows.Forms.TextBox @@ -637,4 +646,5 @@ End Sub Friend WithEvents chkOR_ohne_TNS As System.Windows.Forms.CheckBox Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton Friend WithEvents lblSave As System.Windows.Forms.Label + Friend WithEvents GUIDTextBox As System.Windows.Forms.TextBox End Class diff --git a/Global_Indexer/frmConnections.vb b/Global_Indexer/frmConnections.vb index 2bbe360..0ca129b 100644 --- a/Global_Indexer/frmConnections.vb +++ b/Global_Indexer/frmConnections.vb @@ -22,7 +22,7 @@ Public Class frmConnections Private Sub frmConnections_Load(sender As Object, e As EventArgs) Handles MyBase.Load 'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen. Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString - Load_Conns() + End Sub Sub Load_Conns() Try @@ -237,4 +237,10 @@ Public Class frmConnections Me.chkOR_ohne_TNS.Checked = False End If End Sub + + Private Sub frmConnections_Shown(sender As Object, e As EventArgs) Handles Me.Shown + Load_Conns() + Threading.Thread.Sleep(300) + Load_Conns() + End Sub End Class \ No newline at end of file diff --git a/Global_Indexer/frmHotKey_Add.Designer.vb b/Global_Indexer/frmHotKey_Add.Designer.vb index 2de2ebc..6edef48 100644 --- a/Global_Indexer/frmHotKey_Add.Designer.vb +++ b/Global_Indexer/frmHotKey_Add.Designer.vb @@ -224,6 +224,8 @@ Partial Class frmHotKey_Add Me.TBHOTKEY_USER_PROFILETableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBHOTKEY_USER_PROFILETableAdapter() Me.TBHOTKEY_PATTERNS_REWORKTableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBHOTKEY_PATTERNS_REWORKTableAdapter() Me.TBHOTKEY_WINDOW_HOOKTableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBHOTKEY_WINDOW_HOOKTableAdapter() + Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() + Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components) GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() WD_SEARCHLabel = New System.Windows.Forms.Label() @@ -1092,6 +1094,7 @@ Partial Class frmHotKey_Add 'TabPageUebersicht ' Me.TabPageUebersicht.AutoScroll = True + Me.TabPageUebersicht.Controls.Add(Me.ToolStrip1) Me.TabPageUebersicht.Controls.Add(Me.GroupBoxPatterns) Me.TabPageUebersicht.Controls.Add(Me.TabControl1) Me.TabPageUebersicht.Controls.Add(Me.btndelete) @@ -2082,7 +2085,7 @@ Partial Class frmHotKey_Add Me.btnUserAdd_Profile.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnUserAdd_Profile.Image = Global.Global_Indexer.My.Resources.Resources.add Me.btnUserAdd_Profile.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnUserAdd_Profile.Location = New System.Drawing.Point(300, 6) + Me.btnUserAdd_Profile.Location = New System.Drawing.Point(299, 6) Me.btnUserAdd_Profile.Name = "btnUserAdd_Profile" Me.btnUserAdd_Profile.Size = New System.Drawing.Size(200, 36) Me.btnUserAdd_Profile.TabIndex = 34 @@ -2311,6 +2314,14 @@ Partial Class frmHotKey_Add ' Me.TBHOTKEY_WINDOW_HOOKTableAdapter.ClearBeforeFill = True ' + 'ToolStrip1 + ' + Me.ToolStrip1.Location = New System.Drawing.Point(3, 3) + Me.ToolStrip1.Name = "ToolStrip1" + Me.ToolStrip1.Size = New System.Drawing.Size(958, 25) + Me.ToolStrip1.TabIndex = 38 + Me.ToolStrip1.Text = "ToolStrip1" + ' 'frmHotKey_Add ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2544,4 +2555,6 @@ Partial Class frmHotKey_Add Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator Friend WithEvents ListBox1 As System.Windows.Forms.ListBox Friend WithEvents btnnewProfile As System.Windows.Forms.Button + Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip + Friend WithEvents ToolTipController1 As DevExpress.Utils.ToolTipController End Class diff --git a/Global_Indexer/frmHotKey_Add.resx b/Global_Indexer/frmHotKey_Add.resx index 9606319..3811263 100644 --- a/Global_Indexer/frmHotKey_Add.resx +++ b/Global_Indexer/frmHotKey_Add.resx @@ -228,9 +228,18 @@ 1386, 17 + + 1348, 95 + 471, 95 + + 471, 95 + + + 1040, 95 + 1040, 95 @@ -287,6 +296,12 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + 317, 95 + + + 1098, 56 + 1098, 56 @@ -360,6 +375,9 @@ 1194, 95 + + 1194, 95 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -433,6 +451,12 @@ 758, 95 + + 1348, 95 + + + 17, 134 + AAABAAYAICAQAAEABADoAgAAZgAAABAQEAABAAQAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA diff --git a/Global_Indexer/frmHotKey_Add.vb b/Global_Indexer/frmHotKey_Add.vb index d9402c2..c658344 100644 --- a/Global_Indexer/frmHotKey_Add.vb +++ b/Global_Indexer/frmHotKey_Add.vb @@ -739,4 +739,11 @@ End If End Sub + + Private Sub chklbUser_MouseEnter(sender As Object, e As EventArgs) Handles chklbUser.MouseEnter + ToolTipController1.ShowHint("Rechtsklick für weitere Funktionen", "Hinweis:", DevExpress.Utils.ToolTipLocation.RightCenter) + End Sub + Private Sub chklbUser_MouseLeave(sender As Object, e As EventArgs) Handles chklbUser.MouseLeave + ToolTipController1.HideHint() + End Sub End Class \ No newline at end of file diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 6fb2fe8..62fc031 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -525,7 +525,7 @@ Public Class frmIndex Next newCMB.Size = New Size(newWidth, 27) newCMB.AutoCompleteSource = AutoCompleteSource.ListItems - newCMB.AutoCompleteMode = AutoCompleteMode.SuggestAppend + newCMB.AutoCompleteMode = AutoCompleteMode.Suggest newCMB.DropDownHeight = (newCMB.ItemHeight + 0.2) * 25 If Vorgabe <> "" Then newCMB.SelectedIndex = newCMB.FindStringExact(Vorgabe) @@ -625,7 +625,7 @@ Public Class frmIndex newASTextbox.AutoCompleteCustomSource.Add(r.Item(0).ToString) Next With newASTextbox - .AutoCompleteMode = AutoCompleteMode.SuggestAppend + .AutoCompleteMode = AutoCompleteMode.Suggest .AutoCompleteSource = AutoCompleteSource.CustomSource End With Else @@ -731,7 +731,7 @@ Public Class frmIndex Next cmb.Size = New Size(newWidth, 27) cmb.AutoCompleteSource = AutoCompleteSource.ListItems - cmb.AutoCompleteMode = AutoCompleteMode.SuggestAppend + cmb.AutoCompleteMode = AutoCompleteMode.Suggest End If If connectionString.Contains("Initial Catalog=") Then Try @@ -921,7 +921,7 @@ Public Class frmIndex Dim err As Boolean = False Dim folder_Created As Boolean = False Dim Zielordner As String - Dim extension As String = Path.GetExtension(CURRENT_WORKFILE) + Dim extension As String = System.IO.Path.GetExtension(CURRENT_WORKFILE) Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID) sql_history_INSERT_INTO = "INSERT INTO TBGI_HISTORY (FILENAME_ORIGINAL,FILENAME_NEW" sql_history_Index_Values = "" @@ -929,15 +929,8 @@ Public Class frmIndex CURR_DOKART_WD_DIRECT = DT.Rows(0).Item("WINDREAM_DIRECT") CURR_DOKART_OBJECTTYPE = DT.Rows(0).Item("OBJEKTTYP") CURR_WORKFILE_EXTENSION = extension - If folder_Created = False Then - ' Den Zielordner erstellen - Zielordner = DT.Rows(0).Item("ZIEL_PFAD") - If Directory.Exists(Zielordner) = False Then - 'Try to create the directory. - Directory.CreateDirectory(Zielordner) - End If - folder_Created = True - End If + Zielordner = DT.Rows(0).Item("ZIEL_PFAD") + '#### ' Regulären Ausdruck zum Auslesen der Indexe definieren Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" @@ -970,11 +963,11 @@ Public Class frmIndex 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) If result = MsgBoxResult.Yes Then - DATEINAME = DATEINAME.Replace(element.Value, Path.GetFileNameWithoutExtension(CURRENT_WORKFILE)) + DATEINAME = DATEINAME.Replace(element.Value, System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE)) NewFileString = DATEINAME sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString AnzahlIndexe += 1 - sql_history_Index_Values = sql_history_Index_Values & ", '" & Path.GetFileNameWithoutExtension(CURRENT_WORKFILE) & "'" + sql_history_Index_Values = sql_history_Index_Values & ", '" & System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE) & "'" Else DATEINAME = DATEINAME.Replace(element.Value, value) NewFileString = DATEINAME @@ -1024,7 +1017,7 @@ Public Class frmIndex Case "DD_MM_YYYY" datetemp = _day & "_" & _Month & "_" & My.Computer.Clock.LocalTime.Year Case "OFilename" - DATEINAME = DATEINAME.Replace(element.Value, Path.GetFileNameWithoutExtension(CURRENT_WORKFILE)) + DATEINAME = DATEINAME.Replace(element.Value, System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE)) End Select If datetemp <> "" Then DATEINAME = DATEINAME.Replace(element.Value, datetemp) @@ -1059,6 +1052,15 @@ Public Class frmIndex End Select Next CURRENT_NEWFILENAME = NewFileString & extension + Dim path = System.IO.Path.GetDirectoryName(CURRENT_NEWFILENAME) + If folder_Created = False Then + ' Den Zielordner erstellen + If Directory.Exists(path) = False Then + 'Try to create the directory. + Directory.CreateDirectory(path) + End If + folder_Created = True + End If 'False oder True zurückgeben If err = False Then Return True @@ -1087,7 +1089,7 @@ Public Class frmIndex Dim indexname = row.Item("WD_INDEX").ToString Dim optional_Index = CBool(row.Item("OPTIONAL")) If CBool(row.Item("Indexiert")) = True And idxvalue.ToString <> "" Then - If indexname <> "" And optional_Index = False Then + If indexname <> String.Empty Then 'Den Indexwert zwischenspeichern Dim DTTemp As DataTable = MyDataset.TBTEMP_INDEXRESULTS Dim rowexists As Boolean = False @@ -1122,7 +1124,8 @@ Public Class frmIndex ClassLogger.Add(" >> No Indexing: is optional? " & optional_Index.ToString, False) End If End If - + Else + ClassLogger.Add(" >> Indexvalue is empty or field is not indexed - Indexname: " & indexname, False) End If Next @@ -1289,7 +1292,7 @@ Public Class frmIndex Return indexierung_erfolgreich End If Catch ex As Exception - MsgBox("Error in SetEmailIndices:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + MsgBox("Error in SetEmailIndices:" & vbNewLine & ex.Message & vbNewLine & "Please check the configuration Email-Indexing!", MsgBoxStyle.Critical) Return False End Try @@ -1539,11 +1542,11 @@ Public Class frmIndex cmbDokumentart.DataSource = DT_DOKART cmbDokumentart.ValueMember = DT_DOKART.Columns("DOCTYPE_ID").ColumnName cmbDokumentart.DisplayMember = DT_DOKART.Columns("DOCTYPE").ColumnName - cmbDokumentart.AutoCompleteMode = AutoCompleteMode.SuggestAppend + cmbDokumentart.AutoCompleteMode = AutoCompleteMode.Suggest cmbDokumentart.AutoCompleteSource = AutoCompleteSource.ListItems Me.cmbDokumentart.SelectedIndex = -1 'If CURRENT_LASTDOKART <> "" Then - ' cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(CURRENT_LASTDOKART) + 'cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(CURRENT_LASTDOKART) 'End If Catch ex As Exception ClassLogger.Add(" - Fehler beim Laden der Dokumentarten - Fehler: " & vbNewLine & ex.Message) @@ -2017,7 +2020,22 @@ Public Class frmIndex 'Datei verschieben err = Move_Rename_Only(CURRENT_WORKFILE, NewFileString, CURR_WORKFILE_EXTENSION, VERSION_DELIMITER) Else + If CURRENT_NEWFILENAME.Contains("//") Then + CURRENT_NEWFILENAME = CURRENT_NEWFILENAME.Replace("//", "/") + End If + If CURRENT_NEWFILENAME.Contains("\\") Then + CURRENT_NEWFILENAME = CURRENT_NEWFILENAME.Replace("\\", "\") + End If Dim exp2WD As Boolean = False + 'Variable Folder + Dim sql As String = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID + Dim Folder_for_index = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + If Not IsDBNull(Folder_for_index) Then + If Folder_for_index <> String.Empty Then + CrFolderForIndex(Folder_for_index) + End If + End If + 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 @@ -2031,13 +2049,7 @@ Public Class frmIndex 'Kein Fehler in Export2windream err = False If Write_Indizes() = True Then - Dim sql As String = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID - Dim Folder_for_index = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) - If Not IsDBNull(Folder_for_index) Then - If Folder_for_index <> String.Empty Then - CrFolderForIndex(CURRENT_NEWFILENAME, Folder_for_index) - End If - End If + 'Kein Fehler in Setzen der windream-Indizes @@ -2116,9 +2128,9 @@ Public Class frmIndex End Try End Sub - Private Function CrFolderForIndex(ByVal fullfilename As String, folderindex As String) + Private Function CrFolderForIndex(folderindex As String) Try - Dim RootFolder As String = Path.GetDirectoryName(fullfilename) + Dim RootFolder As String = Path.GetDirectoryName(CURRENT_NEWFILENAME) '###### Dim p_reg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" @@ -2199,83 +2211,9 @@ Public Class frmIndex - 'Dim _folderArray As String() - '_folderArray = folderindex.Split("\") - - ''Für jeden Folder die maskierung entfernen - 'For Each _Uordner As String In _folderArray - ' Dim folder_temp - ' If _Uordner.StartsWith("[%") Then - ' Dim Indexwert As String - ' folder_temp = _Uordner.Replace("[%", "") - ' folder_temp = folder_temp.Replace("]", "") - ' If LogErrorsOnly = False Then ClassLogger.Add(" ...CrFolder Ordner: '" & folder_temp & "'", False) - ' 'Den Indexwert auslesen - ' Try - ' If LogErrorsOnly = False Then ClassLogger.Add(" ...Versuch den Indexwert aus '" & CStr(folder_temp) & "' auszulesen.", False) - - ' Indexwert = GetManIndex_Value(folder_temp) - ' If LogErrorsOnly = False Then ClassLogger.Add(" ...Ergebnis/Wert für neuen Ordner: '" & CStr(Indexwert) & "'", False) - ' Catch ex As Exception - ' ClassLogger.Add("Der Index '" & folder_temp & "' ist nicht gefüllt oder es trat ein Fehler beim Auslesen der Indexwerte auf", True) - ' Return True - ' End Try - - ' If Not Indexwert = String.Empty Then - ' If IsDate(Indexwert) Then - ' Indexwert = CDate(Indexwert).ToString("yyyyMMdd") - ' End If - ' newFolder = newFolder & Indexwert & "\" - ' If LogErrorsOnly = False Then ClassLogger.Add(" ...newFolder: '" & newFolder & "'", 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('" & CStr(folder_temp) & "')", MyConnectionString, True) - ' If optional_index = True Then - ' If LogErrorsOnly = False Then ClassLogger.Add(" ...Optionaler Indexwert ist NICHT gefüllt", False) - ' Else - ' ClassLogger.Add(" - Achtung Ausnahme in 'CrFolderForIndex': der Index ist leer!", True) - ' Return True - ' End If - ' End If - ' End If - ' 'Überprüfen ob es ein Variable Ordneranlage sein soll (DATUM) - ' If _Uordner.StartsWith("[V%") Then - ' Dim _Month As String = My.Computer.Clock.LocalTime.Month - ' If _Month.Length = 1 Then - ' _Month = "0" & _Month - ' End If - ' Dim _day As String = My.Computer.Clock.LocalTime.Day - ' If _day.Length = 1 Then - ' _day = "0" & _day - ' End If - ' Dim type = _Uordner.Replace("[V%", "") - ' type = type.Replace("]", "") - ' Select Case type - ' Case "YYYY/MM/DD" - ' folder_temp = My.Computer.Clock.LocalTime.Year & "\" & _Month & "\" & _day - ' newFolder = newFolder & folder_temp & "\" - ' Case "YYYY/MM" - ' folder_temp = My.Computer.Clock.LocalTime.Year & "\" & _Month - ' newFolder = newFolder & folder_temp & "\" - ' Case "YYYY" - ' folder_temp = My.Computer.Clock.LocalTime.Year - ' newFolder = newFolder & folder_temp & "\" - ' Case "YYYY-MM" - ' folder_temp = My.Computer.Clock.LocalTime.Year & "-" & _Month - ' newFolder = newFolder & folder_temp & "\" - ' End Select - ' End If - ' 'Überprüfen ob es ein manueller Ordner ist - ' If _Uordner.StartsWith("[MF%") Then - ' folder_temp = _Uordner.Replace("[MF%", "") - ' folder_temp = folder_temp.Replace("]", "") - ' newFolder = newFolder & folder_temp & "\" - ' End If - 'Next - - If LogErrorsOnly = False Then ClassLogger.Add(" >> Den Root-Folder zusammenfügen>> ", False) Dim fullpath As String = RootFolder & "\" & folderindex & "\" - fullpath.Replace("\\", "\") + fullpath = fullpath.Replace("\\", "\") If LogErrorsOnly = False Then ClassLogger.Add(" >> Fullpath (mit evtl. Sonderzeichen (SZ)) '" & fullpath & "'", False) Dim invalidPathChars() As Char = Path.GetInvalidPathChars() For Each sonderChar As Char In invalidPathChars @@ -2288,18 +2226,27 @@ Public Class frmIndex Next sonderChar If LogErrorsOnly = False Then ClassLogger.Add(" >> Fullpath (ohne SZ) '" & fullpath & "'", False) If Directory.Exists(fullpath) = False Then - Directory.CreateDirectory(fullpath) - If LogErrorsOnly = False Then ClassLogger.Add(" >> Folder '" & fullpath & "' wurde angelegt", False) + Try + Directory.CreateDirectory(fullpath) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Folder '" & fullpath & "' wurde angelegt", False) + Catch ex As Exception + ClassLogger.Add(" >> Error in CreateFolderforIndex-Method - Root Folder '" & fullpath & "' could not be created. " & ex.Message, True) + MsgBox("Attention: Root Folder '" & fullpath & "' could not be created." & vbNewLine & ex.Message, MsgBoxStyle.Critical) + Return False + End Try + End If 'Die aktuelle Datei soll gleichzeitig verschoben werden - Dim extension As String = Path.GetExtension(fullfilename) - Dim Dateiname As String = Path.GetFileName(fullfilename) + 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 - If Path.GetDirectoryName(fullfilename) <> Path.GetDirectoryName(_Ziel) Then + 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 @@ -2308,17 +2255,19 @@ Public Class frmIndex _Ziel = neuername version = version + 1 Loop - My.Computer.FileSystem.MoveFile(fullfilename, _Ziel) - ClassLogger.Add(" >> Datei wurde nach CrFolderIndex-Methode erfolgreich verschoben", False) + CURRENT_NEWFILENAME = _Ziel + ' My.Computer.FileSystem.MoveFile(fullfilename, _Ziel) + ClassLogger.Add(" >> Dateiname wurde nach CrFolderIndex-Methode erzeugt", False) CURRENT_NEWFILENAME = _Ziel Else - 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 + 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 @@ -2328,6 +2277,7 @@ Public Class frmIndex 'End If Catch ex As Exception + MsgBox("Unexpected Error in CreateFolderforIndex-Method:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) ClassLogger.Add(" >> Fehler in CrFolderForIndex: " & ex.Message, True) Return False End Try diff --git a/Global_Indexer/frmSplash.vb b/Global_Indexer/frmSplash.vb index 75f1001..64f68f4 100644 --- a/Global_Indexer/frmSplash.vb +++ b/Global_Indexer/frmSplash.vb @@ -81,18 +81,20 @@ Public NotInheritable Class frmSplash System.Threading.Thread.Sleep(600) bw.ReportProgress(CalcProgress(2), "Initialize Database") - Init.InitDatabase() + If Init.InitDatabase() = True Then + System.Threading.Thread.Sleep(600) + bw.ReportProgress(CalcProgress(3), "Initialize UserConfiguration") + Init.InitUserLogin() - System.Threading.Thread.Sleep(600) - bw.ReportProgress(CalcProgress(3), "Initialize UserConfiguration") - Init.InitUserLogin() + System.Threading.Thread.Sleep(600) - System.Threading.Thread.Sleep(600) + bw.ReportProgress(CalcProgress(4), "Initialize windream-Settings") + Init.InitBasics() - bw.ReportProgress(CalcProgress(4), "Initialize windream-Settings") - Init.InitBasics() + System.Threading.Thread.Sleep(500) + End If - System.Threading.Thread.Sleep(500) + End Sub Private Sub bw_ProgressChanged(sender As Object, e As System.ComponentModel.ProgressChangedEventArgs) diff --git a/Global_Indexer/frmStart.Designer.vb b/Global_Indexer/frmStart.Designer.vb index 0d4523a..0385cb0 100644 --- a/Global_Indexer/frmStart.Designer.vb +++ b/Global_Indexer/frmStart.Designer.vb @@ -61,82 +61,82 @@ Partial Class frmStart ' 'MenuStrip1 ' - Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KonfigurationToolStripMenuItem}) resources.ApplyResources(Me.MenuStrip1, "MenuStrip1") + Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KonfigurationToolStripMenuItem}) Me.MenuStrip1.Name = "MenuStrip1" ' 'KonfigurationToolStripMenuItem ' + resources.ApplyResources(Me.KonfigurationToolStripMenuItem, "KonfigurationToolStripMenuItem") Me.KonfigurationToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.KonfigurationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator1, Me.GrundeinstellungenToolStripMenuItem, Me.FrmHotkeyAddToolStripMenuItem, Me.HistoryIndexierteDateienToolStripMenuItem, Me.InfoToolStripMenuItem}) Me.KonfigurationToolStripMenuItem.Image = Global.Global_Indexer.My.Resources.Resources.gear_32xLG Me.KonfigurationToolStripMenuItem.Name = "KonfigurationToolStripMenuItem" - resources.ApplyResources(Me.KonfigurationToolStripMenuItem, "KonfigurationToolStripMenuItem") ' 'AdministrationToolStripMenuItem ' + resources.ApplyResources(Me.AdministrationToolStripMenuItem, "AdministrationToolStripMenuItem") Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GlobalIndexerEinstellungenToolStripMenuItem, Me.HotkeyEisntellungenToolStripMenuItem}) Me.AdministrationToolStripMenuItem.Image = Global.Global_Indexer.My.Resources.Resources.Einstellungen6 Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem" - resources.ApplyResources(Me.AdministrationToolStripMenuItem, "AdministrationToolStripMenuItem") ' 'GlobalIndexerEinstellungenToolStripMenuItem ' + resources.ApplyResources(Me.GlobalIndexerEinstellungenToolStripMenuItem, "GlobalIndexerEinstellungenToolStripMenuItem") Me.GlobalIndexerEinstellungenToolStripMenuItem.Image = Global.Global_Indexer.My.Resources.Resources.Einstellungen6 Me.GlobalIndexerEinstellungenToolStripMenuItem.Name = "GlobalIndexerEinstellungenToolStripMenuItem" - resources.ApplyResources(Me.GlobalIndexerEinstellungenToolStripMenuItem, "GlobalIndexerEinstellungenToolStripMenuItem") ' 'HotkeyEisntellungenToolStripMenuItem ' + resources.ApplyResources(Me.HotkeyEisntellungenToolStripMenuItem, "HotkeyEisntellungenToolStripMenuItem") Me.HotkeyEisntellungenToolStripMenuItem.Image = Global.Global_Indexer.My.Resources.Resources.Shortcut_8169_16x Me.HotkeyEisntellungenToolStripMenuItem.Name = "HotkeyEisntellungenToolStripMenuItem" - resources.ApplyResources(Me.HotkeyEisntellungenToolStripMenuItem, "HotkeyEisntellungenToolStripMenuItem") ' 'ToolStripSeparator1 ' - Me.ToolStripSeparator1.Name = "ToolStripSeparator1" resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1") + Me.ToolStripSeparator1.Name = "ToolStripSeparator1" ' 'GrundeinstellungenToolStripMenuItem ' - Me.GrundeinstellungenToolStripMenuItem.Name = "GrundeinstellungenToolStripMenuItem" resources.ApplyResources(Me.GrundeinstellungenToolStripMenuItem, "GrundeinstellungenToolStripMenuItem") + Me.GrundeinstellungenToolStripMenuItem.Name = "GrundeinstellungenToolStripMenuItem" ' 'FrmHotkeyAddToolStripMenuItem ' + resources.ApplyResources(Me.FrmHotkeyAddToolStripMenuItem, "FrmHotkeyAddToolStripMenuItem") Me.FrmHotkeyAddToolStripMenuItem.Image = Global.Global_Indexer.My.Resources.Resources.Shortcut_8169_16x Me.FrmHotkeyAddToolStripMenuItem.Name = "FrmHotkeyAddToolStripMenuItem" - resources.ApplyResources(Me.FrmHotkeyAddToolStripMenuItem, "FrmHotkeyAddToolStripMenuItem") ' 'HistoryIndexierteDateienToolStripMenuItem ' - Me.HistoryIndexierteDateienToolStripMenuItem.Name = "HistoryIndexierteDateienToolStripMenuItem" resources.ApplyResources(Me.HistoryIndexierteDateienToolStripMenuItem, "HistoryIndexierteDateienToolStripMenuItem") + Me.HistoryIndexierteDateienToolStripMenuItem.Name = "HistoryIndexierteDateienToolStripMenuItem" ' 'InfoToolStripMenuItem ' - Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem" resources.ApplyResources(Me.InfoToolStripMenuItem, "InfoToolStripMenuItem") + Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem" ' 'StatusStrip1 ' + resources.ApplyResources(Me.StatusStrip1, "StatusStrip1") Me.StatusStrip1.AllowDrop = True Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblFW, Me.tslblCultureInfo}) - resources.ApplyResources(Me.StatusStrip1, "StatusStrip1") Me.StatusStrip1.Name = "StatusStrip1" ' 'tslblFW ' + resources.ApplyResources(Me.tslblFW, "tslblFW") Me.tslblFW.BackColor = System.Drawing.SystemColors.Control Me.tslblFW.Image = Global.Global_Indexer.My.Resources.Resources.bell_go Me.tslblFW.Name = "tslblFW" - resources.ApplyResources(Me.tslblFW, "tslblFW") ' 'tslblCultureInfo ' + resources.ApplyResources(Me.tslblCultureInfo, "tslblCultureInfo") Me.tslblCultureInfo.BackColor = System.Drawing.SystemColors.Control Me.tslblCultureInfo.Name = "tslblCultureInfo" - resources.ApplyResources(Me.tslblCultureInfo, "tslblCultureInfo") Me.tslblCultureInfo.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal ' 'TimerFolderWatch @@ -157,16 +157,19 @@ Partial Class frmStart ' 'LabelControl1 ' - Me.LabelControl1.AllowDrop = True resources.ApplyResources(Me.LabelControl1, "LabelControl1") + Me.LabelControl1.AllowDrop = True Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font) - 'Me.LabelControl1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center - 'Me.LabelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder + Me.LabelControl1.Appearance.FontSizeDelta = CType(resources.GetObject("LabelControl1.Appearance.FontSizeDelta"), Integer) + Me.LabelControl1.Appearance.FontStyleDelta = CType(resources.GetObject("LabelControl1.Appearance.FontStyleDelta"), System.Drawing.FontStyle) + Me.LabelControl1.Appearance.GradientMode = CType(resources.GetObject("LabelControl1.Appearance.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode) + Me.LabelControl1.Appearance.Image = CType(resources.GetObject("LabelControl1.Appearance.Image"), System.Drawing.Image) Me.LabelControl1.Name = "LabelControl1" ' 'OpenFileDialog1 ' Me.OpenFileDialog1.FileName = "OpenFileDialog1" + resources.ApplyResources(Me.OpenFileDialog1, "OpenFileDialog1") Me.OpenFileDialog1.Multiselect = True ' 'LabelMachine @@ -234,15 +237,15 @@ Partial Class frmStart ' 'btnChoosefiles ' - Me.btnChoosefiles.AllowDrop = True resources.ApplyResources(Me.btnChoosefiles, "btnChoosefiles") + Me.btnChoosefiles.AllowDrop = True Me.btnChoosefiles.Name = "btnChoosefiles" Me.btnChoosefiles.UseVisualStyleBackColor = True ' 'frmStart ' - Me.AllowDrop = True resources.ApplyResources(Me, "$this") + Me.AllowDrop = True Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.SystemColors.ControlLight Me.Controls.Add(Me.btnChoosefiles) diff --git a/Global_Indexer/frmStart.de.resx b/Global_Indexer/frmStart.de.resx index 19228ba..5c42b9d 100644 --- a/Global_Indexer/frmStart.de.resx +++ b/Global_Indexer/frmStart.de.resx @@ -117,6 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + False + 348, 24 @@ -420,53 +424,25 @@ /+AAH/////////////////////////////////////////////8= - - - - Comic Sans MS, 11.25pt - - - 0 - - - Regular - - - Horizontal - - - - - - - - - - 38, 48 263, 40 - - Comic Sans MS, 14.25pt - 38, 94 263, 37 - - wählen Sie hier Dateien - 348, 179 + diff --git a/Global_Indexer/frmStart.en.resx b/Global_Indexer/frmStart.en.resx index d49bc6e..cd20d32 100644 --- a/Global_Indexer/frmStart.en.resx +++ b/Global_Indexer/frmStart.en.resx @@ -182,7 +182,7 @@ - 0, 138 + 0, 123 329, 22 @@ -475,28 +475,44 @@ - Comic Sans MS, 14.25pt + Comic Sans MS, 12pt - - 41, 42 + + + 0 - - 246, 26 + + Regular - - Comic Sans MS, 14.25pt - - - 28, 74 - - - 329, 160 + + Horizontal + + + + + 24, 44 + + + 280, 23 + + + Place files with drag and drop here or, + + + 22, 73 + + + choose files here + + + 329, 145 + - Inherit + NoControl \ No newline at end of file diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index 0a4cff7..c0947f8 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -117,137 +117,75 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - 231, 22 - - - Global Indexer - Einstellungen - - - 231, 22 - - - Hotkey - Einstellungen - - - 217, 22 - - - Administration - - - 214, 6 - - - 217, 22 - - - Grundeinstellungen User - - - 217, 22 - - - Hotkey-Funktion User - 217, 22 - - History - Indexierte Dateien + + 393, 210 - - 217, 22 + + DevExpress.XtraBars.Ribbon.RibbonMiniToolbar, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Info - - - 108, 20 - - - Konfiguration - - - 0, 0 - - - 393, 24 - - - - 5 - - - MenuStrip1 - - - MenuStrip1 - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + wählen Sie hier Dateien $this - - 3 + + btnChoosefiles + + + tslblFW + + + RibbonMiniToolbar1 - - 132, 17 - 133, 17 - - FolderWatch ist aktiv - - - False - - - 121, 17 - - - ToolStripStatusLabel1 - - - 0, 188 - - - 393, 22 - - - 6 + + MenuStrip1 StatusStrip1 - - StatusStrip1 + + + - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + StatusMachine - - $this + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 2 + + 108, 20 + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 9 + + + GrundeinstellungenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TBHOTKEY_USER_PROFILEBindingSource - - 1072, 17 - - - 1223, 17 - - - 1386, 17 - AAABAAEAQEAAAAEAIAAoQgAAFgAAACgAAABAAAAAgAAAAAEAIAAAAAAAAEAAABILAAASCwAAAAAAAAAA @@ -535,121 +473,195 @@ /+AAH/////////////////////////////////////////////8= + + StatusVersion + + + Comic Sans MS, 14.25pt + + + 6, 13 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 217, 22 + + + OpenFileDialog1 + + + 3 + + + KonfigurationToolStripMenuItem + + + Konfiguration + + + Info + + + ToolStripSeparator1 + + + Hotkey - Einstellungen + + + 393, 24 + + + Administration + + + NoControl + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TimerClose3Minutes + GlobalIndexer - - 1501, 17 - - - - None + + Horizontal + + + TimerFolderWatch + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + StatusLoggedIn + + + 0 + + + GlobalIndexerEinstellungenToolStripMenuItem Comic Sans MS, 12pt - - 53, 63 + + History - Indexierte Dateien - - 282, 46 + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8 + + TableAdapterManager + + + 5 + + + FolderWatch ist aktiv Ziehen Sie Dateien per Drag and Drop hierher oder - - LabelControl1 + + 217, 22 - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + $this + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 $this - - 1 + + System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1689, 17 - - - StatusMachine - - - StatusUser - - - StatusLoggedIn - - - StatusVersion - - - 17, 56 - - - 249, 17 - - - 359, 17 - - - 632, 17 - - - 899, 17 - - - None - - - Comic Sans MS, 14.25pt - - - NoControl + + 121, 17 53, 115 + + ToolStripStatusLabel1 + + + FrmHotkeyAddToolStripMenuItem + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Global Indexer - Einstellungen + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + frmStart + + + MyDataset + + + LabelControl1 + + + tslblCultureInfo + + + Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + LabelLoggedIn + + + None + + + MenuStrip1 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Grundeinstellungen User + + + LabelUser + + + AdministrationToolStripMenuItem + + + StatusStrip1 + 282, 37 - - 9 + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - wählen Sie hier Dateien - - - btnChoosefiles - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - True - - - 203 - - - 6, 13 - - - 393, 210 - - - Segoe UI, 8.25pt + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1543,163 +1555,166 @@ hierher oder /////////////wA///////////////////8f//////////////////// - - Global Indexer - - - KonfigurationToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - AdministrationToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GlobalIndexerEinstellungenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - HotkeyEisntellungenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator1 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrundeinstellungenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - FrmHotkeyAddToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - HistoryIndexierteDateienToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - InfoToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tslblFW - - - 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 - - - System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TimerClose3Minutes - - - System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NotifyIcon1 - - - System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TimerCheckDroppedFiles - - - System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - OpenFileDialog1 - - - System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LabelMachine - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LabelUser - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LabelLoggedIn - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LabelVersion - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonMiniToolbar1 - - - DevExpress.XtraBars.Ribbon.RibbonMiniToolbar, DevExpress.XtraBars.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 - - - TBHOTKEY_USER_PROFILEBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TBHOTKEY_USER_PROFILETableAdapter + + 217, 22 Global_Indexer.MyDatasetTableAdapters.TBHOTKEY_USER_PROFILETableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - TableAdapterManager + + HistoryIndexierteDateienToolStripMenuItem - - Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - frmStart + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TimerCheckDroppedFiles + + + Global Indexer + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + None + + + 231, 22 + + + Regular + + + StatusUser + + + Hotkeys User + + + LabelMachine + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + LabelVersion + + + $this + + + 53, 63 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InfoToolStripMenuItem + + + System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 217, 22 + + + 8 + + + HotkeyEisntellungenToolStripMenuItem + + + 282, 46 + + + Segoe UI, 8.25pt + + + 214, 6 + + + 393, 22 + + + 0, 188 + + + NotifyIcon1 System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + False + + + Global_Indexer.MyDataset, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + 231, 22 + + + 6 + + + TBHOTKEY_USER_PROFILETableAdapter + + + 17, 56 + + + 1501, 17 + + + 249, 17 + + + 359, 17 + + + 1072, 17 + + + 1386, 17 + + + 17, 17 + + + 203 + + + de + + + 632, 17 + + + True + + + 1689, 17 + + + 899, 17 + + + 1223, 17 + + + 132, 17 + \ No newline at end of file diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 8dfa583..a04504d 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -565,6 +565,13 @@ Public Class frmStart 'Sprache anpassen SetLanguage() LANGUAGE_CHANGED = False + If CURRENT_USER_IS_ADMIN = True Then + ToolStripSeparator1.Visible = True + AdministrationToolStripMenuItem.Visible = True + Else + ToolStripSeparator1.Visible = False + AdministrationToolStripMenuItem.Visible = False + End If End If Start_Folderwatch() Me.TopMost = True diff --git a/Global_Indexer/frmUserKonfig_AddUsers.designer.vb b/Global_Indexer/frmUserKonfig_AddUsers.designer.vb index 7e11af5..218652f 100644 --- a/Global_Indexer/frmUserKonfig_AddUsers.designer.vb +++ b/Global_Indexer/frmUserKonfig_AddUsers.designer.vb @@ -22,6 +22,7 @@ Partial Class frmUserKonfig_AddUsers 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmUserKonfig_AddUsers)) Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.lbGroups = New System.Windows.Forms.ListBox() @@ -34,6 +35,7 @@ Partial Class frmUserKonfig_AddUsers Me.tbSelectNone = New System.Windows.Forms.ToolStripButton() Me.btnCancel = New System.Windows.Forms.Button() Me.btnAddUsers = New System.Windows.Forms.Button() + Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components) CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() @@ -187,4 +189,5 @@ Partial Class frmUserKonfig_AddUsers Friend WithEvents tbSelectNone As System.Windows.Forms.ToolStripButton Friend WithEvents clbUsers As System.Windows.Forms.CheckedListBox Friend WithEvents ToolStripLabel2 As System.Windows.Forms.ToolStripLabel + Friend WithEvents ToolTipController1 As DevExpress.Utils.ToolTipController End Class diff --git a/Global_Indexer/frmUserKonfig_AddUsers.resx b/Global_Indexer/frmUserKonfig_AddUsers.resx index 9777f78..1c7abff 100644 --- a/Global_Indexer/frmUserKonfig_AddUsers.resx +++ b/Global_Indexer/frmUserKonfig_AddUsers.resx @@ -139,6 +139,9 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 231, 17 + AAABAAkAMDAQAAEABABoBgAAlgAAACAgEAABAAQA6AIAAP4GAAAQEBAAAQAEACgBAADmCQAAMDAAAAEA diff --git a/Global_Indexer/frmUserKonfig_AddUsers.vb b/Global_Indexer/frmUserKonfig_AddUsers.vb index 1e561d2..c937d08 100644 --- a/Global_Indexer/frmUserKonfig_AddUsers.vb +++ b/Global_Indexer/frmUserKonfig_AddUsers.vb @@ -216,7 +216,7 @@ Public Class frmUserKonfig_AddUsers Dim d = dsResult.Properties("member").Count For intCounter = 0 To dsResult.Properties("member").Count - 1 strUsers = dsResult.Properties("member")(intCounter).ToString - + If LogErrorsOnly = False Then ClassLogger.Add(">> Usermember-String for Group: " & strUsers.ToString, False) 'Get index of equals and comma intEqualsIndex = strUsers.IndexOf("=", 1) intCommaIndex = strUsers.IndexOf(",", 1) @@ -270,6 +270,10 @@ Public Class frmUserKonfig_AddUsers End If For Each user In users + If user.EndsWith("/") Or user.EndsWith("\") Then + user = user.Replace("/", "") + user = user.Replace("\", "") + End If clbUsers.Items.Add(user) Next Me.Cursor = Cursors.Default @@ -287,24 +291,36 @@ Public Class frmUserKonfig_AddUsers End If For Each item In items - Dim user As String = item.ToString - Dim PRENAME As String = GetProperty_LDAP(user, "givenName") - Dim NAME As String = GetProperty_LDAP(user, "sn") - Dim email As String = GetProperty_LDAP(user, "mail") - Dim USERNAME As String = GetProperty_LDAP(user, "samaccountname") - - Dim SQL - If Not UserExists(USERNAME) Then - SQL = String.Format("INSERT INTO TBDD_USER(PRENAME, NAME, USERNAME, EMAIL, MODULE_GI,ADDED_WHO) VALUES('{0}', '{1}', '{2}','{3}',1,'{4}')", PRENAME, NAME, USERNAME, email, Environment.UserName) - If ClassDatabase.Execute_non_Query(SQL) = True Then - usersAdded = usersAdded + 1 + Dim ctx As PrincipalContext = New PrincipalContext(ContextType.Domain) + Dim usr As UserPrincipal = UserPrincipal.FindByIdentity(ctx, IdentityType.Name, item.ToString) + If Not IsNothing(usr) Then + 'Dim user As String = item.ToString + 'Dim PRENAME As String = GetProperty_LDAP(user, "givenName") + 'Dim NAME As String = GetProperty_LDAP(user, "sn") + 'Dim email As String = GetProperty_LDAP(user, "mail") + 'Dim USERNAME As String = GetProperty_LDAP(user, "samaccountname") + Dim PRENAME As String = usr.GivenName + Dim NAME As String = usr.Surname + Dim USERNAME As String = usr.SamAccountName + Dim email As String = usr.EmailAddress + Dim SQL + If Not UserExists(USERNAME) Then + SQL = String.Format("INSERT INTO TBDD_USER(PRENAME, NAME, USERNAME, EMAIL, MODULE_GI,ADDED_WHO) VALUES('{0}', '{1}', '{2}','{3}',1,'{4}')", PRENAME, NAME, USERNAME, email, Environment.UserName) + If ClassDatabase.Execute_non_Query(SQL) = True Then + usersAdded = usersAdded + 1 + End If + Else + SQL = "UPDATE TBDD_USER SET MODULE_GI = 1 WHERE UPPER(USERNAME) = UPPER('" & USERNAME & "')" + If ClassDatabase.Execute_non_Query(SQL) = True Then + usersAdded = usersAdded + 1 + End If End If Else - SQL = "UPDATE TBDD_USER SET MODULE_GI = 1 WHERE UPPER(USERNAME) = UPPER('" & USERNAME & "')" - If ClassDatabase.Execute_non_Query(SQL) = True Then - usersAdded = usersAdded + 1 - End If + MsgBox("Für den User '" & item.ToString & "' konnte kein Userprincipal aus der LDAP erstellt werden!", MsgBoxStyle.Information) End If + + + Next If usersAdded = 1 Then @@ -362,4 +378,24 @@ Public Class frmUserKonfig_AddUsers ' MsgBox(email) ' End If 'End Sub + + Private Sub clbUsers_MouseClick(sender As Object, e As MouseEventArgs) Handles clbUsers.MouseClick + Try + ToolTipController1.HideHint() + Dim userstring As String = clbUsers.SelectedItem.ToString + Dim ctx As PrincipalContext = New PrincipalContext(ContextType.Domain) + Dim usr As UserPrincipal = UserPrincipal.FindByIdentity(ctx, IdentityType.Name, userstring) + If Not IsNothing(usr) Then + Dim PRENAME As String = usr.GivenName + Dim NAME As String = usr.Surname + Dim USERNAME As String = usr.SamAccountName + Dim email As String = usr.EmailAddress + ToolTipController1.ShowHint("SamAccountName: " & USERNAME & vbNewLine & "GivenName: " & PRENAME & vbNewLine & "Surname: " & NAME & vbNewLine & "EmailAddress: " & email, "Preview LDAP-Parameter:", DevExpress.Utils.ToolTipLocation.RightCenter) + End If + ctx.Dispose() + Catch ex As Exception + MsgBox("Error in getting Userinfo LDAP:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + + End Sub End Class \ No newline at end of file diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs index b458d03..b9b97c7 100644 --- a/SetupWix/Product.wxs +++ b/SetupWix/Product.wxs @@ -1,7 +1,7 @@ - +