diff --git a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb index 211928b..e8268f7 100644 --- a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb +++ b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb @@ -111,12 +111,12 @@ Public Class ClassAllgemeineFunktionen End If End Sub - Public Function Delete_xffres(originFile As String) + Public Function Delete_xffres(originFile As String, clsWD As ClassWindream_allgemein) Try Dim Stammname As String = System.IO.Path.GetFileNameWithoutExtension(originFile) Dim Path As String = System.IO.Path.GetDirectoryName(originFile) Dim xffres As String = Path & "\" & Stammname & ".xffres" - If file_exists(xffres, False) = True Then + If file_exists(xffres, clsWD) = True Then System.IO.File.Delete(xffres) ClassLogger.Add(">> Datei " & xffres & " erfolgreich gelöscht", False) Return True @@ -128,42 +128,27 @@ Public Class ClassAllgemeineFunktionen ClassLogger.Add(">> Fehlermeldung: " & ex.Message, False) End Try End Function - Public Function func_check_file_use(ByVal filename) As Boolean - Dim fs As Integer = FreeFile() - Dim inuse As Boolean = False - If File.Exists(filename) Then - Try - FileOpen(fs, filename, OpenMode.Binary, _ - OpenAccess.ReadWrite, OpenShare.LockReadWrite) - Catch - inuse = True - Finally - FileClose(fs) - End Try - End If - Return inuse - End Function - Public Function Delete_File(originFile As String) - Try + 'Public Function Delete_File(originFile As String) + ' Try - If file_exists(originFile, False) = True Then - System.IO.File.Delete(originFile) - ClassLogger.Add(">> Manuelles Löschen: Datei " & originFile & " erfolgreich gelöscht", False) - Return True - Else - MsgBox("Die Datei konnte nicht gelsöcht werden. File NOT EXISTS", MsgBoxStyle.Exclamation) - Return False - End If - Catch ex As Exception - ClassLogger.Add(" Fehler bei Delete_File", True) - ClassLogger.Add(">> Fehlermeldung: " & ex.Message, False) - End Try - End Function + ' If file_exists(originFile, False) = True Then + ' System.IO.File.Delete(originFile) + ' ClassLogger.Add(">> Manuelles Löschen: Datei " & originFile & " erfolgreich gelöscht", False) + ' Return True + ' Else + ' MsgBox("Die Datei konnte nicht gelsöcht werden. File NOT EXISTS", MsgBoxStyle.Exclamation) + ' Return False + ' End If + ' Catch ex As Exception + ' ClassLogger.Add(" Fehler bei Delete_File", True) + ' ClassLogger.Add(">> Fehlermeldung: " & ex.Message, False) + ' End Try + 'End Function - Public Function Move2Folder(ByVal vMove_File As String, ByVal vZiel_Pfad As String, Profile_ID As Integer) + Public Function Move2Folder(ByVal vMove_File As String, ByVal vZiel_Pfad As String, Profile_ID As Integer, clsWD As ClassWindream_allgemein) Try If vpdfviewer <> "internal" And vMove_File.EndsWith("pdf") Then - Do While func_check_file_use(vMove_File) = True + Do While clsWD.CheckFileExists(vMove_File) = True 'func_check_file_use(vMove_File) ClassLogger.Add(">> MoveRename: Datei noch geöffnet - Warten", False) System.Threading.Thread.Sleep(500) Loop @@ -178,7 +163,7 @@ Public Class ClassAllgemeineFunktionen Dim version As Integer = 1 If vZiel_Pfad <> path Then Dim Stammname As String = IO.Path.GetFileNameWithoutExtension(vMove_File) - Do While file_exists(_Ziel, False) = True + Do While file_exists(_Ziel, clsWD) = True Dim neuername As String = Stammname & "~" & version & extension _Ziel = neuername version = version + 1 @@ -198,13 +183,9 @@ Public Class ClassAllgemeineFunktionen Return ex.Message End Try End Function - Public Function file_exists(ByVal _file As String, ByVal suche As Boolean) + Public Function file_exists(ByVal _file As String, clsWD As ClassWindream_allgemein) Try - If System.IO.File.Exists(_file) Then - Return True - Else - Return False - End If + Return clsWD.CheckFileExists(_file) Catch ex As Exception ClassLogger.Add("Fehler in Funktion file_exists - Fehler: ", ex.Message) Return False diff --git a/app/DD_PM_WINDREAM/ClassDatabase.vb b/app/DD_PM_WINDREAM/ClassDatabase.vb index 046651f..605b6a8 100644 --- a/app/DD_PM_WINDREAM/ClassDatabase.vb +++ b/app/DD_PM_WINDREAM/ClassDatabase.vb @@ -1,4 +1,5 @@ -Imports Oracle.ManagedDataAccess.Client +Imports System.Data.SqlClient +Imports Oracle.ManagedDataAccess.Client Public Class ClassDatabase Private Shared SQLSERVERConnectionString As String Private Shared OracleConnectionString As String @@ -18,7 +19,7 @@ Public Class ClassDatabase ' connectionString = "Server=" & DTConnection.Rows(0).Item("SERVER") & ";Database=" & DTConnection.Rows(0).Item("DATENBANK") & ";User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";" Case "Oracle" If DTConnection.Rows(0).Item("BEMERKUNG").ToString.Contains("without tnsnames") Then - connectionString = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & DTConnection.Rows(0).Item("SERVER") & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & _ + connectionString = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & DTConnection.Rows(0).Item("SERVER") & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & DTConnection.Rows(0).Item("DATENBANK") & ")));User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";" Else connectionString = "Data Source=" & DTConnection.Rows(0).Item("SERVER") & ";Persist Security Info=True;User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";Unicode=True" @@ -126,7 +127,7 @@ Public Class ClassDatabase Clipboard.SetText("Error ExecuteCMD: " & ex.Message & vbNewLine & "SQL: " & ExecuteCMD) ClassLogger.Add("Fehler bei Execute_non_Query: " & ex.Message, True) ClassLogger.Add("#SQL: " & ExecuteCMD, False) - + Return False End Try End Function diff --git a/app/DD_PM_WINDREAM/ClassDragDrop.vb b/app/DD_PM_WINDREAM/ClassDragDrop.vb index b36b079..3f8bdc0 100644 --- a/app/DD_PM_WINDREAM/ClassDragDrop.vb +++ b/app/DD_PM_WINDREAM/ClassDragDrop.vb @@ -58,7 +58,17 @@ Public Class ClassDragDrop Dim source As String = view.GridControl.Name If Not IsNothing(row) Then - dragDropData = row.Item("GUID") & "|" & source + Try + dragDropData = row.Item("GUID") & "|" & source + Catch ex As Exception + Try + dragDropData = row.Item("USER_ID") & "|" & source + Catch ex1 As Exception + MsgBox("Error in view_MouseMove(2nd exception): " & ex.Message, MsgBoxStyle.Critical) + End Try + + End Try + view.GridControl.DoDragDrop(dragDropData, DragDropEffects.Move) downHitInfo = Nothing diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 3ec451d..b331ebe 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -86,8 +86,6 @@ Public Class ClassInit frmClientLogin.ShowDialog() ElseIf DT_CLIENT_USER.Rows.Count = 1 Then CLIENT_SELECTED = DT_CLIENT_USER.Rows(0).Item("CLIENT_ID") - - ClassLogger.Add("User '" & USER_USERNAME & "' not related to a client", True) Else 'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") 'Me.Close() diff --git a/app/DD_PM_WINDREAM/ClassPMWindream.vb b/app/DD_PM_WINDREAM/ClassPMWindream.vb index 45c6458..59ac764 100644 --- a/app/DD_PM_WINDREAM/ClassPMWindream.vb +++ b/app/DD_PM_WINDREAM/ClassPMWindream.vb @@ -2,7 +2,9 @@ Imports WMOSRCHLib Public Class ClassPMWindream + Inherits ClassWindream_allgemein + Dim clsWM As ClassWindream_allgemein 'Private email As New ClassNIEmail Private allgFunk As New ClassAllgemeineFunktionen #Region "+++++ Konstanten +++++" @@ -418,7 +420,7 @@ Public Class ClassPMWindream End If Catch ex As Exception ClassLogger.Add("ClassSearchResult.RunIndexing - " & ex.Message, True) - frmValidator.idxerr_message = "Unvorhergesehener Fehler in Indexing: " & ex.Message & vbNewLine & "vType: " & vType.tostring + frmValidator.idxerr_message = "Unvorhergesehener Fehler in Indexing: " & ex.Message & vbNewLine & "vType: " & vType.ToString allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Unvorhergesehener Fehler beim Indexieren der Datei: " & oDocument.aName & " - ERROR: " & ex.Message, Environment.UserName) oDocument.Save() oDocument.unlock() @@ -480,8 +482,15 @@ Public Class ClassPMWindream Public Function Get_No_Documents(Profil As String, WD_Search As String) Try + Dim wmsearch_exists As Boolean + Try + wmsearch_exists = System.IO.File.Exists(WD_Search) + Catch ex As Exception + wmsearch_exists = clsWM.CheckFileExists(WD_Search) + + End Try + If wmsearch_exists = False Then - If System.IO.File.Exists(WD_Search) = False Then ClassLogger.Add(">> Windream Suche für Profil: '" & Profil & "' konnte nicht ausgeführt werden! Die Datei '" & WD_Search & "' existiert nicht!", False) MsgBox("Windream Suche für Profil: '" & Profil & "' konnte nicht ausgeführt werden!" & vbNewLine & "Die Datei '" & WD_Search & "' existiert nicht!", MsgBoxStyle.Exclamation, "Achtung:") 'wenn die gesuchte File eine Suche ist: per MAil informierne und Indexierung abbrechen @@ -511,7 +520,7 @@ Public Class ClassPMWindream Public Function GetSearchDocuments(ByVal wdfLocation As String) - If System.IO.File.Exists(wdfLocation) Then + If clsWM.CheckFileExists(wdfLocation) = True Then Try Dim ProfileName = wdfLocation.Substring(wdfLocation.LastIndexOf("\") + 1) diff --git a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb index 159c927..e4aa329 100644 --- a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb +++ b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb @@ -137,7 +137,8 @@ Public Class ClassWindream_allgemein WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID Dim userExistsInServerUserGroup = ClassDatabase.Execute_Scalar(sql, MyConnectionString) - If WMSESSION_STARTSTOP_STARTUP = True And userExistsInServerUserGroup Is Nothing Then + If WMSESSION_STARTSTOP_STARTUP = True Then + 'And userExistsInServerUserGroup Is Nothing ClassLogger.Add(">> WINDREAM-Start on ApplicationStart is active!", False) Dim owindreamControlCenter = CreateObject("Wmcc.ControlCenter") @@ -223,6 +224,27 @@ Public Class ClassWindream_allgemein Catch ex As Exception Return Nothing End Try + + End Function + Public Function CheckFileExists(Path As String) + Dim oNormalizedPath = Path + If Not Path.StartsWith("\") Then + oNormalizedPath = Path.Substring(2) + End If + Try + Dim oObjectId = 0 + Dim oObjectDbId = 0 + Dim WMObject As WINDREAMLib.WMObject '= CreateObject("WINDREAMLib.WMObject") 'New WINDREAMLib.WMObject + If IsNothing(oSession) Then + If Create_Session() = False Then + Return False + End If + End If + WMObject = oSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, oNormalizedPath) + Return True + Catch ex As Exception + Return False + End Try End Function ''' ''' Liefert alle Indexe eines Objekttypen. diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 06ba32e..fe5c97c 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -21956,9 +21956,9 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT SequentialOrder, USER_ID, USER_NAME, USER_PRENAME, USER_SURNAME, US"& _ - "ER_SHORTNAME, USER_EMAIL, USER_LANGUAGE, USER_COMMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM dbo.FNPM_"& _ - "GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE_USER_FOR_PROFILE_1" + Me._commandCollection(0).CommandText = "SELECT SequentialOrder, USER_ID, USER_NAME, USER_PRENAME, USER_SURNAME, USER_"& _ + "SHORTNAME, USER_EMAIL, USER_LANGUAGE, USER_COMMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM dbo.FNPM_GET_FRE"& _ + "E_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE_USER_FOR_PROFILE_1" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index b08eea9..bcd91ec 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -227,6 +227,12 @@ Form + + frmFileInfo.vb + + + Form + frmFormDesigner.vb @@ -346,6 +352,9 @@ frmError.vb + + frmFileInfo.vb + frmFormDesigner.vb @@ -644,6 +653,8 @@ + + diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 078a23f..54a1a47 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -9,6 +9,9 @@ Module ModuleRuntimeVariables Public CURRENT_DOC_GUID As Integer Public CURRENT_DOC_ID As Integer + Public CURRENT_DOC_CREATION_DATE As String + Public CURRENT_DOC_CREATION_TIME As String + Public CURRENT_JUMP_DOC_GUID As Integer Public CURRENT_WMFILE As WMObject diff --git a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb index 6adca99..a520229 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb +++ b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb @@ -80,6 +80,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property action_add_16xLG() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("action_add_16xLG", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -680,6 +690,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Symbols_Information_16xLG() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Symbols_Information_16xLG", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD_PM_WINDREAM/My Project/Resources.resx b/app/DD_PM_WINDREAM/My Project/Resources.resx index f966100..462b47c 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.resx +++ b/app/DD_PM_WINDREAM/My Project/Resources.resx @@ -124,6 +124,9 @@ ..\Resources\asterisk_yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -166,6 +169,9 @@ ..\Resources\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\application_form_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -217,14 +223,17 @@ ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\resultset_last.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\A_1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -250,8 +259,8 @@ ..\Resources\bullet_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\resultset_last.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\txt.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -295,9 +304,6 @@ ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\syncreon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -334,7 +340,7 @@ ..\Resources\user_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Symbols_Information_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/Resources/Symbols_Information_16xLG.png b/app/DD_PM_WINDREAM/Resources/Symbols_Information_16xLG.png new file mode 100644 index 0000000..6f9eba4 Binary files /dev/null and b/app/DD_PM_WINDREAM/Resources/Symbols_Information_16xLG.png differ diff --git a/app/DD_PM_WINDREAM/Resources/action_add_16xLG.png b/app/DD_PM_WINDREAM/Resources/action_add_16xLG.png new file mode 100644 index 0000000..92db8eb Binary files /dev/null and b/app/DD_PM_WINDREAM/Resources/action_add_16xLG.png differ diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index fba71e2..75292e8 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -112,6 +112,7 @@ Partial Class frmAdministration Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.tsbtnProfilkopieren = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() + Me.tsbtnDeleteProfileData = New System.Windows.Forms.ToolStripButton() Me.tsbtndeleteProfil = New System.Windows.Forms.ToolStripButton() Me.Label2 = New System.Windows.Forms.Label() Me.cmbObjekttypen = New System.Windows.Forms.ComboBox() @@ -149,7 +150,6 @@ Partial Class frmAdministration Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colNAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.colTITLE = New DevExpress.XtraGrid.Columns.GridColumn() - Me.Button3 = New System.Windows.Forms.Button() Me.cmbLOGIndex = New System.Windows.Forms.ComboBox() Me.PM_VEKTOR_INDEXComboBox = New System.Windows.Forms.ComboBox() Me.SORT_BY_LATESTCheckBox = New System.Windows.Forms.CheckBox() @@ -393,6 +393,7 @@ Partial Class frmAdministration Me.gridAssignedUsers.AllowDrop = True Me.gridAssignedUsers.DataSource = Me.TBPROFILE_USERBindingSource resources.ApplyResources(Me.gridAssignedUsers, "gridAssignedUsers") + Me.gridAssignedUsers.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAssignedUsers.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.gridAssignedUsers.MainView = Me.viewAssignedUsers Me.gridAssignedUsers.Name = "gridAssignedUsers" Me.gridAssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAssignedUsers}) @@ -469,6 +470,7 @@ Partial Class frmAdministration Me.gridAvailableUsers.AllowDrop = True Me.gridAvailableUsers.DataSource = Me.FNPM_GET_FREE_USER_FOR_PROFILEBindingSource resources.ApplyResources(Me.gridAvailableUsers, "gridAvailableUsers") + Me.gridAvailableUsers.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAvailableUsers.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.gridAvailableUsers.MainView = Me.viewAvailableUsers Me.gridAvailableUsers.Name = "gridAvailableUsers" Me.gridAvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableUsers}) @@ -557,6 +559,7 @@ Partial Class frmAdministration Me.gridAssignedGroups.AllowDrop = True Me.gridAssignedGroups.DataSource = Me.TBPROFILE_GROUPBindingSource resources.ApplyResources(Me.gridAssignedGroups, "gridAssignedGroups") + Me.gridAssignedGroups.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAssignedGroups.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.gridAssignedGroups.MainView = Me.viewAssignedGroups Me.gridAssignedGroups.Name = "gridAssignedGroups" Me.gridAssignedGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAssignedGroups}) @@ -604,6 +607,7 @@ Partial Class frmAdministration Me.gridAvailableGroups.AllowDrop = True Me.gridAvailableGroups.DataSource = Me.TBDD_GROUPSBindingSource resources.ApplyResources(Me.gridAvailableGroups, "gridAvailableGroups") + Me.gridAvailableGroups.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAvailableGroups.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.gridAvailableGroups.MainView = Me.viewAvailableGroups Me.gridAvailableGroups.Name = "gridAvailableGroups" Me.gridAvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableGroups}) @@ -860,7 +864,8 @@ Partial Class frmAdministration Me.TBPM_PROFILEBindingNavigator.CountItem = Me.BindingNavigatorCountItem Me.TBPM_PROFILEBindingNavigator.CountItemFormat = "von {0} Profilen" Me.TBPM_PROFILEBindingNavigator.DeleteItem = Nothing - Me.TBPM_PROFILEBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.VWPM_PROFILE_USERBindingNavigatorSaveItem, Me.tstrpbtn_add, Me.tstrlblSave, Me.btnRefreshProfiles, Me.ToolStripSeparator1, Me.tsbtnDesigner_open, Me.ToolStripSeparator2, Me.tsbtnProfilkopieren, Me.ToolStripSeparator3, Me.tsbtndeleteProfil}) + Me.TBPM_PROFILEBindingNavigator.ImageScalingSize = New System.Drawing.Size(20, 20) + Me.TBPM_PROFILEBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.VWPM_PROFILE_USERBindingNavigatorSaveItem, Me.tstrpbtn_add, Me.tstrlblSave, Me.btnRefreshProfiles, Me.ToolStripSeparator1, Me.tsbtnDesigner_open, Me.ToolStripSeparator2, Me.tsbtnProfilkopieren, Me.ToolStripSeparator3, Me.tsbtnDeleteProfileData, Me.tsbtndeleteProfil}) resources.ApplyResources(Me.TBPM_PROFILEBindingNavigator, "TBPM_PROFILEBindingNavigator") Me.TBPM_PROFILEBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem Me.TBPM_PROFILEBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem @@ -872,7 +877,7 @@ Partial Class frmAdministration 'tstrpbtn_add ' Me.tstrpbtn_add.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.tstrpbtn_add.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.add + Me.tstrpbtn_add.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.action_add_16xLG resources.ApplyResources(Me.tstrpbtn_add, "tstrpbtn_add") Me.tstrpbtn_add.Name = "tstrpbtn_add" ' @@ -918,6 +923,11 @@ Partial Class frmAdministration Me.ToolStripSeparator3.Name = "ToolStripSeparator3" resources.ApplyResources(Me.ToolStripSeparator3, "ToolStripSeparator3") ' + 'tsbtnDeleteProfileData + ' + resources.ApplyResources(Me.tsbtnDeleteProfileData, "tsbtnDeleteProfileData") + Me.tsbtnDeleteProfileData.Name = "tsbtnDeleteProfileData" + ' 'tsbtndeleteProfil ' Me.tsbtndeleteProfil.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.delete_12x12 @@ -1139,7 +1149,6 @@ Partial Class frmAdministration ' resources.ApplyResources(Me.TabPage5, "TabPage5") Me.TabPage5.Controls.Add(Me.GridControl1) - Me.TabPage5.Controls.Add(Me.Button3) Me.TabPage5.Controls.Add(Me.cmbLOGIndex) Me.TabPage5.Controls.Add(Label7) Me.TabPage5.Controls.Add(Me.PM_VEKTOR_INDEXComboBox) @@ -1171,6 +1180,7 @@ Partial Class frmAdministration 'GridControl1 ' Me.GridControl1.DataSource = Me.TBPM_PROFILEBindingSource + Me.GridControl1.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControl1.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) resources.ApplyResources(Me.GridControl1, "GridControl1") Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.Name = "GridControl1" @@ -1208,14 +1218,6 @@ Partial Class frmAdministration Me.colTITLE.FieldName = "TITLE" Me.colTITLE.Name = "colTITLE" ' - 'Button3 - ' - Me.Button3.BackColor = System.Drawing.Color.Transparent - resources.ApplyResources(Me.Button3, "Button3") - Me.Button3.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Files_7954 - Me.Button3.Name = "Button3" - Me.Button3.UseVisualStyleBackColor = False - ' 'cmbLOGIndex ' Me.cmbLOGIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILEBindingSource, "LOG_INDEX", True)) @@ -1275,6 +1277,7 @@ Partial Class frmAdministration ' Me.gridFinalIndex.DataSource = Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource resources.ApplyResources(Me.gridFinalIndex, "gridFinalIndex") + Me.gridFinalIndex.EmbeddedNavigator.Margin = CType(resources.GetObject("gridFinalIndex.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.gridFinalIndex.MainView = Me.viewFinalIndex Me.gridFinalIndex.Name = "gridFinalIndex" Me.gridFinalIndex.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewFinalIndex}) @@ -1354,6 +1357,7 @@ Partial Class frmAdministration Me.BindingNavigator1.CountItemFormat = "von {0} finalen Indexen" Me.BindingNavigator1.DeleteItem = Nothing resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1") + Me.BindingNavigator1.ImageScalingSize = New System.Drawing.Size(20, 20) Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem1, Me.BindingNavigatorMovePreviousItem1, Me.BindingNavigatorSeparator3, Me.BindingNavigatorPositionItem1, Me.BindingNavigatorCountItem1, Me.BindingNavigatorSeparator4, Me.BindingNavigatorMoveNextItem1, Me.BindingNavigatorMoveLastItem1, Me.BindingNavigatorSeparator5, Me.BindingNavigatorAddNewItem, Me.tsBtnCancel, Me.BindingNavigatorDeleteItem, Me.tsBtnSave, Me.ToolStripButton5}) Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem1 Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem1 @@ -1518,6 +1522,7 @@ Partial Class frmAdministration ' Me.gridAvailableProfiles.DataSource = Me.TBPM_PROFILEBindingSource resources.ApplyResources(Me.gridAvailableProfiles, "gridAvailableProfiles") + Me.gridAvailableProfiles.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAvailableProfiles.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.gridAvailableProfiles.MainView = Me.viewAvailableProfiles Me.gridAvailableProfiles.Name = "gridAvailableProfiles" Me.gridAvailableProfiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableProfiles}) @@ -1834,6 +1839,7 @@ Partial Class frmAdministration Me.TBPM_ERROR_LOGBindingNavigator.BindingSource = Me.TBPM_ERROR_LOGBindingSource Me.TBPM_ERROR_LOGBindingNavigator.CountItem = Me.BindingNavigatorCountItem3 Me.TBPM_ERROR_LOGBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem1 + Me.TBPM_ERROR_LOGBindingNavigator.ImageScalingSize = New System.Drawing.Size(20, 20) Me.TBPM_ERROR_LOGBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem3, Me.BindingNavigatorMovePreviousItem3, Me.BindingNavigatorSeparator9, Me.BindingNavigatorPositionItem3, Me.BindingNavigatorCountItem3, Me.BindingNavigatorSeparator10, Me.BindingNavigatorMoveNextItem3, Me.BindingNavigatorMoveLastItem3, Me.BindingNavigatorSeparator11, Me.BindingNavigatorDeleteItem1}) resources.ApplyResources(Me.TBPM_ERROR_LOGBindingNavigator, "TBPM_ERROR_LOGBindingNavigator") Me.TBPM_ERROR_LOGBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem3 @@ -1909,6 +1915,7 @@ Partial Class frmAdministration ' 'StatusStrip1 ' + Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(20, 20) Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstrpinfo}) resources.ApplyResources(Me.StatusStrip1, "StatusStrip1") Me.StatusStrip1.Name = "StatusStrip1" @@ -2203,7 +2210,6 @@ Partial Class frmAdministration Friend WithEvents DataGridViewTextBoxColumn25 As System.Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents Button2 As System.Windows.Forms.Button Friend WithEvents Label13 As System.Windows.Forms.Label - Friend WithEvents Button3 As System.Windows.Forms.Button Friend WithEvents DataGridViewCheckBoxColumn2 As System.Windows.Forms.DataGridViewCheckBoxColumn Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView @@ -2294,4 +2300,5 @@ Partial Class frmAdministration Friend WithEvents tsBtnCancel As ToolStripButton Friend WithEvents FNPM_GET_FREE_USER_FOR_PROFILEBindingSource As BindingSource Friend WithEvents FNPM_GET_FREE_USER_FOR_PROFILETableAdapter As DD_DMSLiteDataSetTableAdapters.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter + Friend WithEvents tsbtnDeleteProfileData As ToolStripButton End Class diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 48342ba..f4af003 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -126,10 +126,14 @@ - 6, 28 + 8, 33 + + + + 4, 0, 4, 0 - 25, 16 + 34, 21 0 @@ -149,12 +153,14 @@ 2 - Fill - 3, 3 + 4, 4 + + + 4, 4, 4, 4 Horizontal @@ -171,8 +177,11 @@ Fill + + 4, 4, 4, 4 + - 0, 25 + 0, 30 Vorname @@ -228,8 +237,11 @@ 5 + + 4, 4, 4, 4 + - 900, 268 + 1161, 321 3 @@ -252,8 +264,11 @@ 0, 0 + + 4, 0, 4, 0 + - 194, 25 + 249, 30 0 @@ -282,8 +297,11 @@ 0, 0 + + 4, 4, 4, 4 + - 900, 25 + 1161, 30 4 @@ -321,8 +339,11 @@ Fill + + 4, 4, 4, 4 + - 0, 25 + 0, 30 Vorname @@ -378,8 +399,11 @@ 5 + + 4, 4, 4, 4 + - 900, 229 + 1161, 276 5 @@ -402,8 +426,11 @@ 0, 0 + + 4, 0, 4, 0 + - 194, 25 + 249, 30 0 @@ -432,8 +459,11 @@ 0, 0 + + 4, 4, 4, 4 + - 900, 25 + 1161, 30 6 @@ -463,10 +493,13 @@ 1 - 900, 551 + 1161, 662 - 293 + 351 + + + 5 0 @@ -487,7 +520,10 @@ Fill - 3, 3 + 4, 4 + + + 4, 4, 4, 4 Horizontal @@ -501,8 +537,11 @@ Fill + + 4, 4, 4, 4 + - 0, 25 + 0, 30 Name @@ -522,8 +561,11 @@ 1 + + 4, 4, 4, 4 + - 900, 267 + 1161, 317 3 @@ -549,8 +591,11 @@ 0, 0 + + 4, 0, 4, 0 + - 194, 25 + 249, 30 0 @@ -579,8 +624,11 @@ 0, 0 + + 4, 4, 4, 4 + - 900, 25 + 1161, 30 4 @@ -618,8 +666,11 @@ Fill + + 4, 4, 4, 4 + - 0, 25 + 0, 30 Name @@ -639,8 +690,11 @@ 1 + + 4, 4, 4, 4 + - 900, 230 + 1161, 275 0 @@ -666,8 +720,11 @@ 0, 0 + + 4, 0, 4, 0 + - 194, 25 + 249, 30 0 @@ -696,8 +753,11 @@ 0, 0 + + 4, 4, 4, 4 + - 900, 25 + 1161, 30 6 @@ -727,10 +787,13 @@ 1 - 900, 551 + 1161, 657 - 292 + 347 + + + 5 1 @@ -754,10 +817,13 @@ True - 58, 28 + 64, 33 + + + 4, 0, 4, 0 - 80, 16 + 102, 21 2 @@ -787,10 +853,13 @@ Tahoma, 9.75pt - 277, 58 + 356, 69 + + + 4, 0, 4, 0 - 89, 16 + 115, 21 6 @@ -808,7 +877,7 @@ TabPage5 - 9 + 8 False @@ -820,10 +889,13 @@ Tahoma, 9.75pt - 277, 103 + 356, 122 + + + 4, 0, 4, 0 - 112, 16 + 141, 21 8 @@ -841,7 +913,7 @@ TabPage5 - 10 + 9 False @@ -853,10 +925,13 @@ Tahoma, 9.75pt - 971, 58 + 1248, 69 + + + 4, 0, 4, 0 - 58, 16 + 75, 21 16 @@ -874,7 +949,7 @@ TabPage5 - 13 + 12 False @@ -886,10 +961,13 @@ Tahoma, 9.75pt - 277, 335 + 356, 398 + + + 4, 0, 4, 0 - 78, 16 + 102, 21 18 @@ -907,7 +985,7 @@ TabPage5 - 15 + 14 False @@ -919,10 +997,13 @@ Tahoma, 9.75pt - 444, 335 + 571, 398 + + + 4, 0, 4, 0 - 87, 16 + 114, 21 20 @@ -940,7 +1021,7 @@ TabPage5 - 19 + 18 False @@ -952,10 +1033,13 @@ Tahoma, 9.75pt - 609, 335 + 783, 398 + + + 4, 0, 4, 0 - 91, 16 + 117, 21 22 @@ -973,7 +1057,7 @@ TabPage5 - 26 + 25 False @@ -985,10 +1069,13 @@ Tahoma, 9.75pt - 775, 335 + 996, 398 + + + 4, 0, 4, 0 - 100, 16 + 129, 21 24 @@ -1006,7 +1093,7 @@ TabPage5 - 20 + 19 False @@ -1018,10 +1105,13 @@ Tahoma, 9.75pt - 12, 49 + 15, 58 + + + 4, 0, 4, 0 - 272, 16 + 358, 21 26 @@ -1048,10 +1138,13 @@ True - 507, 29 + 652, 34 + + + 4, 0, 4, 0 - 38, 16 + 49, 21 27 @@ -1078,10 +1171,13 @@ True - 18, 14 + 23, 17 + + + 4, 0, 4, 0 - 301, 16 + 390, 21 0 @@ -1108,10 +1204,13 @@ True - 646, 284 + 831, 337 + + + 4, 0, 4, 0 - 91, 16 + 117, 21 2 @@ -1138,10 +1237,13 @@ True - 646, 329 + 831, 391 + + + 4, 0, 4, 0 - 100, 16 + 129, 21 4 @@ -1168,10 +1270,13 @@ True - 6, 23 + 8, 27 + + + 4, 0, 4, 0 - 79, 16 + 100, 21 8 @@ -1198,10 +1303,13 @@ True - 7, 68 + 9, 81 + + + 4, 0, 4, 0 - 89, 16 + 110, 21 10 @@ -1228,10 +1336,13 @@ True - 6, 113 + 8, 134 + + + 4, 0, 4, 0 - 78, 16 + 100, 21 12 @@ -1258,10 +1369,13 @@ True - 304, 113 + 391, 134 + + + 4, 0, 4, 0 - 107, 16 + 137, 21 14 @@ -1288,10 +1402,13 @@ True - 7, 158 + 9, 188 + + + 4, 0, 4, 0 - 257, 16 + 328, 21 16 @@ -1318,10 +1435,13 @@ True - 7, 239 + 9, 284 + + + 4, 0, 4, 0 - 200, 16 + 255, 21 18 @@ -1351,10 +1471,13 @@ Tahoma, 9.75pt, style=Italic - 712, 151 + 915, 179 + + + 4, 0, 4, 0 - 409, 32 + 527, 42 80 @@ -1373,7 +1496,7 @@ der PM-Indizes verwenden wollen: TabPage5 - 5 + 4 False @@ -1385,10 +1508,13 @@ der PM-Indizes verwenden wollen: Tahoma, 9.75pt, style=Italic - 712, 213 + 915, 253 + + + 4, 0, 4, 0 - 364, 32 + 468, 42 82 @@ -1407,7 +1533,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 3 + 2 False @@ -1416,10 +1542,13 @@ der Wertänderungen nutzen wollen: True - 18, 64 + 23, 76 + + + 4, 0, 4, 0 - 158, 16 + 202, 21 13 @@ -1446,10 +1575,13 @@ der Wertänderungen nutzen wollen: True - 6, 3 + 8, 4 + + + 4, 0, 4, 0 - 142, 16 + 185, 21 0 @@ -1476,10 +1608,13 @@ der Wertänderungen nutzen wollen: True - 6, 48 + 8, 57 + + + 4, 0, 4, 0 - 129, 16 + 165, 21 6 @@ -1526,7 +1661,7 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Erste verschieben @@ -1544,13 +1679,13 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Vorherige verschieben - 6, 25 + 6, 27 Position @@ -1559,7 +1694,7 @@ der Wertänderungen nutzen wollen: False - 58, 23 + 73, 27 0 @@ -1568,7 +1703,7 @@ der Wertänderungen nutzen wollen: Aktuelle Position - 88, 22 + 110, 24 von {0} Profilen @@ -1577,7 +1712,7 @@ der Wertänderungen nutzen wollen: Die Gesamtanzahl der Elemente. - 6, 25 + 6, 27 @@ -1592,7 +1727,7 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Nächste verschieben @@ -1612,13 +1747,13 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Letzte verschieben - 6, 25 + 6, 27 @@ -1636,7 +1771,7 @@ der Wertänderungen nutzen wollen: - 23, 22 + 24, 24 Daten speichern @@ -1648,13 +1783,13 @@ der Wertänderungen nutzen wollen: Magenta - 23, 22 + 24, 24 Hinzufügen - 256, 22 + 320, 24 Änderungen wurden erfolgreich gespeichert @@ -1663,13 +1798,13 @@ der Wertänderungen nutzen wollen: Magenta - 95, 22 + 118, 24 Aktualisieren - 6, 25 + 6, 27 Segoe UI, 9pt, style=Bold @@ -1678,13 +1813,13 @@ der Wertänderungen nutzen wollen: Magenta - 163, 22 + 214, 24 - Open Formular Designer + Formular Designer öffnen - 6, 25 + 6, 27 MiddleLeft @@ -1693,7 +1828,7 @@ der Wertänderungen nutzen wollen: Magenta - 104, 22 + 130, 24 Profil kopieren @@ -1702,7 +1837,25 @@ der Wertänderungen nutzen wollen: MiddleRight - 6, 25 + 6, 27 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAC1SURBVDhPY6Ab+Pbt2390DJUiDoA0ODk5wTF1DQBy1oME + gPj9ly9fDEBiX79+nQ8VAysE0fgM+L9Qjff/wZKU/58/f74P0vzs/Kn/26LcwYbC1OAz4D1IM8iQM31N + /6+tmP9/jYPW/48vn/8HGhYAVYPbAJCzQTYfaywGG7LMWOY/yAVAzQVQJTQ2AMjB8MJGX0sML6BjsGYQ + AHGICUR0DNYMAkAOZdFIDBgcBqBjqBQlgIEBABuVjGu8xfaGAAAAAElFTkSuQmCC + + + + Magenta + + + 243, 24 + + + Aktuelle Daten zu Profil löschen MiddleLeft @@ -1711,7 +1864,7 @@ der Wertänderungen nutzen wollen: Magenta - 71, 22 + 86, 24 Löschen @@ -1720,10 +1873,10 @@ der Wertänderungen nutzen wollen: MiddleRight - 3, 3 + 4, 4 - 1266, 25 + 1630, 27 0 @@ -1750,10 +1903,13 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 277, 12 + 356, 14 + + + 4, 0, 4, 0 - 67, 16 + 88, 21 77 @@ -1771,16 +1927,19 @@ der Wertänderungen nutzen wollen: TabPage5 - 6 + 5 Tahoma, 9.75pt - 280, 31 + 360, 37 + + + 4, 4, 4, 4 - 420, 24 + 522, 27 3 @@ -1795,16 +1954,19 @@ der Wertänderungen nutzen wollen: TabPage5 - 11 + 10 Tahoma, 9.75pt - 15, 22 + 19, 26 + + + 4, 4, 4, 4 - 104, 24 + 134, 28 0 @@ -1828,10 +1990,13 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 15, 71 + 19, 84 + + + 4, 4, 4, 4 - 392, 23 + 503, 27 1 @@ -1852,10 +2017,16 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 280, 151 + 360, 179 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 420, 100 + 540, 119 75 @@ -1873,7 +2044,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 14 + 13 True @@ -1882,10 +2053,13 @@ der Wertänderungen nutzen wollen: Tahoma, 9pt, style=Italic - 6, 19 + 8, 23 + + + 4, 0, 4, 0 - 156, 14 + 183, 18 72 @@ -1912,10 +2086,13 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 9, 41 + 12, 49 + + + 4, 4, 4, 4 - 259, 24 + 511, 27 0 @@ -1936,10 +2113,16 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 280, 257 + 360, 305 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 420, 71 + 540, 84 74 @@ -1957,16 +2140,19 @@ der Wertänderungen nutzen wollen: TabPage5 - 18 + 17 Segoe UI, 9pt - 9, 21 + 12, 25 + + + 4, 4, 4, 4 - 862, 23 + 1107, 27 0 @@ -1987,10 +2173,13 @@ der Wertänderungen nutzen wollen: Segoe UI, 9.75pt, style=Bold - 877, 19 + 1128, 23 + + + 4, 4, 4, 4 - 29, 23 + 37, 27 72 @@ -2014,10 +2203,16 @@ der Wertänderungen nutzen wollen: Segoe UI, 8.25pt, style=Bold - 9, 23 + 12, 27 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 1007, 57 + 1295, 68 73 @@ -2041,10 +2236,13 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 974, 78 + 1252, 93 + + + 4, 4, 4, 4 - 55, 23 + 71, 27 5 @@ -2059,7 +2257,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 25 + 24 Tahoma, 9.75pt @@ -2068,13 +2266,16 @@ der Wertänderungen nutzen wollen: MiddleLeft - 1035, 115 + 1331, 145 + + + 4, 4, 4, 4 - 0, 0, 2, 2 + 0, 0, 3, 2 - 115, 36 + 143, 27 49 @@ -2095,16 +2296,19 @@ der Wertänderungen nutzen wollen: TabPage5 - 24 + 23 Tahoma, 9.75pt - 973, 122 + 1251, 145 + + + 4, 4, 4, 4 - 56, 23 + 72, 27 29 @@ -2122,13 +2326,16 @@ der Wertänderungen nutzen wollen: TabPage5 - 21 + 20 - 510, 48 + 656, 56 + + + 4, 4, 4, 4 - 468, 23 + 601, 27 1 @@ -2146,10 +2353,13 @@ der Wertänderungen nutzen wollen: 4 - 9, 47 + 12, 56 + + + 4, 4, 4, 4 - 38, 23 + 48, 27 1 @@ -2167,10 +2377,13 @@ der Wertänderungen nutzen wollen: 5 - 61, 47 + 68, 56 + + + 4, 4, 4, 4 - 443, 23 + 579, 27 0 @@ -2191,10 +2404,13 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 280, 77 + 360, 91 + + + 4, 4, 4, 4 - 685, 23 + 880, 27 4 @@ -2209,16 +2425,19 @@ der Wertänderungen nutzen wollen: TabPage5 - 8 + 7 Tahoma, 9.75pt - 280, 122 + 360, 145 + + + 4, 4, 4, 4 - 688, 23 + 883, 27 6 @@ -2233,13 +2452,16 @@ der Wertänderungen nutzen wollen: TabPage5 - 12 + 11 - 987, 47 + 1269, 55 + + + 4, 4, 4, 4 - 65, 24 + 84, 28 2 @@ -2263,10 +2485,13 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 280, 354 + 360, 420 + + + 4, 4, 4, 4 - 158, 23 + 202, 27 19 @@ -2281,16 +2506,19 @@ der Wertänderungen nutzen wollen: TabPage5 - 17 + 16 Tahoma, 9.75pt - 447, 354 + 575, 420 + + + 4, 4, 4, 4 - 158, 23 + 202, 27 21 @@ -2305,16 +2533,19 @@ der Wertänderungen nutzen wollen: TabPage5 - 22 + 21 Tahoma, 9.75pt - 611, 354 + 786, 420 + + + 4, 4, 4, 4 - 161, 23 + 206, 27 23 @@ -2329,16 +2560,19 @@ der Wertänderungen nutzen wollen: TabPage5 - 23 + 22 Tahoma, 9.75pt - 778, 354 + 1000, 420 + + + 4, 4, 4, 4 - 161, 23 + 206, 27 25 @@ -2353,7 +2587,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 16 + 15 1188, 17 @@ -2376,8 +2610,11 @@ der Wertänderungen nutzen wollen: True + + 4, 4, 4, 4 + - 6, 12 + 8, 14 Cyan @@ -2406,8 +2643,11 @@ der Wertänderungen nutzen wollen: 1 + + 4, 4, 4, 4 + - 268, 367 + 345, 436 84 @@ -2424,44 +2664,14 @@ der Wertänderungen nutzen wollen: 0 - - Tahoma, 8.25pt, style=Bold - - - MiddleLeft - - - 1069, 25 - - - 139, 34 - - - 81 - - - Daten zu Profil entfernen - - - MiddleRight - - - Button3 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 1 - - 715, 248 + 919, 294 + + + 4, 4, 4, 4 - 230, 24 + 295, 27 83 @@ -2476,13 +2686,16 @@ der Wertänderungen nutzen wollen: TabPage5 - 2 + 1 - 715, 186 + 919, 221 + + + 4, 4, 4, 4 - 230, 24 + 295, 27 81 @@ -2497,16 +2710,19 @@ der Wertänderungen nutzen wollen: TabPage5 - 4 + 3 Tahoma, 9.75pt - 715, 31 + 919, 37 + + + 4, 4, 4, 4 - 238, 24 + 306, 28 78 @@ -2524,19 +2740,22 @@ der Wertänderungen nutzen wollen: TabPage5 - 7 + 6 Tahoma, 9.75pt, style=Bold - 4, 25 + 4, 28 + + + 4, 4, 4, 4 - 3, 3, 3, 3 + 4, 4, 4, 4 - 1249, 480 + 1608, 577 0 @@ -2565,6 +2784,9 @@ der Wertänderungen nutzen wollen: Fill + + 4, 4, 4, 4 + 0, 0 @@ -2634,8 +2856,11 @@ der Wertänderungen nutzen wollen: 6 + + 4, 4, 4, 4 + - 906, 269 + 1169, 319 93 @@ -2659,10 +2884,13 @@ der Wertänderungen nutzen wollen: False - 906, 0 + 1169, 0 + + + 4, 4, 4, 4 - 323, 269 + 415, 319 91 @@ -2683,10 +2911,13 @@ der Wertänderungen nutzen wollen: Bottom - 3, 173 + 4, 214 + + + 4, 4, 4, 4 - 1229, 269 + 1584, 319 94 @@ -2710,13 +2941,13 @@ der Wertänderungen nutzen wollen: True - 112, 22 + 137, 24 Neu hinzufügen - 127, 22 + 160, 24 von {0} finalen Indexen @@ -2742,7 +2973,7 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Erste verschieben @@ -2760,13 +2991,13 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Vorherige verschieben - 6, 25 + 6, 27 Position @@ -2775,7 +3006,7 @@ der Wertänderungen nutzen wollen: False - 50, 23 + 63, 27 0 @@ -2784,7 +3015,7 @@ der Wertänderungen nutzen wollen: Aktuelle Position - 6, 25 + 6, 27 @@ -2799,7 +3030,7 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Nächste verschieben @@ -2819,19 +3050,19 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Letzte verschieben - 6, 25 + 6, 27 Magenta - 85, 22 + 105, 24 Abbrechen @@ -2855,7 +3086,7 @@ der Wertänderungen nutzen wollen: True - 71, 22 + 86, 24 Löschen @@ -2864,7 +3095,7 @@ der Wertänderungen nutzen wollen: Magenta - 79, 22 + 98, 24 Speichern @@ -2873,16 +3104,16 @@ der Wertänderungen nutzen wollen: Magenta - 95, 22 + 118, 24 Aktualisieren - 9, 133 + 12, 158 - 658, 25 + 790, 27 92 @@ -2909,10 +3140,13 @@ der Wertänderungen nutzen wollen: Segoe UI, 9.75pt, style=Italic - 6, 3 + 8, 4 + + + 4, 0, 4, 0 - 497, 17 + 650, 23 79 @@ -2939,10 +3173,13 @@ der Wertänderungen nutzen wollen: Tahoma, 12pt, style=Bold - 5, 83 + 6, 99 + + + 4, 0, 4, 0 - 120, 19 + 149, 24 74 @@ -2969,10 +3206,13 @@ der Wertänderungen nutzen wollen: Segoe UI, 9.75pt, style=Italic - 6, 108 + 8, 128 + + + 4, 0, 4, 0 - 583, 17 + 772, 23 75 @@ -2993,13 +3233,16 @@ der Wertänderungen nutzen wollen: 5 - 4, 25 + 4, 28 + + + 4, 4, 4, 4 - 3, 3, 3, 3 + 4, 4, 4, 4 - 1235, 445 + 1592, 537 0 @@ -3023,10 +3266,13 @@ der Wertänderungen nutzen wollen: True - 291, 336 + 374, 399 + + + 4, 4, 4, 4 - 260, 24 + 334, 28 11 @@ -3047,10 +3293,13 @@ der Wertänderungen nutzen wollen: 0 - 9, 336 + 12, 399 + + + 4, 4, 4, 4 - 292, 24 + 375, 28 9 @@ -3074,13 +3323,16 @@ der Wertänderungen nutzen wollen: Tahoma, 9pt - 9, 67 + 12, 80 + + + 4, 4, 4, 4 True - 1198, 234 + 1539, 277 7 @@ -3098,10 +3350,13 @@ der Wertänderungen nutzen wollen: 3 - 9, 22 + 12, 26 + + + 4, 4, 4, 4 - 1198, 23 + 1539, 27 1 @@ -3119,13 +3374,16 @@ der Wertänderungen nutzen wollen: 5 - 4, 25 + 4, 28 + + + 4, 4, 4, 4 - 3, 3, 3, 3 + 4, 4, 4, 4 - 1235, 448 + 1592, 540 1 @@ -3149,10 +3407,13 @@ der Wertänderungen nutzen wollen: Fill - 3, 3 + 4, 4 + + + 4, 4, 4, 4 - 1243, 474 + 1600, 569 92 @@ -3170,13 +3431,16 @@ der Wertänderungen nutzen wollen: 0 - 4, 25 + 4, 28 + + + 4, 4, 4, 4 - 3, 3, 3, 3 + 4, 4, 4, 4 - 1249, 480 + 1608, 577 1 @@ -3197,10 +3461,13 @@ der Wertänderungen nutzen wollen: 1 - 9, 77 + 12, 91 + + + 4, 4, 4, 4 - 1257, 509 + 1616, 609 79 @@ -3218,13 +3485,16 @@ der Wertänderungen nutzen wollen: 0 - 4, 25 + 4, 28 + + + 4, 4, 4, 4 - 3, 3, 3, 3 + 4, 4, 4, 4 - 1272, 592 + 1638, 710 0 @@ -3248,13 +3518,19 @@ der Wertänderungen nutzen wollen: Fill - 3, 3 + 4, 4 + + + 4, 4, 4, 4 Fill + + 4, 4, 4, 4 + - 0, 25 + 0, 30 Name @@ -3274,8 +3550,11 @@ der Wertänderungen nutzen wollen: 0 + + 4, 4, 4, 4 + - 348, 561 + 448, 672 2 @@ -3298,8 +3577,11 @@ der Wertänderungen nutzen wollen: 0, 0 + + 4, 0, 4, 0 + - 348, 25 + 448, 30 3 @@ -3335,13 +3617,16 @@ der Wertänderungen nutzen wollen: 0 - 4, 25 + 4, 28 + + + 4, 4, 4, 4 - 3, 3, 3, 3 + 4, 4, 4, 4 - 906, 557 + 1169, 670 0 @@ -3362,13 +3647,16 @@ der Wertänderungen nutzen wollen: 0 - 4, 25 + 4, 28 + + + 4, 4, 4, 4 - 3, 3, 3, 3 + 4, 4, 4, 4 - 906, 557 + 1169, 665 1 @@ -3394,8 +3682,11 @@ der Wertänderungen nutzen wollen: 0, 0 + + 4, 4, 4, 4 + - 914, 586 + 1177, 702 1 @@ -3425,10 +3716,13 @@ der Wertänderungen nutzen wollen: 1 - 1266, 586 + 1630, 702 - 348 + 448 + + + 5 0 @@ -3446,13 +3740,16 @@ der Wertänderungen nutzen wollen: 0 - 4, 25 + 4, 28 + + + 4, 4, 4, 4 - 3, 3, 3, 3 + 4, 4, 4, 4 - 1272, 592 + 1638, 710 1 @@ -3479,10 +3776,13 @@ der Wertänderungen nutzen wollen: NoControl - 649, 194 + 834, 230 + + + 4, 4, 4, 4 - 172, 34 + 221, 40 16 @@ -3509,10 +3809,13 @@ der Wertänderungen nutzen wollen: MiddleLeft - 649, 149 + 834, 177 + + + 4, 4, 4, 4 - 172, 34 + 221, 40 15 @@ -3539,10 +3842,13 @@ der Wertänderungen nutzen wollen: 457, 95 - 182, 61 + 234, 72 + + + 4, 4, 4, 4 - 45, 23 + 57, 27 14 @@ -3563,10 +3869,13 @@ der Wertänderungen nutzen wollen: MiddleLeft - 649, 64 + 834, 76 + + + 4, 4, 4, 4 - 172, 30 + 221, 36 13 @@ -3593,10 +3902,13 @@ der Wertänderungen nutzen wollen: MiddleLeft - 649, 104 + 834, 124 + + + 4, 4, 4, 4 - 172, 30 + 221, 36 12 @@ -3620,10 +3932,13 @@ der Wertänderungen nutzen wollen: 5 - 463, 32 + 595, 38 + + + 4, 4, 4, 4 - 162, 24 + 208, 28 11 @@ -3644,10 +3959,13 @@ der Wertänderungen nutzen wollen: 6 - 112, 19 + 144, 23 + + + 4, 4, 4, 4 - 185, 23 + 237, 27 22 @@ -3668,10 +3986,13 @@ der Wertänderungen nutzen wollen: True - 6, 22 + 8, 26 + + + 4, 0, 4, 0 - 100, 16 + 128, 21 21 @@ -3698,10 +4019,13 @@ der Wertänderungen nutzen wollen: MiddleLeft - 112, 51 + 144, 61 + + + 4, 4, 4, 4 - 185, 30 + 238, 36 20 @@ -3725,10 +4049,16 @@ der Wertänderungen nutzen wollen: 2 - 307, 23 + 395, 27 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 303, 87 + 390, 103 21 @@ -3749,13 +4079,16 @@ der Wertänderungen nutzen wollen: 0 - 10, 258 + 13, 306 + + + 4, 4, 4, 4 True - 600, 60 + 770, 70 19 @@ -3773,13 +4106,16 @@ der Wertänderungen nutzen wollen: 2 - 10, 177 + 13, 210 + + + 4, 4, 4, 4 True - 600, 59 + 770, 69 17 @@ -3797,10 +4133,13 @@ der Wertänderungen nutzen wollen: 4 - 307, 132 + 395, 157 + + + 4, 4, 4, 4 - 146, 23 + 187, 27 15 @@ -3818,10 +4157,13 @@ der Wertänderungen nutzen wollen: 6 - 10, 132 + 13, 157 + + + 4, 4, 4, 4 - 288, 23 + 369, 27 13 @@ -3839,10 +4181,13 @@ der Wertänderungen nutzen wollen: 8 - 10, 87 + 13, 103 + + + 4, 4, 4, 4 - 288, 23 + 369, 27 11 @@ -3860,10 +4205,13 @@ der Wertänderungen nutzen wollen: 10 - 9, 42 + 12, 50 + + + 4, 4, 4, 4 - 289, 23 + 370, 27 9 @@ -3884,10 +4232,16 @@ der Wertänderungen nutzen wollen: False - 21, 90 + 27, 107 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 622, 324 + 800, 385 1 @@ -3911,10 +4265,13 @@ der Wertänderungen nutzen wollen: MiddleLeft - 649, 28 + 834, 33 + + + 4, 4, 4, 4 - 172, 30 + 221, 36 0 @@ -3938,10 +4295,13 @@ der Wertänderungen nutzen wollen: 8 - 20, 33 + 26, 39 + + + 4, 4, 4, 4 - 43, 23 + 55, 27 2 @@ -3962,10 +4322,13 @@ der Wertänderungen nutzen wollen: True - 69, 35 + 89, 42 + + + 4, 0, 4, 0 - 53, 16 + 69, 21 6 @@ -3986,10 +4349,13 @@ der Wertänderungen nutzen wollen: 11 - 649, 303 + 834, 360 + + + 4, 4, 4, 4 - 190, 23 + 243, 27 3 @@ -4007,10 +4373,13 @@ der Wertänderungen nutzen wollen: 13 - 649, 348 + 834, 413 + + + 4, 4, 4, 4 - 190, 23 + 243, 27 5 @@ -4031,10 +4400,13 @@ der Wertänderungen nutzen wollen: MiddleLeft - 649, 377 + 834, 448 + + + 4, 4, 4, 4 - 203, 31 + 261, 37 7 @@ -4058,13 +4430,16 @@ der Wertänderungen nutzen wollen: 16 - 4, 25 + 4, 28 + + + 4, 4, 4, 4 - 3, 3, 3, 3 + 4, 4, 4, 4 - 1272, 592 + 1638, 710 2 @@ -4106,10 +4481,13 @@ der Wertänderungen nutzen wollen: Fill - 3, 28 + 4, 31 + + + 4, 4, 4, 4 - 1266, 561 + 1630, 675 1 @@ -4130,7 +4508,7 @@ der Wertänderungen nutzen wollen: 1092, 56 - 44, 22 + 55, 24 von {0} @@ -4154,7 +4532,7 @@ der Wertänderungen nutzen wollen: True - 157, 22 + 197, 24 Alle Logeinträge löschen @@ -4174,7 +4552,7 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Erste verschieben @@ -4192,13 +4570,13 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Vorherige verschieben - 6, 25 + 6, 27 Position @@ -4207,7 +4585,7 @@ der Wertänderungen nutzen wollen: False - 50, 23 + 63, 27 0 @@ -4216,7 +4594,7 @@ der Wertänderungen nutzen wollen: Aktuelle Position - 6, 25 + 6, 27 @@ -4231,7 +4609,7 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Nächste verschieben @@ -4251,19 +4629,19 @@ der Wertänderungen nutzen wollen: True - 23, 22 + 24, 24 Letzte verschieben - 6, 25 + 6, 27 - 3, 3 + 4, 4 - 1266, 25 + 1630, 27 0 @@ -4284,13 +4662,16 @@ der Wertänderungen nutzen wollen: 1 - 4, 25 + 4, 28 + + + 4, 4, 4, 4 - 3, 3, 3, 3 + 4, 4, 4, 4 - 1272, 592 + 1638, 710 3 @@ -4316,8 +4697,11 @@ der Wertänderungen nutzen wollen: 0, 0 + + 4, 4, 4, 4 + - 1280, 621 + 1646, 742 3 @@ -4344,16 +4728,19 @@ der Wertänderungen nutzen wollen: 977, 95 - 16, 17 + 20, 20 False - 0, 621 + 0, 742 + + + 1, 0, 18, 0 - 1280, 22 + 1646, 22 2 @@ -4388,8 +4775,11 @@ der Wertänderungen nutzen wollen: 0, 0 + + 4, 4, 4, 4 + - 1280, 621 + 1646, 742 4 @@ -4443,10 +4833,10 @@ der Wertänderungen nutzen wollen: 185 - 7, 16 + 9, 19 - 1280, 643 + 1646, 764 Tahoma, 9.75pt @@ -4535,7 +4925,7 @@ der Wertänderungen nutzen wollen: - 3, 4, 3, 4 + 4, 5, 4, 5 Profil-Verwaltung @@ -4822,6 +5212,12 @@ der Wertänderungen nutzen wollen: System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsbtnDeleteProfileData + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsbtndeleteProfil diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 85f9595..be0709d 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -766,16 +766,6 @@ Public Class frmAdministration End If End Sub - Private Sub Button3_Click_2(sender As Object, e As EventArgs) Handles Button3.Click - Dim result As MsgBoxResult = MsgBox("Wollen Sie die Dateien für dieses Profil wirklich entfernen?" & vbNewLine & "Wenn ja müssen Sie auf die Aktualisierung des Jobs warten bis wieder Dateien zur Bearbeitung frei sind.", MsgBoxStyle.YesNo, "Bestätigung erforderlich:") - 'wenn Speichern ja - If result = MsgBoxResult.Yes Then - If ClassDatabase.Execute_non_Query("DELETE FROM TBPM_PROFILE_FILES WHERE PROFIL_ID = " & PROFILGUIDTextBox.Text) = True Then - MsgBox("Die Dateien zum Profil wurden erfolgreich gelöscht!", MsgBoxStyle.Information) - End If - End If - End Sub - 'Private Sub TabControlFinalIndices_SelectedIndexChanged(sender As Object, e As EventArgs) ' If TabControlFinalIndices.SelectedIndex = 1 Then ' Me.cmbIndexe2.Enabled = False @@ -1123,6 +1113,16 @@ Public Class frmAdministration CancelFinalIndexInsert() End Sub + Private Sub tsbtnDeleteProfileData_Click(sender As Object, e As EventArgs) Handles tsbtnDeleteProfileData.Click + Dim result As MsgBoxResult = MsgBox("Wollen Sie die Dateien für dieses Profil wirklich entfernen?" & vbNewLine & "Wenn ja müssen Sie auf die Aktualisierung des Jobs warten bis wieder Dateien zur Bearbeitung frei sind.", MsgBoxStyle.YesNo, "Bestätigung erforderlich:") + 'wenn Speichern ja + If result = MsgBoxResult.Yes Then + If ClassDatabase.Execute_non_Query("DELETE FROM TBPM_PROFILE_FILES WHERE PROFIL_ID = " & PROFILGUIDTextBox.Text) = True Then + MsgBox("Die Dateien zum Profil wurden erfolgreich gelöscht!", MsgBoxStyle.Information) + End If + End If + End Sub + 'Private Sub viewFinalIndex_ValidateRow(sender As Object, e As Views.Base.ValidateRowEventArgs) Handles viewFinalIndex.ValidateRow ' Dim rowView As DataRowView = e.Row diff --git a/app/DD_PM_WINDREAM/frmFileInfo.Designer.vb b/app/DD_PM_WINDREAM/frmFileInfo.Designer.vb new file mode 100644 index 0000000..32b8d3f --- /dev/null +++ b/app/DD_PM_WINDREAM/frmFileInfo.Designer.vb @@ -0,0 +1,95 @@ + _ +Partial Class frmFileInfo + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.txtLocation = New System.Windows.Forms.TextBox() + Me.txtCreation = New System.Windows.Forms.TextBox() + Me.SuspendLayout() + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(3, 9) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(71, 13) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "File-Location:" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(3, 88) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(67, 13) + Me.Label2.TabIndex = 1 + Me.Label2.Text = "File created:" + ' + 'txtLocation + ' + Me.txtLocation.Location = New System.Drawing.Point(6, 25) + Me.txtLocation.Multiline = True + Me.txtLocation.Name = "txtLocation" + Me.txtLocation.ReadOnly = True + Me.txtLocation.Size = New System.Drawing.Size(435, 60) + Me.txtLocation.TabIndex = 2 + Me.txtLocation.TabStop = False + ' + 'txtCreation + ' + Me.txtCreation.Location = New System.Drawing.Point(6, 104) + Me.txtCreation.Name = "txtCreation" + Me.txtCreation.ReadOnly = True + Me.txtCreation.Size = New System.Drawing.Size(435, 21) + Me.txtCreation.TabIndex = 3 + Me.txtCreation.TabStop = False + ' + 'frmFileInfo + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.SystemColors.HighlightText + Me.ClientSize = New System.Drawing.Size(450, 135) + Me.Controls.Add(Me.txtCreation) + Me.Controls.Add(Me.txtLocation) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.Label1) + Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "frmFileInfo" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "File-Info" + Me.TopMost = True + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents Label1 As Label + Friend WithEvents Label2 As Label + Friend WithEvents txtLocation As TextBox + Friend WithEvents txtCreation As TextBox +End Class diff --git a/app/DD_PM_WINDREAM/frmFileInfo.resx b/app/DD_PM_WINDREAM/frmFileInfo.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/app/DD_PM_WINDREAM/frmFileInfo.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmFileInfo.vb b/app/DD_PM_WINDREAM/frmFileInfo.vb new file mode 100644 index 0000000..b7fb5e2 --- /dev/null +++ b/app/DD_PM_WINDREAM/frmFileInfo.vb @@ -0,0 +1,14 @@ +Public Class frmFileInfo + Private Sub frmFileInfo_HandleDestroyed(sender As Object, e As EventArgs) Handles Me.HandleDestroyed + + End Sub + + Private Sub frmFileInfo_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + txtLocation.Text = CURRENT_DOC_PATH + txtCreation.Text = CURRENT_DOC_CREATION_DATE + Catch ex As Exception + + End Try + End Sub +End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index b963ab5..3889526 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -70,7 +70,6 @@ Public Class frmMain If ERROR_STATE = "NO DB-CONNECTION" Or ERROR_STATE = "FAILED DBCONNECTION" Then MsgBox("Bitte hinterlegen Sie die Datenbankverbindung in der Konfiguration!", MsgBoxStyle.Critical, "Fehlende Konfiguration:") frmKonfig.ShowDialog() - End If Try If CultureInfo.CurrentUICulture.ThreeLetterISOLanguageName = "eng" Then @@ -698,19 +697,6 @@ Public Class frmMain End Try End Sub - Private Function file_exists(ByVal _file As String) - Try - If System.IO.File.Exists(_file) Then - Return True - Else - Return False - End If - Catch ex As Exception - MsgBox("Fehler in Funktion bei file_exists - Fehler: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") - Return False - End Try - End Function - Private Sub ToolStripButton1_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton1.Click Try frmKonfig.ShowDialog() @@ -904,6 +890,7 @@ Public Class frmMain Dim DOC_ID = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns("DOC_ID")) If IsNothing(DOC_ID) Then Exit Sub Dim DOC_PATH = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns("FULL_FILE_PATH")) + DOC_PATH = DOC_PATH.Replace("W:", "\\windream\objects") 'Checking if table really contains one record with profile-id and docid expression = expression & " AND DOC_ID = " & DOC_ID Dim TEMP_TABLE = CURR_DT_PROFILEGRID diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index d87d28b..adfef9f 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -18,7 +18,7 @@ Public Class frmMassValidator Private _dependingControl_in_action As Boolean = False Private errmessage As String - 'Private _windream As New ClassWindream_allgemein + Private _windream As New ClassWindream_allgemein 'Private _windreamPM As New ClassPMWindream Private _allgFunk As New ClassAllgemeineFunktionen Dim viewer_string As String @@ -1052,7 +1052,7 @@ Public Class frmMassValidator '####### WENN MOVE2FOLDER KONFIGURIERT IST####### If MOVE2Folder <> "" Then - Dim idxerr_message = _allgFunk.Move2Folder(docrow.Item("FULL_PATH").ToString, MOVE2Folder, CURRENT_ProfilGUID) + Dim idxerr_message = _allgFunk.Move2Folder(docrow.Item("FULL_PATH").ToString, MOVE2Folder, CURRENT_ProfilGUID, _windream) If idxerr_message <> "" Then MsgBox("Error in Move2Folder - Check the log And inform Your sysadmin", MsgBoxStyle.Critical) diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index 5ab1058..5a04b01 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -34,17 +34,13 @@ Partial Class frmValidator Me.Panel1 = New System.Windows.Forms.Panel() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.DateiInfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateieigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TITLELabel1 = New System.Windows.Forms.Label() - Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() Me.btnSave = New System.Windows.Forms.Button() Me.DESCRIPTIONLabel = New System.Windows.Forms.Label() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.Label2 = New System.Windows.Forms.Label() - Me.Label1 = New System.Windows.Forms.Label() - Me.txtErstellt = New System.Windows.Forms.TextBox() - Me.txtDateipfad = New System.Windows.Forms.TextBox() Me.pnldesigner = New System.Windows.Forms.Panel() + Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBDD_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.TBPM_CONTROL_TABLETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() @@ -144,7 +140,6 @@ Partial Class frmValidator Me.Panel1.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox1.SuspendLayout() CType(Me.VWPM_CONTROL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_FILES_USER_NOT_INDEXEDBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -217,14 +212,13 @@ Partial Class frmValidator Me.Panel1.Controls.Add(Me.TITLELabel1) Me.Panel1.Controls.Add(Me.btnSave) Me.Panel1.Controls.Add(Me.DESCRIPTIONLabel) - Me.Panel1.Controls.Add(Me.GroupBox1) Me.Panel1.Controls.Add(Me.pnldesigner) resources.ApplyResources(Me.Panel1, "Panel1") Me.Panel1.Name = "Panel1" ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.DateieigenschaftenToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.DateiInfoToolStripMenuItem, Me.DateieigenschaftenToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") ' @@ -234,22 +228,22 @@ Partial Class frmValidator Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem" resources.ApplyResources(Me.DateiÖffnenToolStripMenuItem, "DateiÖffnenToolStripMenuItem") ' + 'DateiInfoToolStripMenuItem + ' + Me.DateiInfoToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Symbols_Information_16xLG + Me.DateiInfoToolStripMenuItem.Name = "DateiInfoToolStripMenuItem" + resources.ApplyResources(Me.DateiInfoToolStripMenuItem, "DateiInfoToolStripMenuItem") + ' 'DateieigenschaftenToolStripMenuItem ' - Me.DateieigenschaftenToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.world_link - Me.DateieigenschaftenToolStripMenuItem.Name = "DateieigenschaftenToolStripMenuItem" resources.ApplyResources(Me.DateieigenschaftenToolStripMenuItem, "DateieigenschaftenToolStripMenuItem") + Me.DateieigenschaftenToolStripMenuItem.Name = "DateieigenschaftenToolStripMenuItem" ' 'TITLELabel1 ' resources.ApplyResources(Me.TITLELabel1, "TITLELabel1") Me.TITLELabel1.Name = "TITLELabel1" ' - 'DD_DMSLiteDataSet - ' - Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" - Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' 'btnSave ' resources.ApplyResources(Me.btnSave, "btnSave") @@ -262,50 +256,18 @@ Partial Class frmValidator resources.ApplyResources(Me.DESCRIPTIONLabel, "DESCRIPTIONLabel") Me.DESCRIPTIONLabel.Name = "DESCRIPTIONLabel" ' - 'GroupBox1 - ' - resources.ApplyResources(Me.GroupBox1, "GroupBox1") - Me.GroupBox1.Controls.Add(Me.Label2) - Me.GroupBox1.Controls.Add(Me.Label1) - Me.GroupBox1.Controls.Add(Me.txtErstellt) - Me.GroupBox1.Controls.Add(Me.txtDateipfad) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.TabStop = False - ' - 'Label2 - ' - resources.ApplyResources(Me.Label2, "Label2") - Me.Label2.Name = "Label2" - ' - 'Label1 - ' - resources.ApplyResources(Me.Label1, "Label1") - Me.Label1.Name = "Label1" - ' - 'txtErstellt - ' - resources.ApplyResources(Me.txtErstellt, "txtErstellt") - Me.txtErstellt.BackColor = System.Drawing.SystemColors.ControlLight - Me.txtErstellt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.txtErstellt.Name = "txtErstellt" - Me.txtErstellt.ReadOnly = True - Me.txtErstellt.TabStop = False - ' - 'txtDateipfad - ' - resources.ApplyResources(Me.txtDateipfad, "txtDateipfad") - Me.txtDateipfad.BackColor = System.Drawing.SystemColors.ControlLight - Me.txtDateipfad.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.txtDateipfad.Name = "txtDateipfad" - Me.txtDateipfad.ReadOnly = True - Me.txtDateipfad.TabStop = False - ' 'pnldesigner ' resources.ApplyResources(Me.pnldesigner, "pnldesigner") Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnldesigner.ContextMenuStrip = Me.ContextMenuStrip1 Me.pnldesigner.Name = "pnldesigner" ' + 'DD_DMSLiteDataSet + ' + Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" + Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False @@ -887,8 +849,6 @@ Partial Class frmValidator Me.Panel1.ResumeLayout(False) Me.ContextMenuStrip1.ResumeLayout(False) CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox1.ResumeLayout(False) - Me.GroupBox1.PerformLayout() CType(Me.VWPM_CONTROL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_FILES_USER_NOT_INDEXEDBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() @@ -930,11 +890,6 @@ Partial Class frmValidator Friend WithEvents TITLELabel1 As System.Windows.Forms.Label Friend WithEvents btnSave As System.Windows.Forms.Button Friend WithEvents DESCRIPTIONLabel As System.Windows.Forms.Label - Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents txtErstellt As System.Windows.Forms.TextBox - Friend WithEvents txtDateipfad As System.Windows.Forms.TextBox Friend WithEvents pnldesigner As System.Windows.Forms.Panel Friend WithEvents DD_DMSLiteDataSet As DD_PM_WINDREAM.DD_DMSLiteDataSet Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager @@ -1035,4 +990,5 @@ Partial Class frmValidator Friend WithEvents ToolStripButtonJumpFile As ToolStripButton Friend WithEvents ToolStripButtonDeleteFile As ToolStripButton Friend WithEvents ToolStripButtonAnnotation As ToolStripButton + Friend WithEvents DateiInfoToolStripMenuItem As ToolStripMenuItem End Class diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index 2fcc2b8..c53ee91 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -130,31 +130,6 @@ 608, 17 - - Segoe UI, 9pt, style=Bold - - - 22, 17 - - - sss - - - - False - - - 89, 17 - - - Anzahl Dateien: - - - 82, 17 - - - Document-ID: - 0, 621 @@ -165,6 +140,7 @@ 962, 22 + 4 @@ -183,6 +159,30 @@ 3 + + Segoe UI, 9pt, style=Bold + + + 22, 17 + + + sss + + + False + + + 89, 17 + + + Anzahl Dateien: + + + 82, 17 + + + Document-ID: + 790, 212 @@ -192,6 +192,22 @@ Datei öffnen + + 180, 22 + + + Datei-Info + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAANlJREFUOE+lkrsRgzAQRCmBEijBNZDTgwNqIacCQkIHFEAJJBRATkBGer6nQTYS + 4mffzBv9dhchKRKRvwhO3uHb8Wqe50R5KbKCcbJI9gNUFCtTWZaSpqkhyzIZx5GQSXmgOwqofHPf985O + 0B0FfMxgzbSE0Ud3OaAoChmGwZgZs64kwQBd4P+dALBmYB3tJmAxd03TOOY1nI1qtmdww8wtmKv0A1rf + zFjn11RK+B1wSAFzp8SLflNOAF/I89yY67o+NVN+wJMQdqJte2amnABbV4y2nIDfkOgNgPkt6Gl+jn4A + AAAASUVORK5CYII= + + 175, 22 @@ -199,7 +215,7 @@ Dateieigenschaften - 176, 48 + 181, 92 ContextMenuStrip1 @@ -259,7 +275,7 @@ 3, 4, 3, 4 - 450, 50 + 451, 50 11 @@ -286,7 +302,7 @@ 5, 33 - 469, 67 + 469, 57 1 @@ -306,162 +322,6 @@ 2 - - Bottom, Left, Right - - - True - - - 6, 80 - - - 97, 13 - - - 22 - - - DMS Erstellt wann: - - - Label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 0 - - - True - - - 6, 18 - - - 66, 13 - - - 21 - - - Speicherort: - - - Label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 1 - - - Top, Left, Right - - - Tahoma, 8.25pt, style=Italic - - - 6, 97 - - - 3, 4, 3, 4 - - - True - - - 443, 23 - - - 20 - - - txtErstellt - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 2 - - - Top, Left, Right - - - Tahoma, 8.25pt, style=Italic - - - 7, 35 - - - 3, 4, 3, 4 - - - True - - - 443, 41 - - - 19 - - - txtDateipfad - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 3 - - - Tahoma, 8.25pt - - - 9, 400 - - - 3, 4, 3, 4 - - - 3, 4, 3, 4 - - - 450, 131 - - - 20 - - - Allgemeine Eigenschaften: - - - GroupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 3 - Top, Bottom, Left, Right @@ -469,13 +329,13 @@ True - 8, 119 + 8, 102 3, 4, 3, 4 - 450, 273 + 450, 426 18 @@ -490,7 +350,7 @@ Panel1 - 4 + 3 Fill @@ -693,33 +553,6 @@ Segoe UI, 9.75pt - - Magenta - - - 165, 22 - - - Datei überspringen (F4) - - - Magenta - - - 106, 22 - - - Datei löschen - - - Magenta - - - 105, 22 - - - Annotationen - 0, 0 @@ -762,21 +595,9 @@ 0 - - Fill - - - 3, 21 - - - 20, 20 - - - 194, 54 - - - 2 - + + 290, 251 + WebBrowser @@ -789,27 +610,6 @@ 0 - - 290, 251 - - - 120, 17 - - - ToolStripStatusLabel1 - - - 3, 75 - - - 194, 22 - - - 0 - - - StatusStrip3 - StatusStrip3 @@ -846,21 +646,6 @@ 0 - - Fill - - - Segoe UI, 9.75pt, style=Italic - - - 3, 21 - - - 194, 25 - - - 0 - txtBetreff @@ -1490,6 +1275,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DateiInfoToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DateieigenschaftenToolStripMenuItem @@ -1994,24 +1785,6 @@ 947, 212 - - Segoe UI Semibold, 9pt, style=Bold, Italic - - - 139, 16 - - - ToolStripStatusLabel1 - - - Magenta - - - 153, 20 - - - Seitenansicht Minimal - 0, 340 @@ -2081,10 +1854,142 @@ 1 + + Segoe UI Semibold, 9pt, style=Bold, Italic + + + 139, 16 + + + ToolStripStatusLabel1 + + + Magenta + + + 153, 20 + + + Seitenansicht Minimal + 1064, 212 142, 251 + + Fill + + + 3, 21 + + + 20, 20 + + + 194, 54 + + + 2 + + + WebBrowser + + + System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxMailBody + + + 0 + + + 290, 251 + + + 3, 75 + + + 194, 22 + + + 0 + + + StatusStrip3 + + + StatusStrip3 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxMailBody + + + 1 + + + 120, 17 + + + ToolStripStatusLabel1 + + + Fill + + + Segoe UI, 9.75pt, style=Italic + + + 3, 21 + + + 194, 25 + + + 0 + + + txtBetreff + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpBetreff + + + 0 + + + Magenta + + + 165, 22 + + + Datei überspringen (F4) + + + Magenta + + + 106, 22 + + + Datei löschen + + + Magenta + + + 105, 22 + + + Annotationen + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 89477cd..92c9640 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -7,7 +7,6 @@ Imports System.Globalization Imports Oracle.ManagedDataAccess.Client Imports Independentsoft Imports System.IO -Imports DevExpress.Pdf.pdfdo Imports DevExpress.Pdf Imports System.Text.RegularExpressions Imports System.ComponentModel @@ -26,7 +25,7 @@ Public Class frmValidator Dim finalProfile As Boolean Dim Move2Folder As String 'Private _windreamPM As New ClassPMWindream - 'Private _windream As New ClassWindream_allgemein + Private _windream As New ClassWindream_allgemein Private allgFunk As New ClassAllgemeineFunktionen Dim aktivesDokument As WMObject 'speichert die DocumentDaten @@ -1193,12 +1192,13 @@ Public Class frmValidator If newGUID > 0 Then If LogErrorsOnly = False Then ClassLogger.Add(" >> newGUID: " & newGUID.ToString, False) Document_Path = TBPM_PROFILE_FILESTableAdapter.CmdGetFilePath_2_GUID(newGUID) + Document_Path = Document_Path.Replace("W:", "\\windream\objects") CURRENT_DOC_PATH = Document_Path If LogErrorsOnly = False Then ClassLogger.Add(" >> Document_Path: " & Document_Path, False) If LogErrorsOnly = False Then ClassLogger.Add(" >> Überprüfen ob File existiert?", False) Dim i As Integer = 0 - Do While allgFunk.file_exists(Document_Path, False) = False And newGUID <> 0 + Do While allgFunk.file_exists(Document_Path, _windream) = False And newGUID <> 0 i = i + 1 If i > 800 Then allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Get_Next_GUID - Datei nicht vorhanden!", Environment.UserName) @@ -1331,13 +1331,13 @@ Public Class frmValidator TBPM_PROFILE_FILESTableAdapter.CmdSETWORK(True, Environment.UserName, CURRENT_DOC_GUID) ' ############ Infos eintragen ################# tsslblDocID.Text = "Document-ID: " & CURRENT_DOC_ID & " - DocGUID: " & CURRENT_DOC_GUID - txtDateipfad.Text = Document_Path + ' txtDateipfad.Text = Document_Path tstrlbl_Info.Text = "Datei " & docCounter.ToString & " von " & Anzahl_ValDoks.ToString ClassLogger.Add(">> Validierung für Dokument '" & Document_Path & "' gestartet", False) Try 'aktivesDokument = _windreamPM.oSession.GetWMObjectByPath(WMEntity.WMEntityDocument, Document_Path.Substring(2)) - aktivesDokument = WINDREAM.oSession.GetWMObjectByPath(WMEntity.WMEntityDocument, Document_Path.Substring(2)) + aktivesDokument = WINDREAM.oSession.GetWMObjectByPath(WMEntity.WMEntityDocument, Document_Path.Replace("\\windream\objects","")) Catch ex As Exception allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Fehler bei Erzeugen windream-Objekt - DocGUID: " & CURRENT_DOC_GUID & " - ERROR: " & ex.Message, Environment.UserName) ClassLogger.Add("Fehler bei Erzeugen windream-Objekt in (LoadNextDokument): " & ex.Message) @@ -1565,7 +1565,7 @@ Public Class frmValidator End Sub Private Function Windream_get_Doc_info() Try - Dim DMSErstellt As String + 'If CultureInfo.CurrentUICulture.ThreeLetterISOLanguageName = "eng" Then ' My.Settings.vIDX_DMS_ERSTELLT = "DMS Created" ' dmsCreated = "DMS Created" @@ -1576,7 +1576,7 @@ Public Class frmValidator 'End If Try - DMSErstellt = aktivesDokument.GetVariableValue(IDX_DMS_ERSTELLT) + CURRENT_DOC_CREATION_DATE = aktivesDokument.GetVariableValue(IDX_DMS_ERSTELLT) Catch ex As Exception If ex.Message.Contains("Variable: " & IDX_DMS_ERSTELLT & " not found!") Then ClassLogger.Add("1. Ausnahme in Windream_get_Doc_info: Variable: " & IDX_DMS_ERSTELLT & " not found", True) @@ -1593,17 +1593,17 @@ Public Class frmValidator SaveMySettingsValue("IDX_DMS_ERSTELLT_ZEIT", "DMS erstellt Time") End If - DMSErstellt = aktivesDokument.GetVariableValue(IDX_DMS_ERSTELLT) + CURRENT_DOC_CREATION_DATE = aktivesDokument.GetVariableValue(IDX_DMS_ERSTELLT) Else ClassLogger.Add("Fehler in Windream_get_Doc_info 1: " & ex.Message) Return "Fehler in Windream_get_Doc_info 1: " & ex.Message End If End Try - If LogErrorsOnly = False Then ClassLogger.Add(" >> DMS-Erstellt aus WD: " & DMSErstellt, False) - Dim DMSErstelltZeit As String + If LogErrorsOnly = False Then ClassLogger.Add(" >> DMS-Erstellt aus WD: " & CURRENT_DOC_CREATION_DATE, False) + Try - DMSErstelltZeit = aktivesDokument.GetVariableValue(IDX_DMS_ERSTELLT_ZEIT) + CURRENT_DOC_CREATION_TIME = aktivesDokument.GetVariableValue(IDX_DMS_ERSTELLT_ZEIT) Catch ex As Exception If ex.Message.Contains("Variable: " & IDX_DMS_ERSTELLT_ZEIT & " not found!") Then ClassLogger.Add("1. Ausnahme in Windream_get_Doc_info: Variable: " & IDX_DMS_ERSTELLT_ZEIT & " not found", True) @@ -1617,19 +1617,19 @@ Public Class frmValidator SaveMySettingsValue("IDX_DMS_ERSTELLT_ZEIT", "DMS Created Time") End If - DMSErstelltZeit = aktivesDokument.GetVariableValue(IDX_DMS_ERSTELLT_ZEIT) + CURRENT_DOC_CREATION_TIME = aktivesDokument.GetVariableValue(IDX_DMS_ERSTELLT_ZEIT) Else ClassLogger.Add("Fehler in Windream_get_Doc_info 3: " & ex.Message) Return "Fehler in Windream_get_Doc_info 3: " & ex.Message End If End Try - If LogErrorsOnly = False Then ClassLogger.Add(" >> DMSErstelltZeit aus WD: " & DMSErstelltZeit, False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> DMSErstelltZeit aus WD: " & CURRENT_DOC_CREATION_TIME, False) - If DMSErstelltZeit.Length > 11 Then - txtErstellt.Text = DMSErstellt & " " & DMSErstelltZeit.Substring(10) + If CURRENT_DOC_CREATION_TIME.Length > 11 Then + CURRENT_DOC_CREATION_DATE = CURRENT_DOC_CREATION_DATE & " " & CURRENT_DOC_CREATION_TIME.Substring(10) Else - txtErstellt.Text = DMSErstellt & " " & DMSErstelltZeit + CURRENT_DOC_CREATION_DATE = CURRENT_DOC_CREATION_DATE & " " & CURRENT_DOC_CREATION_TIME End If Return "" @@ -2307,7 +2307,7 @@ Public Class frmValidator 'wenn Move2Folder aktiviert wurde If Move2Folder <> "" Then - idxerr_message = allgFunk.Move2Folder(Document_Path, Move2Folder, CURRENT_ProfilGUID) + idxerr_message = allgFunk.Move2Folder(Document_Path, Move2Folder, CURRENT_ProfilGUID, _windream) If idxerr_message <> "" Then errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message My.Settings.Save() @@ -2316,7 +2316,7 @@ Public Class frmValidator End If End If 'Validierungsfile löschen wenn vorhanden - allgFunk.Delete_xffres(Document_Path) + allgFunk.Delete_xffres(Document_Path, _windream) If LogErrorsOnly = False Then ClassLogger.Add(" >> Delete_xffres ausgeführt", False) If LogErrorsOnly = False Then ClassLogger.Add(" >> All Input clear", False) Anzahl_validierte_Dok += 1 @@ -2940,7 +2940,7 @@ Public Class frmValidator Close_document_viewer() 'Aus der Tabelle löschen TBPM_PROFILE_FILESTableAdapter.CmdDelete(CURRENT_DOC_GUID) - Dim resul = allgFunk.Delete_xffres(Document_Path) + Dim resul = allgFunk.Delete_xffres(Document_Path, _windream) If resul = Nothing Or resul = True Then If Delete_File() = True Then 'MsgBox("Die Datei wurde erfolgreich aus windream gelöscht!" & vbNewLine & "Es wird nun die nächste Datei angezeigt!", MsgBoxStyle.Information, "Erfolgsmeldung:") @@ -3112,4 +3112,8 @@ Public Class frmValidator Private Sub frmValidator_Resize(sender As Object, e As EventArgs) Handles Me.Resize End Sub + + Private Sub DateiInfoToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiInfoToolStripMenuItem.Click + frmFileInfo.ShowDialog() + End Sub End Class \ No newline at end of file