From 1bbd3467caa855fdaa05554043619f6bd336a524 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Fri, 18 Jul 2025 15:42:56 +0200 Subject: [PATCH] Renaming DDProcessmanager --- app/TaskFlow/App.config | 127 +++++++------ app/TaskFlow/ClassIDBData.vb | 6 +- app/TaskFlow/ClassImageSelector.vb | 2 +- app/TaskFlow/ClassSQLEditor.vb | 2 +- app/TaskFlow/DD_DMSLiteDataSet.Designer.vb | 40 ++--- app/TaskFlow/DD_DMSLiteDataSet.xsd | 8 +- app/TaskFlow/FinalIndexDataSet.Designer.vb | 2 +- app/TaskFlow/FinalIndexDataSet.xsd | 40 ++--- .../My Project/Application.Designer.vb | 2 +- app/TaskFlow/My Project/Application.myapp | 2 +- app/TaskFlow/My Project/Resources.Designer.vb | 2 +- app/TaskFlow/My Project/Settings.Designer.vb | 6 +- app/TaskFlow/TaskFlow.vbproj | 158 +++++----------- .../Translations/frmMain_Strings.Designer.vb | 2 +- .../frmValidator_Strings.Designer.vb | 2 +- app/TaskFlow/XtraReport1.Designer.vb | 2 +- app/TaskFlow/frmAbout.designer.vb | 2 +- app/TaskFlow/frmAdmin2.Designer.vb | 10 +- app/TaskFlow/frmAdmin2.resx | 8 +- app/TaskFlow/frmAdminPasswort.Designer.vb | 16 +- app/TaskFlow/frmAdministration.Designer.vb | 78 ++++---- app/TaskFlow/frmAdministration.resx | 30 ++-- app/TaskFlow/frmAnnotations.Designer.vb | 2 +- app/TaskFlow/frmColumn_Detail.Designer.vb | 18 +- app/TaskFlow/frmColumn_Detail.resx | 6 +- app/TaskFlow/frmConnection.Designer.vb | 20 +-- app/TaskFlow/frmDesignerLayout.Designer.vb | 8 +- app/TaskFlow/frmDesignerLayout.vb | 2 +- .../Editors/frmDatasourceEditor.vb | 2 +- .../Properties/BaseProperties.vb | 2 +- .../Properties/ComboboxProperties.vb | 4 +- app/TaskFlow/frmFormDesigner.Designer.vb | 46 ++--- app/TaskFlow/frmFormDesigner.resx | 12 +- app/TaskFlow/frmFormDesigner.vb | 2 +- app/TaskFlow/frmInvDashboard.Designer.vb | 10 +- app/TaskFlow/frmKonfig.Designer.vb | 22 +-- app/TaskFlow/frmKonfig.resx | 6 +- app/TaskFlow/frmLicense.Designer.vb | 16 +- app/TaskFlow/frmLicense.resx | 6 +- app/TaskFlow/frmLoginAdmin.Designer.vb | 16 +- app/TaskFlow/frmLoginAdmin.resx | 6 +- app/TaskFlow/frmMain.Designer.vb | 26 +-- app/TaskFlow/frmMain.resx | 168 ++++++++++-------- app/TaskFlow/frmMain.vb | 2 +- app/TaskFlow/frmMassValidator.Designer.vb | 8 +- app/TaskFlow/frmSQL_Admin.Designer.vb | 4 +- app/TaskFlow/frmSplash.designer.vb | 2 +- app/TaskFlow/frmValidator.Designer.vb | 14 +- app/TaskFlow/frmValidator.resx | 26 ++- app/TaskFlow/frmValidator.vb | 33 ++-- app/TaskFlow/frmValidatorSearch.Designer.vb | 16 +- app/TaskFlow/frmValidatorSearch.resx | 72 ++++---- app/TaskFlow/frmValidatorSearch.vb | 16 +- app/TaskFlow/packages.config | 51 +++--- 54 files changed, 576 insertions(+), 615 deletions(-) diff --git a/app/TaskFlow/App.config b/app/TaskFlow/App.config index 46ea277..03813e3 100644 --- a/app/TaskFlow/App.config +++ b/app/TaskFlow/App.config @@ -2,18 +2,18 @@ -
+
- -
-
+ +
+ - + False @@ -23,7 +23,7 @@ 11.2024 - + Skin/Office 2019 White @@ -102,54 +102,12 @@ - + - - - - 5 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 563 - - - Normal - - - 0, 0 - - - 0, 0 - - - Normal - - - @@ -166,23 +124,23 @@ - + - + - + - + - + @@ -194,15 +152,15 @@ - + - + - + @@ -218,7 +176,7 @@ - + @@ -228,6 +186,14 @@ + + + + + + + + @@ -237,4 +203,47 @@ + + + + 5 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 563 + + + Normal + + + 0, 0 + + + 0, 0 + + + Normal + + + \ No newline at end of file diff --git a/app/TaskFlow/ClassIDBData.vb b/app/TaskFlow/ClassIDBData.vb index 12765cb..cc44353 100644 --- a/app/TaskFlow/ClassIDBData.vb +++ b/app/TaskFlow/ClassIDBData.vb @@ -138,7 +138,7 @@ If IDB_USES_WMFILESTORE Then oID_IS_FOREIGN = 1 End If - oTerm2Delete = oTerm2Delete.Replace("'", "' + NCHAR(39) + '") + Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {CURRENT_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{USER_USERNAME}','{USER_LANGUAGE}',{oID_IS_FOREIGN}" DatabaseFallback.ExecuteNonQueryIDB(oDELSQL) @@ -233,7 +233,7 @@ For Each oNewValueRow As DataRow In oDTMyNewValues.Rows Dim oSuccess As Boolean = False Dim oVALUE = oNewValueRow.Item(1).ToString - oVALUE = oVALUE.Replace("'", "' + NCHAR(39) + '") + oVALUE = oVALUE.Replace("'", "''") Dim oPRSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oVALUE}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" LOGGER.Debug(oPRSQL) oSuccess = DatabaseFallback.ExecuteNonQueryIDB(oPRSQL) @@ -243,7 +243,7 @@ Next Return True Else - oNewValue = oNewValue.Replace("'", "' + NCHAR(39) + '") + 'oNewValue = oNewValue.Replace("'", "' + NCHAR(39) + '") Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" LOGGER.Debug(oFNSQL) Return DatabaseFallback.ExecuteNonQueryIDB(oFNSQL) diff --git a/app/TaskFlow/ClassImageSelector.vb b/app/TaskFlow/ClassImageSelector.vb index f6d7efa..b9c0956 100644 --- a/app/TaskFlow/ClassImageSelector.vb +++ b/app/TaskFlow/ClassImageSelector.vb @@ -1,6 +1,6 @@ Imports System.ComponentModel Imports System.Drawing.Design -Imports DD_ProcessManager.InputProperties +Imports taskFLOW.InputProperties Public Class ClassImageSelector Inherits UITypeEditor diff --git a/app/TaskFlow/ClassSQLEditor.vb b/app/TaskFlow/ClassSQLEditor.vb index 6dde404..bb9ae58 100644 --- a/app/TaskFlow/ClassSQLEditor.vb +++ b/app/TaskFlow/ClassSQLEditor.vb @@ -1,7 +1,7 @@ Imports System.ComponentModel Imports System.Drawing.Design Imports System.Windows.Forms.Design -Imports DD_ProcessManager.InputProperties +Imports taskFLOW.InputProperties Imports DigitalData.GUIs.Common Public Class ClassSQLEditor diff --git a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb index b21096a..61ff433 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb +++ b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb @@ -16518,7 +16518,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub - + @@ -3355,9 +3355,9 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - - - + + + \ No newline at end of file diff --git a/app/TaskFlow/FinalIndexDataSet.Designer.vb b/app/TaskFlow/FinalIndexDataSet.Designer.vb index 8f4d85c..793bc02 100644 --- a/app/TaskFlow/FinalIndexDataSet.Designer.vb +++ b/app/TaskFlow/FinalIndexDataSet.Designer.vb @@ -1213,7 +1213,7 @@ Namespace FinalIndexDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + Me._connection.ConnectionString = Global.taskFLOW.My.MySettings.Default.ConnectionString End Sub - + @@ -66,71 +66,71 @@ WHERE (GUID = @guid) - + - + - - - - + + + + - + - + - + - - + + - - + + - - - - + + + + - - + + diff --git a/app/TaskFlow/My Project/Application.Designer.vb b/app/TaskFlow/My Project/Application.Designer.vb index 8d31ac0..e02bbde 100644 --- a/app/TaskFlow/My Project/Application.Designer.vb +++ b/app/TaskFlow/My Project/Application.Designer.vb @@ -32,7 +32,7 @@ Namespace My _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.DD_ProcessManager.frmMain + Me.MainForm = Global.taskFLOW.frmMain End Sub _ diff --git a/app/TaskFlow/My Project/Application.myapp b/app/TaskFlow/My Project/Application.myapp index 1eb0a95..0eb0fb2 100644 --- a/app/TaskFlow/My Project/Application.myapp +++ b/app/TaskFlow/My Project/Application.myapp @@ -8,5 +8,5 @@ 0 0 true - false + 0 \ No newline at end of file diff --git a/app/TaskFlow/My Project/Resources.Designer.vb b/app/TaskFlow/My Project/Resources.Designer.vb index f4aeb22..8967453 100644 --- a/app/TaskFlow/My Project/Resources.Designer.vb +++ b/app/TaskFlow/My Project/Resources.Designer.vb @@ -39,7 +39,7 @@ Namespace My.Resources Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DD_ProcessManager.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("taskFLOW.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan diff --git a/app/TaskFlow/My Project/Settings.Designer.vb b/app/TaskFlow/My Project/Settings.Designer.vb index 7a32279..7dff18f 100644 --- a/app/TaskFlow/My Project/Settings.Designer.vb +++ b/app/TaskFlow/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -263,9 +263,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.DD_ProcessManager.My.MySettings + Friend ReadOnly Property Settings() As Global.taskFLOW.My.MySettings Get - Return Global.DD_ProcessManager.My.MySettings.Default + Return Global.taskFLOW.My.MySettings.Default End Get End Property End Module diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 0d64721..26d3af1 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -8,8 +8,8 @@ 2.0 {6ACA1432-09A2-47EF-A704-C0AA73905756} WinExe - DD_ProcessManager.My.MyApplication - DD_ProcessManager + taskFLOW.My.MyApplication + taskFLOW taskFLOW 512 WindowsForms @@ -78,7 +78,7 @@ - ..\packages\BouncyCastle.Cryptography.2.6.1\lib\net461\BouncyCastle.Cryptography.dll + ..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll False @@ -205,82 +205,15 @@ P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll - - ..\packages\DocumentFormat.OpenXml.3.3.0\lib\net46\DocumentFormat.OpenXml.dll + + ..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll - - ..\packages\DocumentFormat.OpenXml.Framework.3.3.0\lib\net46\DocumentFormat.OpenXml.Framework.dll + + ..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll - True - - - ..\packages\IndexRange.1.0.3\lib\net45\IndexRange.dll - P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll False @@ -297,27 +230,24 @@ P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll True - - ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.6\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\packages\Microsoft.Bcl.Cryptography.9.0.6\lib\net462\Microsoft.Bcl.Cryptography.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll + + ..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.Bson.1.0.3\lib\net45\Newtonsoft.Json.Bson.dll + ..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll ..\packages\NLog.5.0.5\lib\net46\NLog.dll - - ..\packages\OpenMcdf.3.0.0\lib\netstandard2.0\OpenMcdf.dll + + ..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll @@ -326,23 +256,23 @@ P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\PdfSharp-gdi.dll - ..\packages\protobuf-net.3.2.52\lib\net462\protobuf-net.dll + ..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll - ..\packages\protobuf-net.Core.3.2.52\lib\net462\protobuf-net.Core.dll + ..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll - - ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll + + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - - ..\packages\System.CodeDom.9.0.6\lib\net462\System.CodeDom.dll + + ..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll - - ..\packages\System.Collections.Immutable.9.0.6\lib\net462\System.Collections.Immutable.dll + + ..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll @@ -354,49 +284,49 @@ - - ..\packages\System.Formats.Asn1.9.0.6\lib\net462\System.Formats.Asn1.dll + + ..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll - - ..\packages\System.IO.Packaging.9.0.6\lib\net462\System.IO.Packaging.dll + + ..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll - - ..\packages\System.IO.Pipelines.9.0.6\lib\net462\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll - - ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll + + ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll ..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Security.Cryptography.Pkcs.9.0.6\lib\net462\System.Security.Cryptography.Pkcs.dll + + ..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll - - ..\packages\System.Text.Encodings.Web.9.0.6\lib\net462\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.9.0.6\lib\net462\System.Text.Json.dll + + ..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll - - ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - ..\packages\System.ValueTuple.4.6.1\lib\net462\System.ValueTuple.dll + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll diff --git a/app/TaskFlow/Translations/frmMain_Strings.Designer.vb b/app/TaskFlow/Translations/frmMain_Strings.Designer.vb index fe1a696..cc4f09d 100644 --- a/app/TaskFlow/Translations/frmMain_Strings.Designer.vb +++ b/app/TaskFlow/Translations/frmMain_Strings.Designer.vb @@ -43,7 +43,7 @@ Namespace My.Resources Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DD_ProcessManager.frmMain_Strings", GetType(frmMain_Strings).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("taskFLOW.frmMain_Strings", GetType(frmMain_Strings).Assembly) resourceMan = temp End If Return resourceMan diff --git a/app/TaskFlow/Translations/frmValidator_Strings.Designer.vb b/app/TaskFlow/Translations/frmValidator_Strings.Designer.vb index 0d61f48..0868fac 100644 --- a/app/TaskFlow/Translations/frmValidator_Strings.Designer.vb +++ b/app/TaskFlow/Translations/frmValidator_Strings.Designer.vb @@ -43,7 +43,7 @@ Namespace My.Resources Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DD_ProcessManager.frmValidator_Strings", GetType(frmValidator_Strings).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("taskFLOW.frmValidator_Strings", GetType(frmValidator_Strings).Assembly) resourceMan = temp End If Return resourceMan diff --git a/app/TaskFlow/XtraReport1.Designer.vb b/app/TaskFlow/XtraReport1.Designer.vb index 3d7b5dc..ecc2416 100644 --- a/app/TaskFlow/XtraReport1.Designer.vb +++ b/app/TaskFlow/XtraReport1.Designer.vb @@ -68,7 +68,7 @@ Partial Public Class XtraReport1 ' 'SqlDataSource1 ' - Me.SqlDataSource1.ConnectionName = "DD_ProcessManager.My.MySettings.ConnectionString" + Me.SqlDataSource1.ConnectionName = "taskFLOW.My.MySettings.ConnectionString" Me.SqlDataSource1.Name = "SqlDataSource1" ColumnExpression1.ColumnName = "Anzahl" Table4.Name = "VWPM_CHART_INVOICE_MONITOR" diff --git a/app/TaskFlow/frmAbout.designer.vb b/app/TaskFlow/frmAbout.designer.vb index 1dd8597..3e06167 100644 --- a/app/TaskFlow/frmAbout.designer.vb +++ b/app/TaskFlow/frmAbout.designer.vb @@ -114,7 +114,7 @@ Partial Class frmAbout Me.PictureBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.PictureBox1.Image = Global.DD_ProcessManager.My.Resources.Resources.taskflow_boot + Me.PictureBox1.Image = Global.taskFLOW.My.Resources.Resources.taskflow_boot Me.PictureBox1.Location = New System.Drawing.Point(12, 5) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(496, 141) diff --git a/app/TaskFlow/frmAdmin2.Designer.vb b/app/TaskFlow/frmAdmin2.Designer.vb index 3a81195..54a7554 100644 --- a/app/TaskFlow/frmAdmin2.Designer.vb +++ b/app/TaskFlow/frmAdmin2.Designer.vb @@ -63,7 +63,7 @@ Partial Class frmAdmin2 Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) Me.TBDD_EMAIL_TEMPLATEBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() @@ -156,9 +156,9 @@ Partial Class frmAdmin2 Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn() Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage() - Me.TBDD_EMAIL_TEMPLATETableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_EMAIL_TEMPLATETableAdapter() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() - Me.TBDD_GUI_LANGUAGE_PHRASETableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_GUI_LANGUAGE_PHRASETableAdapter() + Me.TBDD_EMAIL_TEMPLATETableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_EMAIL_TEMPLATETableAdapter() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.TBDD_GUI_LANGUAGE_PHRASETableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_GUI_LANGUAGE_PHRASETableAdapter() Me.LayoutConverter1 = New DevExpress.XtraLayout.Converter.LayoutConverter(Me.components) Me.XtraSaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() CType(Me.spcontwKonfMain, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1465,7 +1465,7 @@ Partial Class frmAdmin2 Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBDD_GUI_LANGUAGE_PHRASETableAdapter ' diff --git a/app/TaskFlow/frmAdmin2.resx b/app/TaskFlow/frmAdmin2.resx index 68f2f36..6f00f0a 100644 --- a/app/TaskFlow/frmAdmin2.resx +++ b/app/TaskFlow/frmAdmin2.resx @@ -2360,7 +2360,7 @@ DD_DMSLiteDataSet - DD_ProcessManager.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null BindingNavigatorCountItem @@ -2714,19 +2714,19 @@ TBDD_EMAIL_TEMPLATETableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_EMAIL_TEMPLATETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_EMAIL_TEMPLATETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_GUI_LANGUAGE_PHRASETableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_GUI_LANGUAGE_PHRASETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_GUI_LANGUAGE_PHRASETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null LayoutConverter1 diff --git a/app/TaskFlow/frmAdminPasswort.Designer.vb b/app/TaskFlow/frmAdminPasswort.Designer.vb index 0cdc0ed..f7b4ebc 100644 --- a/app/TaskFlow/frmAdminPasswort.Designer.vb +++ b/app/TaskFlow/frmAdminPasswort.Designer.vb @@ -25,10 +25,10 @@ Partial Class frmAdminPasswort Me.components = New System.ComponentModel.Container() Me.txtOld = New System.Windows.Forms.TextBox() Me.txtNew = New System.Windows.Forms.TextBox() - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_KONFIGURATIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.TBPM_KONFIGURATIONTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.btnSetNew = New System.Windows.Forms.Button() Me.Label1 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() @@ -81,11 +81,11 @@ Partial Class frmAdminPasswort Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'btnSetNew ' - Me.btnSetNew.Image = Global.DD_ProcessManager.My.Resources.Resources.add + Me.btnSetNew.Image = Global.taskFLOW.My.Resources.Resources.add Me.btnSetNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnSetNew.Location = New System.Drawing.Point(12, 60) Me.btnSetNew.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) @@ -138,10 +138,10 @@ Partial Class frmAdminPasswort End Sub Friend WithEvents txtOld As System.Windows.Forms.TextBox Friend WithEvents txtNew As System.Windows.Forms.TextBox - Friend WithEvents DD_DMSLiteDataSet As DD_ProcessManager.DD_DMSLiteDataSet + Friend WithEvents DD_DMSLiteDataSet As taskFLOW.DD_DMSLiteDataSet Friend WithEvents TBPM_KONFIGURATIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_KONFIGURATIONTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter - Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager + Friend WithEvents TBPM_KONFIGURATIONTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter + Friend WithEvents TableAdapterManager As taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents btnSetNew As System.Windows.Forms.Button Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents Label2 As System.Windows.Forms.Label diff --git a/app/TaskFlow/frmAdministration.Designer.vb b/app/TaskFlow/frmAdministration.Designer.vb index 71f5178..15f983d 100644 --- a/app/TaskFlow/frmAdministration.Designer.vb +++ b/app/TaskFlow/frmAdministration.Designer.vb @@ -37,7 +37,7 @@ Partial Class frmAdministration Me.SplitContainer_Profilzuordnung2 = New System.Windows.Forms.SplitContainer() Me.gridAssignedUsers = New DevExpress.XtraGrid.GridControl() Me.TBPROFILE_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() Me.viewAssignedUsers = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colPRENAME1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colNAME3 = New DevExpress.XtraGrid.Columns.GridColumn() @@ -76,7 +76,7 @@ Partial Class frmAdministration Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.gridFinalIndex = New DevExpress.XtraGrid.GridControl() Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.FinalIndexDataSet = New DD_ProcessManager.FinalIndexDataSet() + Me.FinalIndexDataSet = New taskFLOW.FinalIndexDataSet() Me.viewFinalIndex = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() Me.colPROFIL_ID = New DevExpress.XtraGrid.Columns.GridColumn() @@ -130,9 +130,9 @@ Partial Class frmAdministration Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_PROFILETableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter() + Me.TBPM_PROFILETableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter() Me.Label2 = New System.Windows.Forms.Label() Me.cmbObjekttypen = New System.Windows.Forms.ComboBox() Me.FINAL_PROFILECheckBox = New System.Windows.Forms.CheckBox() @@ -152,7 +152,7 @@ Partial Class frmAdministration Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox() Me.dlgWindreamsuche = New System.Windows.Forms.OpenFileDialog() - Me.TBPM_TYPETableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_TYPETableAdapter() + Me.TBPM_TYPETableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_TYPETableAdapter() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() @@ -242,19 +242,19 @@ Partial Class frmAdministration Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPROFILE_USERTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPROFILE_USERTableAdapter() - Me.TBDD_USERTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter() - Me.TBPM_KONFIGURATIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() + Me.TBPROFILE_USERTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPROFILE_USERTableAdapter() + Me.TBDD_USERTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter() + Me.TBPM_KONFIGURATIONTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() Me.pnlMain = New System.Windows.Forms.Panel() - Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() + Me.TBPM_PROFILE_CONTROLSTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_PROFILE_FILESTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() - Me.TBDD_CONNECTIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() - Me.TBDD_GROUPSTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_GROUPSTableAdapter() - Me.TBPROFILE_GROUPTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPROFILE_GROUPTableAdapter() + Me.TBPM_PROFILE_FILESTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() + Me.TBDD_CONNECTIONTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() + Me.TBDD_GROUPSTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_GROUPSTableAdapter() + Me.TBPROFILE_GROUPTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPROFILE_GROUPTableAdapter() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() - Me.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter() - Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = New DD_ProcessManager.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter() + Me.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter() + Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = New taskFLOW.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.FolderBrowserDialog2 = New System.Windows.Forms.FolderBrowserDialog() @@ -777,7 +777,7 @@ Partial Class frmAdministration ' resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") Me.BarButtonItem2.Id = 2 - Me.BarButtonItem2.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.chartdesigner2 + Me.BarButtonItem2.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.chartdesigner2 Me.BarButtonItem2.Name = "BarButtonItem2" ' 'BarButtonItem3 @@ -909,7 +909,7 @@ Partial Class frmAdministration ' resources.ApplyResources(Me.BarButtonItem19, "BarButtonItem19") Me.BarButtonItem19.Id = 19 - Me.BarButtonItem19.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.cancel1 + Me.BarButtonItem19.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.cancel1 Me.BarButtonItem19.Name = "BarButtonItem19" ' 'tsbStaticInfo @@ -975,7 +975,7 @@ Partial Class frmAdministration ' resources.ApplyResources(Me.BarButtonItem26, "BarButtonItem26") Me.BarButtonItem26.Id = 28 - Me.BarButtonItem26.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.Security_Lock + Me.BarButtonItem26.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.Security_Lock Me.BarButtonItem26.Name = "BarButtonItem26" Me.BarButtonItem26.Tag = "Unlock" Me.BarButtonItem26.Visibility = DevExpress.XtraBars.BarItemVisibility.Never @@ -1143,7 +1143,7 @@ Partial Class frmAdministration Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBPM_PROFILEBindingSource ' @@ -1193,7 +1193,7 @@ Partial Class frmAdministration 'btnWMopenSuche ' resources.ApplyResources(Me.btnWMopenSuche, "btnWMopenSuche") - Me.btnWMopenSuche.Image = Global.DD_ProcessManager.My.Resources.Resources.flag_green + Me.btnWMopenSuche.Image = Global.taskFLOW.My.Resources.Resources.flag_green Me.btnWMopenSuche.Name = "btnWMopenSuche" Me.btnWMopenSuche.UseVisualStyleBackColor = True ' @@ -1628,28 +1628,28 @@ Partial Class frmAdministration ' 'Button4 ' - Me.Button4.Image = Global.DD_ProcessManager.My.Resources.Resources.DeleteFilter_5563 + Me.Button4.Image = Global.taskFLOW.My.Resources.Resources.DeleteFilter_5563 resources.ApplyResources(Me.Button4, "Button4") Me.Button4.Name = "Button4" Me.Button4.UseVisualStyleBackColor = True ' 'Button3 ' - Me.Button3.Image = Global.DD_ProcessManager.My.Resources.Resources.DeleteFilter_5563 + Me.Button3.Image = Global.taskFLOW.My.Resources.Resources.DeleteFilter_5563 resources.ApplyResources(Me.Button3, "Button3") Me.Button3.Name = "Button3" Me.Button3.UseVisualStyleBackColor = True ' 'Button2 ' - Me.Button2.Image = Global.DD_ProcessManager.My.Resources.Resources.DeleteFilter_5563 + Me.Button2.Image = Global.taskFLOW.My.Resources.Resources.DeleteFilter_5563 resources.ApplyResources(Me.Button2, "Button2") Me.Button2.Name = "Button2" Me.Button2.UseVisualStyleBackColor = True ' 'Button1 ' - Me.Button1.Image = Global.DD_ProcessManager.My.Resources.Resources.DeleteFilter_5563 + Me.Button1.Image = Global.taskFLOW.My.Resources.Resources.DeleteFilter_5563 resources.ApplyResources(Me.Button1, "Button1") Me.Button1.Name = "Button1" Me.Button1.UseVisualStyleBackColor = True @@ -1693,7 +1693,7 @@ Partial Class frmAdministration ' 'Series4SQL ' - Me.Series4SQL.Image = Global.DD_ProcessManager.My.Resources.Resources.database_go + Me.Series4SQL.Image = Global.taskFLOW.My.Resources.Resources.database_go resources.ApplyResources(Me.Series4SQL, "Series4SQL") Me.Series4SQL.Name = "Series4SQL" Me.Series4SQL.UseVisualStyleBackColor = True @@ -1727,7 +1727,7 @@ Partial Class frmAdministration ' 'Series3SQL ' - Me.Series3SQL.Image = Global.DD_ProcessManager.My.Resources.Resources.database_go + Me.Series3SQL.Image = Global.taskFLOW.My.Resources.Resources.database_go resources.ApplyResources(Me.Series3SQL, "Series3SQL") Me.Series3SQL.Name = "Series3SQL" Me.Series3SQL.UseVisualStyleBackColor = True @@ -1761,7 +1761,7 @@ Partial Class frmAdministration ' 'Series2SQL ' - Me.Series2SQL.Image = Global.DD_ProcessManager.My.Resources.Resources.database_go + Me.Series2SQL.Image = Global.taskFLOW.My.Resources.Resources.database_go resources.ApplyResources(Me.Series2SQL, "Series2SQL") Me.Series2SQL.Name = "Series2SQL" Me.Series2SQL.UseVisualStyleBackColor = True @@ -1800,7 +1800,7 @@ Partial Class frmAdministration ' 'Series1SQL ' - Me.Series1SQL.Image = Global.DD_ProcessManager.My.Resources.Resources.database_go + Me.Series1SQL.Image = Global.taskFLOW.My.Resources.Resources.database_go resources.ApplyResources(Me.Series1SQL, "Series1SQL") Me.Series1SQL.Name = "Series1SQL" Me.Series1SQL.UseVisualStyleBackColor = True @@ -2004,7 +2004,7 @@ Partial Class frmAdministration Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.IconOptions.Icon = CType(resources.GetObject("frmAdministration.IconOptions.Icon"), System.Drawing.Icon) - Me.IconOptions.LargeImage = Global.DD_ProcessManager.My.Resources.Resources.publicfix_32x32 + Me.IconOptions.LargeImage = Global.taskFLOW.My.Resources.Resources.publicfix_32x32 Me.Name = "frmAdministration" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 @@ -2088,10 +2088,10 @@ Partial Class frmAdministration Me.PerformLayout() End Sub - Friend WithEvents DD_DMSLiteDataSet As DD_ProcessManager.DD_DMSLiteDataSet - Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager + Friend WithEvents DD_DMSLiteDataSet As taskFLOW.DD_DMSLiteDataSet + Friend WithEvents TableAdapterManager As taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents TBPM_PROFILEBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_PROFILETableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter + Friend WithEvents TBPM_PROFILETableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter Friend WithEvents btnWMSuche As System.Windows.Forms.Button Friend WithEvents TITLETextBox As System.Windows.Forms.TextBox Friend WithEvents PROFILGUIDTextBox As System.Windows.Forms.TextBox @@ -2109,7 +2109,7 @@ Partial Class frmAdministration Friend WithEvents btnWMopenSuche As System.Windows.Forms.Button Friend WithEvents PRIORITYNumericUpDown As System.Windows.Forms.NumericUpDown Friend WithEvents TBPM_TYPEBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_TYPETableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_TYPETableAdapter + Friend WithEvents TBPM_TYPETableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_TYPETableAdapter Friend WithEvents FolderBrowserDialog1 As System.Windows.Forms.FolderBrowserDialog Friend WithEvents cmbObjekttypen As System.Windows.Forms.ComboBox Friend WithEvents Label2 As System.Windows.Forms.Label @@ -2118,11 +2118,11 @@ Partial Class frmAdministration Friend WithEvents TabPage2 As System.Windows.Forms.TabPage Friend WithEvents SplitContainer_Profilzuordnung2 As System.Windows.Forms.SplitContainer Friend WithEvents TBPROFILE_USERBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPROFILE_USERTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPROFILE_USERTableAdapter + Friend WithEvents TBPROFILE_USERTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPROFILE_USERTableAdapter Friend WithEvents TBDD_USERBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBDD_USERTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter + Friend WithEvents TBDD_USERTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter Friend WithEvents TBPM_KONFIGURATIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_KONFIGURATIONTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter + Friend WithEvents TBPM_KONFIGURATIONTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter Friend WithEvents pnlMain As System.Windows.Forms.Panel Friend WithEvents SORT_BY_LATESTCheckBox As System.Windows.Forms.CheckBox Friend WithEvents tabctrl_Profilkonfig As System.Windows.Forms.TabControl @@ -2130,17 +2130,17 @@ Partial Class frmAdministration Friend WithEvents TabPageAfterIndex As System.Windows.Forms.TabPage Friend WithEvents Label6 As System.Windows.Forms.Label Friend WithEvents TBPM_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_PROFILE_CONTROLSTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter + Friend WithEvents TBPM_PROFILE_CONTROLSTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter Friend WithEvents PM_VEKTOR_INDEXComboBox As System.Windows.Forms.ComboBox Friend WithEvents TBPM_PROFILE_FILESBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_PROFILE_FILESTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter + Friend WithEvents TBPM_PROFILE_FILESTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter Friend WithEvents cmbLOGIndex As System.Windows.Forms.ComboBox Friend WithEvents DataGridViewCheckBoxColumn2 As System.Windows.Forms.DataGridViewCheckBoxColumn Friend WithEvents GridControlNavigation As DevExpress.XtraGrid.GridControl Friend WithEvents GridViewProfile As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents colNAME As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents TBDD_CONNECTIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBDD_CONNECTIONTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter + Friend WithEvents TBDD_CONNECTIONTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter Friend WithEvents TabControl2 As TabControl Friend WithEvents TabPage11 As TabPage Friend WithEvents TabPage12 As TabPage diff --git a/app/TaskFlow/frmAdministration.resx b/app/TaskFlow/frmAdministration.resx index a7bd161..aaa813b 100644 --- a/app/TaskFlow/frmAdministration.resx +++ b/app/TaskFlow/frmAdministration.resx @@ -5048,7 +5048,7 @@ Top Kreditoren: DD_DMSLiteDataSet - DD_ProcessManager.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null viewAssignedUsers @@ -5198,7 +5198,7 @@ Top Kreditoren: FinalIndexDataSet - DD_ProcessManager.FinalIndexDataSet, FinalIndexDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.FinalIndexDataSet, FinalIndexDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null viewFinalIndex @@ -5504,7 +5504,7 @@ Top Kreditoren: TableAdapterManager - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPM_PROFILEBindingSource @@ -5516,7 +5516,7 @@ Top Kreditoren: TBPM_PROFILETableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPM_TYPEBindingSource @@ -5534,7 +5534,7 @@ Top Kreditoren: TBPM_TYPETableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_TYPETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_TYPETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null FolderBrowserDialog1 @@ -5582,25 +5582,25 @@ Top Kreditoren: TBPROFILE_USERTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPROFILE_USERTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPROFILE_USERTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_USERTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPM_KONFIGURATIONTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPM_PROFILE_CONTROLSTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPM_PROFILE_FILESBindingSource @@ -5612,25 +5612,25 @@ Top Kreditoren: TBPM_PROFILE_FILESTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_CONNECTIONTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_GROUPSTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_GROUPSTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_GROUPSTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPROFILE_GROUPTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPROFILE_GROUPTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPROFILE_GROUPTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null OpenFileDialog1 @@ -5642,13 +5642,13 @@ Top Kreditoren: FNPM_GET_FREE_USER_FOR_PROFILETableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPM_PROFILE_FINAL_INDEXINGTableAdapter - DD_ProcessManager.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter, FinalIndexDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter, FinalIndexDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null ToolTip1 diff --git a/app/TaskFlow/frmAnnotations.Designer.vb b/app/TaskFlow/frmAnnotations.Designer.vb index 0f0f363..df604cd 100644 --- a/app/TaskFlow/frmAnnotations.Designer.vb +++ b/app/TaskFlow/frmAnnotations.Designer.vb @@ -35,7 +35,7 @@ Partial Class frmAnnotations 'Button1 ' Me.Button1.Cursor = System.Windows.Forms.Cursors.Default - Me.Button1.Image = Global.DD_ProcessManager.My.Resources.Resources.add + Me.Button1.Image = Global.taskFLOW.My.Resources.Resources.add resources.ApplyResources(Me.Button1, "Button1") Me.Button1.Name = "Button1" Me.Button1.UseVisualStyleBackColor = True diff --git a/app/TaskFlow/frmColumn_Detail.Designer.vb b/app/TaskFlow/frmColumn_Detail.Designer.vb index 9f05acf..859153f 100644 --- a/app/TaskFlow/frmColumn_Detail.Designer.vb +++ b/app/TaskFlow/frmColumn_Detail.Designer.vb @@ -25,9 +25,9 @@ Partial Class frmColumn_Detail Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmColumn_Detail)) Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() - Me.TBPM_CONTROL_TABLETableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() + Me.TBPM_CONTROL_TABLETableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() @@ -162,7 +162,7 @@ Partial Class frmColumn_Detail Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'RibbonControl1 ' @@ -183,14 +183,14 @@ Partial Class frmColumn_Detail ' resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.markcomplete + Me.BarButtonItem1.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.markcomplete Me.BarButtonItem1.Name = "BarButtonItem1" ' 'BarButtonItem2 ' resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") Me.BarButtonItem2.Id = 2 - Me.BarButtonItem2.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.delete + Me.BarButtonItem2.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.delete Me.BarButtonItem2.Name = "BarButtonItem2" ' 'tslblAenderungen @@ -736,10 +736,10 @@ Partial Class frmColumn_Detail Me.PerformLayout End Sub - Friend WithEvents DD_DMSLiteDataSet As DD_ProcessManager.DD_DMSLiteDataSet + Friend WithEvents DD_DMSLiteDataSet As taskFLOW.DD_DMSLiteDataSet Friend WithEvents TBPM_CONTROL_TABLEBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_CONTROL_TABLETableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter - Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager + Friend WithEvents TBPM_CONTROL_TABLETableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter + Friend WithEvents TableAdapterManager As taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup diff --git a/app/TaskFlow/frmColumn_Detail.resx b/app/TaskFlow/frmColumn_Detail.resx index c67ab1b..6c8b1d4 100644 --- a/app/TaskFlow/frmColumn_Detail.resx +++ b/app/TaskFlow/frmColumn_Detail.resx @@ -806,19 +806,19 @@ DD_DMSLiteDataSet - DD_ProcessManager.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPM_CONTROL_TABLETableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null BarButtonItem1 diff --git a/app/TaskFlow/frmConnection.Designer.vb b/app/TaskFlow/frmConnection.Designer.vb index b8417e1..948a4c6 100644 --- a/app/TaskFlow/frmConnection.Designer.vb +++ b/app/TaskFlow/frmConnection.Designer.vb @@ -33,7 +33,7 @@ Partial Class frmConnection Me.Chckwin_aut = New System.Windows.Forms.CheckBox() Me.txtBezeichnung = New System.Windows.Forms.TextBox() Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() Me.Label1 = New System.Windows.Forms.Label() Me.btnCheck_Con = New System.Windows.Forms.Button() Me.lblDatasource2 = New System.Windows.Forms.Label() @@ -75,8 +75,8 @@ Partial Class frmConnection Me.GUIDTextBox = New System.Windows.Forms.TextBox() Me.DATENBANKComboBox = New System.Windows.Forms.ComboBox() Me.BEMERKUNGTextBox = New System.Windows.Forms.TextBox() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() - Me.TBDD_CONNECTIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.TBDD_CONNECTIONTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.SYS_CONNECTIONCheckBox = New System.Windows.Forms.CheckBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() GEANDERTWERLabel = New System.Windows.Forms.Label() @@ -183,7 +183,7 @@ Partial Class frmConnection 'btnCheck_Con ' Me.btnCheck_Con.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnCheck_Con.Image = Global.DD_ProcessManager.My.Resources.Resources.world_link + Me.btnCheck_Con.Image = Global.taskFLOW.My.Resources.Resources.world_link Me.btnCheck_Con.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnCheck_Con.Location = New System.Drawing.Point(368, 133) Me.btnCheck_Con.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) @@ -400,7 +400,7 @@ Partial Class frmConnection ' 'ToolStripButton3 ' - Me.ToolStripButton3.Image = Global.DD_ProcessManager.My.Resources.Resources.refresh_16xLG + Me.ToolStripButton3.Image = Global.taskFLOW.My.Resources.Resources.refresh_16xLG Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton3.Name = "ToolStripButton3" Me.ToolStripButton3.Size = New System.Drawing.Size(95, 22) @@ -408,7 +408,7 @@ Partial Class frmConnection ' 'ToolStripButton1 ' - Me.ToolStripButton1.Image = Global.DD_ProcessManager.My.Resources.Resources.add + Me.ToolStripButton1.Image = Global.taskFLOW.My.Resources.Resources.add Me.ToolStripButton1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" @@ -425,7 +425,7 @@ Partial Class frmConnection ' 'ToolStripButton2 ' - Me.ToolStripButton2.Image = Global.DD_ProcessManager.My.Resources.Resources.delete_12x12 + Me.ToolStripButton2.Image = Global.taskFLOW.My.Resources.Resources.delete_12x12 Me.ToolStripButton2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton2.Name = "ToolStripButton2" @@ -568,7 +568,7 @@ Partial Class frmConnection Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBDD_CONNECTIONTableAdapter ' @@ -653,9 +653,9 @@ Partial Class frmConnection Friend WithEvents lblDataSource As System.Windows.Forms.Label Friend WithEvents cmbDbArt As System.Windows.Forms.ComboBox Friend WithEvents lblDatenbanktyp As System.Windows.Forms.Label - Friend WithEvents DD_DMSLiteDataSet As DD_ProcessManager.DD_DMSLiteDataSet + Friend WithEvents DD_DMSLiteDataSet As taskFLOW.DD_DMSLiteDataSet Friend WithEvents TBDD_CONNECTIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager + Friend WithEvents TableAdapterManager As taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents TBDD_CONNECTIONBindingNavigator As System.Windows.Forms.BindingNavigator Friend WithEvents BindingNavigatorCountItem As System.Windows.Forms.ToolStripLabel Friend WithEvents BindingNavigatorMoveFirstItem As System.Windows.Forms.ToolStripButton diff --git a/app/TaskFlow/frmDesignerLayout.Designer.vb b/app/TaskFlow/frmDesignerLayout.Designer.vb index 5c4f417..738a5f3 100644 --- a/app/TaskFlow/frmDesignerLayout.Designer.vb +++ b/app/TaskFlow/frmDesignerLayout.Designer.vb @@ -227,28 +227,28 @@ Partial Class frmDesignerLayout 'ToolboxItemTextbox ' Me.ToolboxItemTextbox.Caption = "Textbox" - Me.ToolboxItemTextbox.ImageOptions.Image = Global.DD_ProcessManager.My.Resources.Resources.TextBox + Me.ToolboxItemTextbox.ImageOptions.Image = Global.taskFLOW.My.Resources.Resources.TextBox Me.ToolboxItemTextbox.Name = "ToolboxItemTextbox" Me.ToolboxItemTextbox.Tag = "TextBox" ' 'ToolboxItemMemoedit ' Me.ToolboxItemMemoedit.Caption = "Multiline Textbox" - Me.ToolboxItemMemoedit.ImageOptions.Image = Global.DD_ProcessManager.My.Resources.Resources.TextBox + Me.ToolboxItemMemoedit.ImageOptions.Image = Global.taskFLOW.My.Resources.Resources.TextBox Me.ToolboxItemMemoedit.Name = "ToolboxItemMemoedit" Me.ToolboxItemMemoedit.Tag = "Memoedit" ' 'ToolboxItemDatepicker ' Me.ToolboxItemDatepicker.Caption = "Datepicker" - Me.ToolboxItemDatepicker.ImageOptions.Image = Global.DD_ProcessManager.My.Resources.Resources.DateOrTimePicker_675 + Me.ToolboxItemDatepicker.ImageOptions.Image = Global.taskFLOW.My.Resources.Resources.DateOrTimePicker_675 Me.ToolboxItemDatepicker.Name = "ToolboxItemDatepicker" Me.ToolboxItemDatepicker.Tag = "Datepicker" ' 'ToolboxItemCheckbox ' Me.ToolboxItemCheckbox.Caption = "Checkbox" - Me.ToolboxItemCheckbox.ImageOptions.Image = Global.DD_ProcessManager.My.Resources.Resources.checkbox_16xLG + Me.ToolboxItemCheckbox.ImageOptions.Image = Global.taskFLOW.My.Resources.Resources.checkbox_16xLG Me.ToolboxItemCheckbox.Name = "ToolboxItemCheckbox" Me.ToolboxItemCheckbox.Tag = "Checkbox" ' diff --git a/app/TaskFlow/frmDesignerLayout.vb b/app/TaskFlow/frmDesignerLayout.vb index 0dc52c8..df90374 100644 --- a/app/TaskFlow/frmDesignerLayout.vb +++ b/app/TaskFlow/frmDesignerLayout.vb @@ -1,6 +1,6 @@ Imports System.IO Imports System.Text.Encoding -Imports DD_ProcessManager.Controls +Imports taskFLOW.Controls Imports DevExpress.XtraBars Imports DevExpress.XtraEditors Imports DevExpress.XtraLayout diff --git a/app/TaskFlow/frmDesignerLayout/Editors/frmDatasourceEditor.vb b/app/TaskFlow/frmDesignerLayout/Editors/frmDatasourceEditor.vb index eceab52..3edb67f 100644 --- a/app/TaskFlow/frmDesignerLayout/Editors/frmDatasourceEditor.vb +++ b/app/TaskFlow/frmDesignerLayout/Editors/frmDatasourceEditor.vb @@ -1,4 +1,4 @@ -Imports DD_ProcessManager.Controls.Editors +Imports taskFLOW.Controls.Editors 'Imports ScintillaNET Public Class frmDatasourceEditor diff --git a/app/TaskFlow/frmDesignerLayout/Properties/BaseProperties.vb b/app/TaskFlow/frmDesignerLayout/Properties/BaseProperties.vb index 7d81f04..33ae422 100644 --- a/app/TaskFlow/frmDesignerLayout/Properties/BaseProperties.vb +++ b/app/TaskFlow/frmDesignerLayout/Properties/BaseProperties.vb @@ -1,5 +1,5 @@ Imports System.ComponentModel -Imports DD_ProcessManager.Controls.Localization +Imports taskFLOW.Controls.Localization Namespace Controls.Properties Public MustInherit Class BaseProperties diff --git a/app/TaskFlow/frmDesignerLayout/Properties/ComboboxProperties.vb b/app/TaskFlow/frmDesignerLayout/Properties/ComboboxProperties.vb index 17bf98f..ce3d57c 100644 --- a/app/TaskFlow/frmDesignerLayout/Properties/ComboboxProperties.vb +++ b/app/TaskFlow/frmDesignerLayout/Properties/ComboboxProperties.vb @@ -1,6 +1,6 @@ Imports System.ComponentModel -Imports DD_ProcessManager.Controls.Editors -Imports DD_ProcessManager.Controls.Localization +Imports taskFLOW.Controls.Editors +Imports taskFLOW.Controls.Localization Namespace Controls.Properties Public Class ComboboxProperties diff --git a/app/TaskFlow/frmFormDesigner.Designer.vb b/app/TaskFlow/frmFormDesigner.Designer.vb index b4118fd..da0d6a5 100644 --- a/app/TaskFlow/frmFormDesigner.Designer.vb +++ b/app/TaskFlow/frmFormDesigner.Designer.vb @@ -57,18 +57,18 @@ Partial Class frmFormDesigner Me.RibPGCtrlheight = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.GridControlContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MenuItemAddColumn = New System.Windows.Forms.ToolStripMenuItem() - Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() - Me.TBDD_CONNECTIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() + Me.TBPM_PROFILE_CONTROLSTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.TBDD_CONNECTIONTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBWH_CHECK_PROFILE_CONTROLSTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter() + Me.TBWH_CHECK_PROFILE_CONTROLSTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter() Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_CONTROL_TABLETableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() + Me.TBPM_CONTROL_TABLETableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RPGControlFunction = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() @@ -195,56 +195,56 @@ Partial Class frmFormDesigner ' resources.ApplyResources(Me.bbtnitLabel, "bbtnitLabel") Me.bbtnitLabel.Id = 8 - Me.bbtnitLabel.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.color + Me.bbtnitLabel.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.color Me.bbtnitLabel.Name = "bbtnitLabel" ' 'bbtnitTextBox ' resources.ApplyResources(Me.bbtnitTextBox, "bbtnitTextBox") Me.bbtnitTextBox.Id = 9 - Me.bbtnitTextBox.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.textthatcontains + Me.bbtnitTextBox.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.textthatcontains Me.bbtnitTextBox.Name = "bbtnitTextBox" ' 'bbtnitLU ' resources.ApplyResources(Me.bbtnitLU, "bbtnitLU") Me.bbtnitLU.Id = 10 - Me.bbtnitLU.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.insertcombobox + Me.bbtnitLU.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.insertcombobox Me.bbtnitLU.Name = "bbtnitLU" ' 'bbtnitTable ' resources.ApplyResources(Me.bbtnitTable, "bbtnitTable") Me.bbtnitTable.Id = 11 - Me.bbtnitTable.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.actions_table + Me.bbtnitTable.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.actions_table Me.bbtnitTable.Name = "bbtnitTable" ' 'bbtnitDatePicker ' resources.ApplyResources(Me.bbtnitDatePicker, "bbtnitDatePicker") Me.bbtnitDatePicker.Id = 12 - Me.bbtnitDatePicker.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.adateoccuring + Me.bbtnitDatePicker.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.adateoccuring Me.bbtnitDatePicker.Name = "bbtnitDatePicker" ' 'bbtnitCheckBox ' resources.ApplyResources(Me.bbtnitCheckBox, "bbtnitCheckBox") Me.bbtnitCheckBox.Id = 13 - Me.bbtnitCheckBox.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.itemtypechecked + Me.bbtnitCheckBox.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.itemtypechecked Me.bbtnitCheckBox.Name = "bbtnitCheckBox" ' 'bbtnitButton ' resources.ApplyResources(Me.bbtnitButton, "bbtnitButton") Me.bbtnitButton.Id = 14 - Me.bbtnitButton.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.groupby + Me.bbtnitButton.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.groupby Me.bbtnitButton.Name = "bbtnitButton" ' 'bbtnitLine ' resources.ApplyResources(Me.bbtnitLine, "bbtnitLine") Me.bbtnitLine.Id = 15 - Me.bbtnitLine.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.pencolor + Me.bbtnitLine.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.pencolor Me.bbtnitLine.Name = "bbtnitLine" ' 'bbtniwidth_plus @@ -279,7 +279,7 @@ Partial Class frmFormDesigner ' resources.ApplyResources(Me.tslblAenderungen, "tslblAenderungen") Me.tslblAenderungen.Id = 20 - Me.tslblAenderungen.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.save1 + Me.tslblAenderungen.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.save1 Me.tslblAenderungen.Name = "tslblAenderungen" Me.tslblAenderungen.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' @@ -382,7 +382,7 @@ Partial Class frmFormDesigner Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBDD_CONNECTIONTableAdapter ' @@ -435,7 +435,7 @@ Partial Class frmFormDesigner Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.IconOptions.Icon = CType(resources.GetObject("frmFormDesigner.IconOptions.Icon"), System.Drawing.Icon) - Me.IconOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.chartdesigner1 + Me.IconOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.chartdesigner1 Me.MinimizeBox = False Me.Name = "frmFormDesigner" Me.Ribbon = Me.RibbonControl1 @@ -458,17 +458,17 @@ Partial Class frmFormDesigner Me.PerformLayout() End Sub - Friend WithEvents DD_DMSLiteDataSet As DD_ProcessManager.DD_DMSLiteDataSet + Friend WithEvents DD_DMSLiteDataSet As taskFLOW.DD_DMSLiteDataSet Friend WithEvents TBPM_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_PROFILE_CONTROLSTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter - Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager + Friend WithEvents TBPM_PROFILE_CONTROLSTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter + Friend WithEvents TableAdapterManager As taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents TBDD_CONNECTIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBDD_CONNECTIONTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter + Friend WithEvents TBDD_CONNECTIONTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter Friend WithEvents TBWH_CHECK_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBWH_CHECK_PROFILE_CONTROLSTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter + Friend WithEvents TBWH_CHECK_PROFILE_CONTROLSTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip Friend WithEvents TBPM_CONTROL_TABLEBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_CONTROL_TABLETableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter + Friend WithEvents TBPM_CONTROL_TABLETableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter Friend WithEvents GridControlContextMenu As ContextMenuStrip Friend WithEvents MenuItemAddColumn As ToolStripMenuItem Friend WithEvents SplitContainerDesigner As SplitContainer diff --git a/app/TaskFlow/frmFormDesigner.resx b/app/TaskFlow/frmFormDesigner.resx index 4a93fe4..a8bc1c4 100644 --- a/app/TaskFlow/frmFormDesigner.resx +++ b/app/TaskFlow/frmFormDesigner.resx @@ -1222,7 +1222,7 @@ DD_DMSLiteDataSet - DD_ProcessManager.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_CONNECTIONBindingSource @@ -1246,19 +1246,19 @@ TBPM_PROFILE_CONTROLSTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_CONNECTIONTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBWH_CHECK_PROFILE_CONTROLSBindingSource @@ -1270,7 +1270,7 @@ TBWH_CHECK_PROFILE_CONTROLSTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPM_CONTROL_TABLEBindingSource @@ -1282,7 +1282,7 @@ TBPM_CONTROL_TABLETableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null RibbonPage2 diff --git a/app/TaskFlow/frmFormDesigner.vb b/app/TaskFlow/frmFormDesigner.vb index 2af4d97..95d4267 100644 --- a/app/TaskFlow/frmFormDesigner.vb +++ b/app/TaskFlow/frmFormDesigner.vb @@ -352,7 +352,7 @@ Public Class frmFormDesigner oControl.BackColor = Color.Transparent Case GetType(System.Windows.Forms.CheckBox) oControl.BackColor = Color.Transparent - Case GetType(DD_ProcessManager.ClassControlCreator.LineLabel) + Case GetType(taskFLOW.ClassControlCreator.LineLabel) oControl.BackColor = oControl.ForeColor Case GetType(DigitalData.Controls.LookupGrid.LookupControl3) oControl.BackColor = Color.White diff --git a/app/TaskFlow/frmInvDashboard.Designer.vb b/app/TaskFlow/frmInvDashboard.Designer.vb index 3aedfd1..897ddcb 100644 --- a/app/TaskFlow/frmInvDashboard.Designer.vb +++ b/app/TaskFlow/frmInvDashboard.Designer.vb @@ -193,10 +193,10 @@ Partial Class frmInvDashboard Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() Me.VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.VWPM_CHART_INVOICE_MONITOR_SERIESTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.VWPM_CHART_INVOICE_MONITOR_SERIESTableAdapter() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.VWPM_CHART_INVOICE_MONITOR_SERIESTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.VWPM_CHART_INVOICE_MONITOR_SERIESTableAdapter() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.TileView1 = New DevExpress.XtraGrid.Views.Tile.TileView() Me.Label1 = New System.Windows.Forms.Label() @@ -210,7 +210,7 @@ Partial Class frmInvDashboard Me.SplitContainerDashboard = New System.Windows.Forms.SplitContainer() Me.SplitContainerTop = New System.Windows.Forms.SplitContainer() Me.ChartTopLeft = New DevExpress.XtraCharts.ChartControl() - Me.VWPM_CHART_TOP5TableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.VWPM_CHART_TOP5TableAdapter() + Me.VWPM_CHART_TOP5TableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.VWPM_CHART_TOP5TableAdapter() Me.ChartTopRight = New DevExpress.XtraCharts.ChartControl() Me.SplitContainerBottom = New System.Windows.Forms.SplitContainer() Me.ChartBottomLeft = New DevExpress.XtraCharts.ChartControl() @@ -1140,7 +1140,7 @@ Partial Class frmInvDashboard Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'GridControl1 ' diff --git a/app/TaskFlow/frmKonfig.Designer.vb b/app/TaskFlow/frmKonfig.Designer.vb index c1fb6ed..77abd10 100644 --- a/app/TaskFlow/frmKonfig.Designer.vb +++ b/app/TaskFlow/frmKonfig.Designer.vb @@ -60,10 +60,10 @@ Partial Class frmKonfig Me.LogNachrichtenLeerenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SpeichereLogAlsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.gvLogs = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_KONFIGURATIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.TBPM_KONFIGURATIONTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() Me.TabControl1.SuspendLayout() Me.TabPage2.SuspendLayout() @@ -176,7 +176,7 @@ Partial Class frmKonfig ' 'BtnConnect ' - Me.BtnConnect.Image = Global.DD_ProcessManager.My.Resources.Resources.database_go + Me.BtnConnect.Image = Global.taskFLOW.My.Resources.Resources.database_go resources.ApplyResources(Me.BtnConnect, "BtnConnect") Me.BtnConnect.Name = "BtnConnect" Me.BtnConnect.UseVisualStyleBackColor = True @@ -227,7 +227,7 @@ Partial Class frmKonfig ' 'BtnCreateLogfiles ' - Me.BtnCreateLogfiles.Image = Global.DD_ProcessManager.My.Resources.Resources.AttachFileHS + Me.BtnCreateLogfiles.Image = Global.taskFLOW.My.Resources.Resources.AttachFileHS resources.ApplyResources(Me.BtnCreateLogfiles, "BtnCreateLogfiles") Me.BtnCreateLogfiles.Name = "BtnCreateLogfiles" Me.BtnCreateLogfiles.UseVisualStyleBackColor = True @@ -245,10 +245,10 @@ Partial Class frmKonfig ' 'txtIntervall ' - Me.txtIntervall.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.DD_ProcessManager.My.MySettings.Default, "IntervallReminder", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.txtIntervall.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.taskFLOW.My.MySettings.Default, "IntervallReminder", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) resources.ApplyResources(Me.txtIntervall, "txtIntervall") Me.txtIntervall.Name = "txtIntervall" - Me.txtIntervall.Text = Global.DD_ProcessManager.My.MySettings.Default.IntervallReminder + Me.txtIntervall.Text = Global.taskFLOW.My.MySettings.Default.IntervallReminder ' 'Label6 ' @@ -356,7 +356,7 @@ Partial Class frmKonfig Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'frmKonfig ' @@ -397,10 +397,10 @@ Partial Class frmKonfig Friend WithEvents txtActualConnection As System.Windows.Forms.TextBox Friend WithEvents chkbxUserAut As System.Windows.Forms.CheckBox Friend WithEvents TabPage3 As System.Windows.Forms.TabPage - Friend WithEvents DD_DMSLiteDataSet As DD_ProcessManager.DD_DMSLiteDataSet + Friend WithEvents DD_DMSLiteDataSet As taskFLOW.DD_DMSLiteDataSet Friend WithEvents TBPM_KONFIGURATIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_KONFIGURATIONTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter - Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager + Friend WithEvents TBPM_KONFIGURATIONTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter + Friend WithEvents TableAdapterManager As taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel Friend WithEvents btnOpenAppDataFolder As System.Windows.Forms.Button diff --git a/app/TaskFlow/frmKonfig.resx b/app/TaskFlow/frmKonfig.resx index 2f254d4..f6c5bc1 100644 --- a/app/TaskFlow/frmKonfig.resx +++ b/app/TaskFlow/frmKonfig.resx @@ -1040,7 +1040,7 @@ DD_DMSLiteDataSet - DD_ProcessManager.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPM_KONFIGURATIONBindingSource @@ -1052,13 +1052,13 @@ TBPM_KONFIGURATIONTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null SaveFileDialog1 diff --git a/app/TaskFlow/frmLicense.Designer.vb b/app/TaskFlow/frmLicense.Designer.vb index f3b02ba..75cc40d 100644 --- a/app/TaskFlow/frmLicense.Designer.vb +++ b/app/TaskFlow/frmLicense.Designer.vb @@ -39,10 +39,10 @@ Partial Class frmLicense Me.txtlicenseCount = New System.Windows.Forms.TextBox() Me.lblnewlicenses = New System.Windows.Forms.Label() Me.lblAktuelleLizenzen = New System.Windows.Forms.Label() - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_KONFIGURATIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.TBPM_KONFIGURATIONTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.Label4 = New System.Windows.Forms.Label() Me.txtModules = New System.Windows.Forms.TextBox() Me.grbBoxlicense.SuspendLayout() @@ -125,7 +125,7 @@ Partial Class frmLicense ' 'btnnewLicenses ' - Me.btnnewLicenses.Image = Global.DD_ProcessManager.My.Resources.Resources.key_go + Me.btnnewLicenses.Image = Global.taskFLOW.My.Resources.Resources.key_go resources.ApplyResources(Me.btnnewLicenses, "btnnewLicenses") Me.btnnewLicenses.Name = "btnnewLicenses" Me.btnnewLicenses.UseVisualStyleBackColor = True @@ -175,7 +175,7 @@ Partial Class frmLicense Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'Label4 ' @@ -217,10 +217,10 @@ Partial Class frmLicense Friend WithEvents txtlicenseCount As System.Windows.Forms.TextBox Friend WithEvents lblnewlicenses As System.Windows.Forms.Label Friend WithEvents lblAktuelleLizenzen As System.Windows.Forms.Label - Friend WithEvents DD_DMSLiteDataSet As DD_ProcessManager.DD_DMSLiteDataSet + Friend WithEvents DD_DMSLiteDataSet As taskFLOW.DD_DMSLiteDataSet Friend WithEvents TBPM_KONFIGURATIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_KONFIGURATIONTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter - Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager + Friend WithEvents TBPM_KONFIGURATIONTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter + Friend WithEvents TableAdapterManager As taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents dtp_Gültigkeit As System.Windows.Forms.DateTimePicker Friend WithEvents Label3 As System.Windows.Forms.Label diff --git a/app/TaskFlow/frmLicense.resx b/app/TaskFlow/frmLicense.resx index 2118ab1..8a00401 100644 --- a/app/TaskFlow/frmLicense.resx +++ b/app/TaskFlow/frmLicense.resx @@ -781,7 +781,7 @@ DD_DMSLiteDataSet - DD_ProcessManager.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPM_KONFIGURATIONBindingSource @@ -793,13 +793,13 @@ TBPM_KONFIGURATIONTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null frmLicense diff --git a/app/TaskFlow/frmLoginAdmin.Designer.vb b/app/TaskFlow/frmLoginAdmin.Designer.vb index a9d6674..2ce15a6 100644 --- a/app/TaskFlow/frmLoginAdmin.Designer.vb +++ b/app/TaskFlow/frmLoginAdmin.Designer.vb @@ -28,10 +28,10 @@ Partial Class frmLoginAdmin Me.Label1 = New System.Windows.Forms.Label() Me.btnAbbruch = New System.Windows.Forms.Button() Me.btnok = New System.Windows.Forms.Button() - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_KONFIGURATIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.TBPM_KONFIGURATIONTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.Button1 = New System.Windows.Forms.Button() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -88,11 +88,11 @@ Partial Class frmLoginAdmin Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'Button1 ' - Me.Button1.Image = Global.DD_ProcessManager.My.Resources.Resources.asterisk_yellow + Me.Button1.Image = Global.taskFLOW.My.Resources.Resources.asterisk_yellow resources.ApplyResources(Me.Button1, "Button1") Me.Button1.Name = "Button1" Me.Button1.UseVisualStyleBackColor = True @@ -120,9 +120,9 @@ Partial Class frmLoginAdmin Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents btnAbbruch As System.Windows.Forms.Button Friend WithEvents btnok As System.Windows.Forms.Button - Friend WithEvents DD_DMSLiteDataSet As DD_ProcessManager.DD_DMSLiteDataSet + Friend WithEvents DD_DMSLiteDataSet As taskFLOW.DD_DMSLiteDataSet Friend WithEvents TBPM_KONFIGURATIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_KONFIGURATIONTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter - Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager + Friend WithEvents TBPM_KONFIGURATIONTableAdapter As taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter + Friend WithEvents TableAdapterManager As taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents Button1 As System.Windows.Forms.Button End Class diff --git a/app/TaskFlow/frmLoginAdmin.resx b/app/TaskFlow/frmLoginAdmin.resx index f87013b..7932caf 100644 --- a/app/TaskFlow/frmLoginAdmin.resx +++ b/app/TaskFlow/frmLoginAdmin.resx @@ -280,7 +280,7 @@ DD_DMSLiteDataSet - DD_ProcessManager.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPM_KONFIGURATIONBindingSource @@ -292,13 +292,13 @@ TBPM_KONFIGURATIONTableAdapter - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null frmLoginAdmin diff --git a/app/TaskFlow/frmMain.Designer.vb b/app/TaskFlow/frmMain.Designer.vb index 744e9bc..7fe37d7 100644 --- a/app/TaskFlow/frmMain.Designer.vb +++ b/app/TaskFlow/frmMain.Designer.vb @@ -25,8 +25,8 @@ Partial Class frmMain Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) Me.ImageListProfile = New System.Windows.Forms.ImageList(Me.components) - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.Panel1 = New System.Windows.Forms.Panel() Me.GridControlWorkflows = New DevExpress.XtraGrid.GridControl() Me.GridViewWorkflows = New DevExpress.XtraGrid.Views.Grid.GridView() @@ -241,7 +241,7 @@ Partial Class frmMain Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'Panel1 ' @@ -362,7 +362,7 @@ Partial Class frmMain ' resources.ApplyResources(Me.bsiUser, "bsiUser") Me.bsiUser.Id = 8 - Me.bsiUser.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.actions_user + Me.bsiUser.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.actions_user Me.bsiUser.Name = "bsiUser" Me.bsiUser.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' @@ -370,14 +370,14 @@ Partial Class frmMain ' resources.ApplyResources(Me.bsiLicenses, "bsiLicenses") Me.bsiLicenses.Id = 9 - Me.bsiLicenses.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.security_key + Me.bsiLicenses.ImageOptions.SvgImage = Global.taskFLOW.My.Resources.Resources.security_key Me.bsiLicenses.Name = "bsiLicenses" Me.bsiLicenses.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' 'bsiUserLoggedIn ' Me.bsiUserLoggedIn.Id = 10 - Me.bsiUserLoggedIn.ImageOptions.Image = Global.DD_ProcessManager.My.Resources.Resources.group_key + Me.bsiUserLoggedIn.ImageOptions.Image = Global.taskFLOW.My.Resources.Resources.group_key Me.bsiUserLoggedIn.Name = "bsiUserLoggedIn" Me.bsiUserLoggedIn.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' @@ -511,7 +511,7 @@ Partial Class frmMain ' resources.ApplyResources(Me.bbtniCW, "bbtniCW") Me.bbtniCW.Id = 25 - Me.bbtniCW.ImageOptions.Image = Global.DD_ProcessManager.My.Resources.Resources.search + Me.bbtniCW.ImageOptions.Image = Global.taskFLOW.My.Resources.Resources.search Me.bbtniCW.Name = "bbtniCW" Me.bbtniCW.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large Me.bbtniCW.Visibility = DevExpress.XtraBars.BarItemVisibility.Never @@ -891,7 +891,7 @@ Partial Class frmMain ' 'tsmiValidationProfil ' - Me.tsmiValidationProfil.Image = Global.DD_ProcessManager.My.Resources.Resources.database_go1 + Me.tsmiValidationProfil.Image = Global.taskFLOW.My.Resources.Resources.database_go1 Me.tsmiValidationProfil.Name = "tsmiValidationProfil" resources.ApplyResources(Me.tsmiValidationProfil, "tsmiValidationProfil") ' @@ -929,7 +929,7 @@ Partial Class frmMain ' 'PopupErinnerungInaktivierenToolStripMenuItem ' - Me.PopupErinnerungInaktivierenToolStripMenuItem.Image = Global.DD_ProcessManager.My.Resources.Resources.user_red + Me.PopupErinnerungInaktivierenToolStripMenuItem.Image = Global.taskFLOW.My.Resources.Resources.user_red Me.PopupErinnerungInaktivierenToolStripMenuItem.Name = "PopupErinnerungInaktivierenToolStripMenuItem" resources.ApplyResources(Me.PopupErinnerungInaktivierenToolStripMenuItem, "PopupErinnerungInaktivierenToolStripMenuItem") ' @@ -940,7 +940,7 @@ Partial Class frmMain ' 'AnzeigenToolStripMenuItem ' - Me.AnzeigenToolStripMenuItem.Image = Global.DD_ProcessManager.My.Resources.Resources.Files_7954 + Me.AnzeigenToolStripMenuItem.Image = Global.taskFLOW.My.Resources.Resources.Files_7954 Me.AnzeigenToolStripMenuItem.Name = "AnzeigenToolStripMenuItem" resources.ApplyResources(Me.AnzeigenToolStripMenuItem, "AnzeigenToolStripMenuItem") ' @@ -1601,7 +1601,7 @@ Partial Class frmMain Me.Controls.Add(Me.barDockControlBottom) Me.Controls.Add(Me.barDockControlTop) Me.IconOptions.Icon = CType(resources.GetObject("frmMain.IconOptions.Icon"), System.Drawing.Icon) - Me.IconOptions.Image = Global.DD_ProcessManager.My.Resources.Resources.DD_taskFLOW_ICON + Me.IconOptions.Image = Global.taskFLOW.My.Resources.Resources.DD_taskFLOW_ICON Me.KeyPreview = True Me.Name = "frmMain" Me.Ribbon = Me.RibbonControl1 @@ -1629,8 +1629,8 @@ Partial Class frmMain Me.PerformLayout() End Sub - Friend WithEvents DD_DMSLiteDataSet As DD_ProcessManager.DD_DMSLiteDataSet - Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager + Friend WithEvents DD_DMSLiteDataSet As taskFLOW.DD_DMSLiteDataSet + Friend WithEvents TableAdapterManager As taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents ImageListProfile As System.Windows.Forms.ImageList Friend WithEvents NotifyIcon1 As System.Windows.Forms.NotifyIcon Friend WithEvents TimerRefresh As System.Windows.Forms.Timer diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index 49414b9..28db911 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAASABCwEgAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAUABCwFAAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1455,36 +1455,9 @@ 0, 0 - - Allgemein - - - Auswertungen - - - Verwaltung - - - Grundeinstellungen - - - Workflow - - - Funktionen/App Start - - - Ad Hoc Workflows - Start - - Funktionen - - - Workflow Tabelle - Tabelle @@ -1542,24 +1515,6 @@ 0 - - True - - - Tahoma, 9.75pt, style=Bold - - - 3, 3 - - - 127, 16 - - - 0 - - - Choose a profile ... - lblCaptionMainGrid @@ -1651,12 +1606,6 @@ 863, 17 - - 219, 26 - - - Starte Validierung für Profil - 220, 30 @@ -1837,6 +1786,69 @@ 2 + + Allgemein + + + Auswertungen + + + Verwaltung + + + Grundeinstellungen + + + Workflow + + + Funktionen/App Start + + + Ad Hoc Workflows + + + Funktionen + + + Workflow Tabelle + + + True + + + Tahoma, 9.75pt, style=Bold + + + 3, 3 + + + 127, 16 + + + 0 + + + Choose a profile ... + + + lblCaptionMainGrid + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel2 + + + 0 + + + 219, 26 + + + Starte Validierung für Profil + 17, 56 @@ -1846,27 +1858,6 @@ 250, 56 - - 290, 30 - - - Popup Erinnerung deaktivieren - - - 287, 6 - - - 290, 30 - - - In den Vordergrund - - - 290, 30 - - - Out of Range - Fenster wiederherstellen - 291, 100 @@ -1962,6 +1953,27 @@ True + + 290, 30 + + + Popup Erinnerung deaktivieren + + + 287, 6 + + + 290, 30 + + + In den Vordergrund + + + 290, 30 + + + Out of Range - Fenster wiederherstellen + 605, 17 @@ -2246,13 +2258,13 @@ DD_DMSLiteDataSet - DD_ProcessManager.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null GridViewWorkflows @@ -3383,6 +3395,9 @@ &Ansicht + + &Hintergrund + &Seiten Layout @@ -3395,9 +3410,6 @@ Bars - - &Hintergrund - PDF Dokument diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index a53f819..b3256e1 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -3264,7 +3264,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G LOGGER.Debug($"oTargetPath with NowParams: {oTargetPath}") - Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype) + Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype, True) If oResult = True Then WM_AHWF_docPath = oTargetPath Dim oDocID = WINDREAM_MOD.NewDocumentID diff --git a/app/TaskFlow/frmMassValidator.Designer.vb b/app/TaskFlow/frmMassValidator.Designer.vb index b728346..b53bdd2 100644 --- a/app/TaskFlow/frmMassValidator.Designer.vb +++ b/app/TaskFlow/frmMassValidator.Designer.vb @@ -31,8 +31,8 @@ Partial Class frmMassValidator Me.TITLELabel1 = New System.Windows.Forms.Label() Me.btnSave = New System.Windows.Forms.Button() Me.DESCRIPTIONLabel = New System.Windows.Forms.Label() - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() + Me.TableAdapterManager = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.pnldesigner = New DevExpress.XtraEditors.PanelControl() Me.StatusStrip1.SuspendLayout() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() @@ -81,7 +81,7 @@ Partial Class frmMassValidator Me.btnSave.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnSave.Font = New System.Drawing.Font("Tahoma", 9.75!) - Me.btnSave.Image = Global.DD_ProcessManager.My.Resources.Resources.flag_pink + Me.btnSave.Image = Global.taskFLOW.My.Resources.Resources.flag_pink Me.btnSave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnSave.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.btnSave.Location = New System.Drawing.Point(12, 464) @@ -125,7 +125,7 @@ Partial Class frmMassValidator Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'pnldesigner ' diff --git a/app/TaskFlow/frmSQL_Admin.Designer.vb b/app/TaskFlow/frmSQL_Admin.Designer.vb index 58922c4..c919345 100644 --- a/app/TaskFlow/frmSQL_Admin.Designer.vb +++ b/app/TaskFlow/frmSQL_Admin.Designer.vb @@ -77,14 +77,14 @@ Partial Class frmSQL_Admin 'Button1 ' resources.ApplyResources(Me.Button1, "Button1") - Me.Button1.Image = Global.DD_ProcessManager.My.Resources.Resources.book_open + Me.Button1.Image = Global.taskFLOW.My.Resources.Resources.book_open Me.Button1.Name = "Button1" Me.Button1.UseVisualStyleBackColor = True ' 'btnrunSQL ' resources.ApplyResources(Me.btnrunSQL, "btnrunSQL") - Me.btnrunSQL.Image = Global.DD_ProcessManager.My.Resources.Resources.database_go + Me.btnrunSQL.Image = Global.taskFLOW.My.Resources.Resources.database_go Me.btnrunSQL.Name = "btnrunSQL" Me.btnrunSQL.UseVisualStyleBackColor = True ' diff --git a/app/TaskFlow/frmSplash.designer.vb b/app/TaskFlow/frmSplash.designer.vb index 1a39a42..392f451 100644 --- a/app/TaskFlow/frmSplash.designer.vb +++ b/app/TaskFlow/frmSplash.designer.vb @@ -76,7 +76,7 @@ Partial Class frmSplash 'PictureBox1 ' Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox1.Image = Global.DD_ProcessManager.My.Resources.Resources.DD_taskFLOW_BOOT + Me.PictureBox1.Image = Global.taskFLOW.My.Resources.Resources.DD_taskFLOW_BOOT Me.PictureBox1.Location = New System.Drawing.Point(0, -1) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(800, 200) diff --git a/app/TaskFlow/frmValidator.Designer.vb b/app/TaskFlow/frmValidator.Designer.vb index 6f304ef..201302e 100644 --- a/app/TaskFlow/frmValidator.Designer.vb +++ b/app/TaskFlow/frmValidator.Designer.vb @@ -35,7 +35,7 @@ Partial Class frmValidator Me.PanelValidatorControl = New DevExpress.XtraEditors.XtraScrollableControl() Me.DESCRIPTIONLabel = New DevExpress.XtraEditors.LabelControl() Me.TITLELabel1 = New DevExpress.XtraEditors.LabelControl() - Me.DocumentViewerValidator = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) Me.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() @@ -222,7 +222,7 @@ Partial Class frmValidator ' 'SplitContainer1.Panel2 ' - Me.SplitContainer1.Panel2.Controls.Add(Me.DocumentViewerValidator) + Me.SplitContainer1.Panel2.Controls.Add(Me.DocumentViewer1) Me.SplitContainer1.TabStop = False ' 'PanelControl1 @@ -269,11 +269,11 @@ Partial Class frmValidator Me.TITLELabel1.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap Me.TITLELabel1.Name = "TITLELabel1" ' - 'DocumentViewerValidator + 'DocumentViewer1 ' - resources.ApplyResources(Me.DocumentViewerValidator, "DocumentViewerValidator") - Me.DocumentViewerValidator.FileLoaded = False - Me.DocumentViewerValidator.Name = "DocumentViewerValidator" + Me.DocumentViewer1.FileLoaded = False + resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") + Me.DocumentViewer1.Name = "DocumentViewer1" ' 'BarManager1 ' @@ -941,7 +941,7 @@ Partial Class frmValidator Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents bsiInfo1 As DevExpress.XtraBars.BarStaticItem Friend WithEvents bsiInfo2 As DevExpress.XtraBars.BarStaticItem - Friend WithEvents DocumentViewerValidator As DigitalData.Controls.DocumentViewer.DocumentViewer + Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents BbtnitmSave As DevExpress.XtraBars.BarButtonItem Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox Friend WithEvents RepositoryItemComboBox2 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index 920e339..6b1d9d0 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -618,31 +618,25 @@ 0 - - Fill - - + 0, 0 - - 3, 4, 3, 4 - - - 720, 465 + + 1012, 590 - + 0 - - DocumentViewerValidator + + DocumentViewer1 - - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.8.0, Culture=neutral, PublicKeyToken=null + + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.1.0, Culture=neutral, PublicKeyToken=null - + SplitContainer1.Panel2 - + 0 diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index c528eeb..837c60d 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -247,7 +247,7 @@ Public Class frmValidator Dim _step = 0 Try - DocumentViewerValidator.Init(LOGCONFIG, GDPICTURE_LICENSE, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With { + DocumentViewer1.Init(LOGCONFIG, GDPICTURE_LICENSE, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With { .ShowPrintButton = True, .ShowRotateButton = True, .ShowFlipButton = True, @@ -546,8 +546,11 @@ Public Class frmValidator Reset_CurrentReferences() Try - DocumentViewerValidator.CloseDocument() - DocumentViewerValidator.Done() + If Not IsNothing(DocumentViewer1) Then + DocumentViewer1.CloseDocument() + DocumentViewer1.Done() + End If + Catch ex As Exception Logger.Warn($"Unexpected error in DocumentViewerValidator.Done: {ex.Message}") End Try @@ -2879,20 +2882,27 @@ Public Class frmValidator End Try If ActiveWorkflowType = ConstAHWorkflow_BlindFile Or PROFILE_SHOW_DOCUMENT = False Then SplitContainer1.Panel2Collapsed = True - DocumentViewerValidator.Visible = False + If Not IsNothing(DocumentViewer1) Then + DocumentViewer1.Visible = False + End If + RibbonPageFile.Visible = False Exit Sub Else - DocumentViewerValidator.Visible = True + If Not IsNothing(DocumentViewer1) Then + DocumentViewer1.Visible = True + End If + End If ' Load Document in Document Viewer Dim oFileName = $"{CURRENT_DOC_ID}.{Current_Document.Extension}" - DocumentViewerValidator.LoadFile(oFileName, New MemoryStream(Current_Document.Contents)) - + If Not IsNothing(DocumentViewer1) Then + DocumentViewer1.LoadFile(oFileName, New MemoryStream(Current_Document.Contents)) + DocumentViewer1.RightOnlyView(USER_RIGHT_VIEW_ONLY) 'war auskommentiert.....WARUM? + End If - DocumentViewerValidator.RightOnlyView(USER_RIGHT_VIEW_ONLY) 'war auskommentiert.....WARUM? If USER_RIGHT_VIEW_ONLY = True Then RibbonPageFile.Visible = False Else @@ -5725,8 +5735,11 @@ Public Class frmValidator result = MessageBox.Show("Sind Sie sicher dass Sie dieses Dokument unwiderruflich löschen wollen?" & vbNewLine & "Danach wird die nächste Datei angezeigt!", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then Try - DocumentViewerValidator.CloseDocument() - DocumentViewerValidator.Done() + If Not IsNothing(DocumentViewer1) Then + DocumentViewer1.CloseDocument() + DocumentViewer1.Done() + End If + Catch ex As Exception Logger.Warn($"Unexpected error in delete_active_File DocumentViewerValidator.Done: {ex.Message}") End Try diff --git a/app/TaskFlow/frmValidatorSearch.Designer.vb b/app/TaskFlow/frmValidatorSearch.Designer.vb index 2956d8b..f15b712 100644 --- a/app/TaskFlow/frmValidatorSearch.Designer.vb +++ b/app/TaskFlow/frmValidatorSearch.Designer.vb @@ -319,7 +319,7 @@ Partial Class frmValidatorSearch ' 'SplitContainerSearches ' - Me.SplitContainerSearches.DataBindings.Add(New System.Windows.Forms.Binding("SplitterDistance", Global.DD_ProcessManager.My.MySettings.Default, "frmValSearchSplitterDistance", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.SplitContainerSearches.DataBindings.Add(New System.Windows.Forms.Binding("SplitterDistance", Global.taskFLOW.My.MySettings.Default, "frmValSearchSplitterDistance", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) resources.ApplyResources(Me.SplitContainerSearches, "SplitContainerSearches") Me.SplitContainerSearches.Name = "SplitContainerSearches" ' @@ -332,7 +332,7 @@ Partial Class frmValidatorSearch ' Me.SplitContainerSearches.Panel2.Controls.Add(Me.SplitContainerControlDoc) Me.SplitContainerSearches.Panel2.Controls.Add(Me.ToolStrip2) - Me.SplitContainerSearches.SplitterDistance = Global.DD_ProcessManager.My.MySettings.Default.frmValSearchSplitterDistance + Me.SplitContainerSearches.SplitterDistance = Global.taskFLOW.My.MySettings.Default.frmValSearchSplitterDistance ' 'XtraTabControlSQL ' @@ -547,25 +547,25 @@ Partial Class frmValidatorSearch ' Me.ToolStripDropDownButtonFile.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.ToolStripDropDownButtonFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem1, Me.EigenschaftenToolStripMenuItem}) - Me.ToolStripDropDownButtonFile.Image = Global.DD_ProcessManager.My.Resources.Resources.ID_FILE_PAGE_SETUP + Me.ToolStripDropDownButtonFile.Image = Global.taskFLOW.My.Resources.Resources.ID_FILE_PAGE_SETUP resources.ApplyResources(Me.ToolStripDropDownButtonFile, "ToolStripDropDownButtonFile") Me.ToolStripDropDownButtonFile.Name = "ToolStripDropDownButtonFile" ' 'DateiÖffnenToolStripMenuItem1 ' - Me.DateiÖffnenToolStripMenuItem1.Image = Global.DD_ProcessManager.My.Resources.Resources.OpenFileDialog_692 + Me.DateiÖffnenToolStripMenuItem1.Image = Global.taskFLOW.My.Resources.Resources.OpenFileDialog_692 Me.DateiÖffnenToolStripMenuItem1.Name = "DateiÖffnenToolStripMenuItem1" resources.ApplyResources(Me.DateiÖffnenToolStripMenuItem1, "DateiÖffnenToolStripMenuItem1") ' 'EigenschaftenToolStripMenuItem ' - Me.EigenschaftenToolStripMenuItem.Image = Global.DD_ProcessManager.My.Resources.Resources.Properties + Me.EigenschaftenToolStripMenuItem.Image = Global.taskFLOW.My.Resources.Resources.Properties Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem" resources.ApplyResources(Me.EigenschaftenToolStripMenuItem, "EigenschaftenToolStripMenuItem") ' 'ToolStripButtonRefreshSearches ' - Me.ToolStripButtonRefreshSearches.Image = Global.DD_ProcessManager.My.Resources.Resources.refresh_16xLG + Me.ToolStripButtonRefreshSearches.Image = Global.taskFLOW.My.Resources.Resources.refresh_16xLG resources.ApplyResources(Me.ToolStripButtonRefreshSearches, "ToolStripButtonRefreshSearches") Me.ToolStripButtonRefreshSearches.Name = "ToolStripButtonRefreshSearches" ' @@ -593,7 +593,7 @@ Partial Class frmValidatorSearch ' 'ToolStripMenuItem1 ' - Me.ToolStripMenuItem1.Image = Global.DD_ProcessManager.My.Resources.Resources.refresh_16xLG + Me.ToolStripMenuItem1.Image = Global.taskFLOW.My.Resources.Resources.refresh_16xLG Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" resources.ApplyResources(Me.ToolStripMenuItem1, "ToolStripMenuItem1") ' @@ -616,7 +616,7 @@ Partial Class frmValidatorSearch ' 'ToolStripMenuItem4 ' - Me.ToolStripMenuItem4.Image = Global.DD_ProcessManager.My.Resources.Resources.refresh_16xLG + Me.ToolStripMenuItem4.Image = Global.taskFLOW.My.Resources.Resources.refresh_16xLG Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4" resources.ApplyResources(Me.ToolStripMenuItem4, "ToolStripMenuItem4") ' diff --git a/app/TaskFlow/frmValidatorSearch.resx b/app/TaskFlow/frmValidatorSearch.resx index 1eca9b1..57cf99d 100644 --- a/app/TaskFlow/frmValidatorSearch.resx +++ b/app/TaskFlow/frmValidatorSearch.resx @@ -138,7 +138,7 @@ 0, 0 - 233, 369 + 349, 559 @@ -157,7 +157,7 @@ 0 - 349, 553 + 349, 559 XtraTabPage1 @@ -175,7 +175,7 @@ 0 - 351, 576 + 351, 582 4 @@ -187,7 +187,7 @@ 0, 0 - 233, 373 + 349, 553 1 @@ -205,7 +205,7 @@ 0 - 349, 559 + 349, 553 XtraTabPage2 @@ -229,7 +229,7 @@ 0, 0 - 233, 373 + 349, 553 1 @@ -247,7 +247,7 @@ 0 - 349, 559 + 349, 553 XtraTabPage1 @@ -271,7 +271,7 @@ 0, 0 - 233, 373 + 349, 553 1 @@ -289,7 +289,7 @@ 0 - 349, 559 + 349, 553 XtraTabPage2 @@ -313,7 +313,7 @@ 0, 0 - 233, 373 + 349, 553 1 @@ -331,7 +331,7 @@ 0 - 349, 559 + 349, 553 XtraTabPage3 @@ -382,7 +382,7 @@ 0, 0 - 286, 576 + 286, 582 0 @@ -391,7 +391,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.1.0, Culture=neutral, PublicKeyToken=null SplitContainerControlDoc.Panel2 @@ -415,7 +415,7 @@ 1 - 647, 576 + 647, 582 6 @@ -436,7 +436,7 @@ Fill - 0, 31 + 0, 25 Fill @@ -451,7 +451,7 @@ 0, 0 - 374, 371 + 561, 562 1 @@ -469,7 +469,7 @@ 0 - 561, 556 + 561, 562 Search1 @@ -487,7 +487,7 @@ 0 - 563, 579 + 563, 585 4 @@ -499,7 +499,7 @@ 0, 0 - 374, 375 + 561, 556 2 @@ -517,7 +517,7 @@ 0 - 561, 562 + 561, 556 Search2 @@ -541,7 +541,7 @@ 0, 0 - 374, 375 + 561, 556 2 @@ -559,7 +559,7 @@ 0 - 561, 562 + 561, 556 XtraTabPage1 @@ -583,7 +583,7 @@ 0, 0 - 374, 375 + 561, 556 2 @@ -601,7 +601,7 @@ 0 - 561, 562 + 561, 556 XtraTabPage2 @@ -625,7 +625,7 @@ 0, 0 - 374, 375 + 561, 556 2 @@ -643,7 +643,7 @@ 0 - 561, 562 + 561, 556 XtraTabPage3 @@ -685,7 +685,7 @@ 0, 17 - 0, 579 + 0, 585 563, 22 @@ -739,7 +739,7 @@ No action so far - 0, 576 + 0, 582 647, 25 @@ -775,7 +775,7 @@ 1 - 1214, 601 + 1214, 607 3 @@ -796,13 +796,13 @@ 17, 17 - 156, 30 + 148, 22 Öffnen - 156, 30 + 148, 22 Eigenschaften @@ -811,7 +811,7 @@ Magenta - 71, 28 + 63, 22 Datei @@ -820,7 +820,7 @@ Magenta - 131, 28 + 131, 22 Aktualisiere Ansicht @@ -829,7 +829,7 @@ 0, 0 - 1214, 31 + 1214, 25 0 @@ -855,7 +855,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 - JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsRAAALEQF/ZF+RAAACkUlE + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsQAAALEAGtI711AAACkUlE QVRIS8XQXUhTYRwGcAkiqBuDhKAi6ia8kZp3QeS6iGjqnBtT0UqDNAtSJoKNokFuIUpG0kxKCVtWY5lE IFmBmuG0D20jQ/Nrs0UzV2Yy9/307uSpA/317pwO/HjPeQ7v/33OSQDwX5GhlMhQSmQoJTKUEhmupMNq XmtraRh71m6aNlaVHHp8xxC53WjALbMBTfV6NBgrYCjPj5lr9Xq1TX6J6abmCJHhajqtrW1L06a209oD @@ -923,7 +923,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAZRJREFUOE+VkO0vQmEY + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAAZRJREFUOE+VkO0vQmEY xvsn/Cn8Az4x1gd8s7GxUeYbG4sNy5BqpZeZkkoyNQ2NNpppGH0wNrJ5X1MtpSWV3rs8p5a0jtNc2/Xc 57l337+d52IBoPW03NA4KTViZE6HGYUJPKF2jG6uqlFy95ACbRxRJ/U9OKqpmyKwYf5KR9eQnLTKcxVL TObyFlvbB0RgcyTkWu4XDqVhD3RWrO7CYHXOUzNtXDHY/VK09MnIlQZApwXtDhqae38gdC4cfwHEagv2 diff --git a/app/TaskFlow/frmValidatorSearch.vb b/app/TaskFlow/frmValidatorSearch.vb index 769ecbf..4bd5cbe 100644 --- a/app/TaskFlow/frmValidatorSearch.vb +++ b/app/TaskFlow/frmValidatorSearch.vb @@ -47,6 +47,7 @@ Public Class frmValidatorSearch Private _frmValidator As frmValidator 'You need a reference to Form1 Private Shared BW_DocPath As String Private Shared BW_DocID As Integer + Private LastDocID As Int64 = 0 Private Documentloader As Loader Private Property OperationMode As OperationMode Private ReadOnly Environment As Environment @@ -195,7 +196,7 @@ Public Class frmValidatorSearch GridViewSearch5.BestFitColumns(True) End Select - tsslblSQL.Text = $"Tab {TabCaption} refreshed - {Now}" + tsslblSQL.Text = $"Tab [{TabCaption}] refreshed - {Now}" End If Catch ex As Exception LOGGER.Error(ex) @@ -262,7 +263,7 @@ Public Class frmValidatorSearch myGridview.RestoreLayoutFromXml(oxmlPath) myGridview.GuessAutoFilterRowValuesFromFilter() End If - tslblState.Text = $"Tab {TabCaption} refreshed - {Now}" + tslblState.Text = $"Tab [{TabCaption}] refreshed - {Now}" Else clsWMDocGrid.DTDocuments = Nothing End If @@ -510,6 +511,8 @@ Public Class frmValidatorSearch End Sub Sub Refresh_DocID(myGrid As GridView) Try + + myGrid.ShowLoadingPanel() clsWMDocGrid.ActiveDocGrid = myGrid clsWMDocGrid.ActiveDocGrid.EndSelection() clsWMDocGrid.GetDocItems() @@ -517,6 +520,10 @@ Public Class frmValidatorSearch ToolStripDropDownButtonFile.Visible = True End If If clsWMDocGrid.SELECTED_DOC_ID <> 0 Then + If LastDocID = clsWMDocGrid.SELECTED_DOC_ID Then + myGrid.HideLoadingPanel() + Exit Sub + End If Dim msg = "DocID: " & clsWMDocGrid.SELECTED_DOC_ID.ToString tslblDocID.Text = msg ToolStripDropDownButtonFile.Enabled = True @@ -525,11 +532,10 @@ Public Class frmValidatorSearch oDocument = Documentloader.Load(clsWMDocGrid.SELECTED_DOC_ID, clsWMDocGrid.SELECTED_DOC_PATH) If Not IsNothing(DocumentViewer1) Then - ' DocumentViewer1.LoadFile(clsWMDocGrid.SELECTED_DOC_PATH) Dim oFileName = $"{clsWMDocGrid.SELECTED_DOC_ID}.{oDocument.Extension}" If Not IsNothing(oDocument.Contents) Then DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents)) - + LastDocID = clsWMDocGrid.SELECTED_DOC_ID DocumentViewer1.RightViewOnly(USER_RIGHT_VIEW_ONLY) If USER_RIGHT_VIEW_ONLY = True Then ToolStripDropDownButtonFile.Visible = False @@ -550,7 +556,7 @@ Public Class frmValidatorSearch Catch ex As Exception LOGGER.Error(ex) End Try - + myGrid.HideLoadingPanel() End Sub Private Sub GridViewDocSearch1_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewDocSearch1.FocusedRowChanged Refresh_DocID(GridViewDocSearch1) diff --git a/app/TaskFlow/packages.config b/app/TaskFlow/packages.config index d18ff53..26dbe61 100644 --- a/app/TaskFlow/packages.config +++ b/app/TaskFlow/packages.config @@ -1,37 +1,34 @@  - - - - + + + - - - - + + - + - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file