diff --git a/Controls.RegexEditor/My Project/licenses.licx b/Controls.RegexEditor/My Project/licenses.licx index e69de29b..773d16c2 100644 --- a/Controls.RegexEditor/My Project/licenses.licx +++ b/Controls.RegexEditor/My Project/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Controls.SQLEditor/My Project/Resources.Designer.vb b/Controls.SQLEditor/My Project/Resources.Designer.vb index 83360763..2ffb5332 100644 --- a/Controls.SQLEditor/My Project/Resources.Designer.vb +++ b/Controls.SQLEditor/My Project/Resources.Designer.vb @@ -130,6 +130,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property bo_contract() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("bo_contract", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/Controls.SQLEditor/My Project/Resources.resx b/Controls.SQLEditor/My Project/Resources.resx index 0a14f139..92de47ad 100644 --- a/Controls.SQLEditor/My Project/Resources.resx +++ b/Controls.SQLEditor/My Project/Resources.resx @@ -124,8 +124,8 @@ ..\Resources\removegroupheader.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_user.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\editdatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -139,6 +139,9 @@ ..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\autoarrange.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\cleartablestyle.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -151,8 +154,8 @@ ..\Resources\editdatasource2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\clearall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_database2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -160,28 +163,28 @@ ..\Resources\updatedataextract3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_database1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\updatedataextract1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\clearall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_user.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_checkcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_database1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\autoarrange.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_contract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/Controls.SQLEditor/Placeholders.vb b/Controls.SQLEditor/Placeholders.vb index 38c4a8e3..0b06dfe2 100644 --- a/Controls.SQLEditor/Placeholders.vb +++ b/Controls.SQLEditor/Placeholders.vb @@ -2,6 +2,9 @@ Imports DevExpress.XtraBars.Ribbon Public Class Placeholders + Public Const AUTO_INDEX_ZOOFLOW = "ATTR_M" + Public Const MAN_INDEX_ZOOFLOW = "ATTR_A" + Public Function GetInternalPlaceholders() As GalleryItemGroup Dim oModule = "INT" Dim oImage = My.Resources.electronics_desktopmac @@ -31,17 +34,36 @@ Public Class Placeholders Return oGroup1 End Function - Public Function GetManualPlaceholders() As GalleryItemGroup - Return GetManualPlaceholders(New List(Of String)) - End Function - - Public Function GetManualPlaceholders(pPlaceholders As List(Of String)) As GalleryItemGroup - Dim oImage = My.Resources.handtool + Friend Function GetWindreamPlaceholders(pPlaceholders As List(Of String)) As GalleryItemGroup + Dim oImage = My.Resources.bo_contract Dim oItems As New List(Of GalleryItem)() + If pPlaceholders.Count > 0 Then + For Each oWindreamPlaceholder In pPlaceholders + Dim oPlaceholder = New Placeholder(oWindreamPlaceholder, "Windream Index", "WMI", oWindreamPlaceholder) + oItems.Add(GetGalleryItem(oPlaceholder, oImage)) + Next + Else Return Nothing + End If + + Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Windream Indizies"} + oGroup1.Items.AddRange(oItems.ToArray) + Return oGroup1 + End Function + + Public Function GetManualPlaceholders(pPlaceholders As List(Of String), pPrefix As String) As GalleryItemGroup + Dim oImage As SvgImage = My.Resources.handtool + Dim oItems As New List(Of GalleryItem)() + Dim oPrefix As String = pPrefix + + If oPrefix Is Nothing Then + oPrefix = AUTO_INDEX_ZOOFLOW + End If + If pPlaceholders.Count > 0 Then For Each oManualPlaceholder In pPlaceholders - oItems.Add(GetGalleryItem(New Placeholder(oManualPlaceholder, "Manuelles Attribut", "ATTR_M", oManualPlaceholder), oImage)) + Dim oPlaceholder = New Placeholder(oManualPlaceholder, "Manuelles Attribut", oPrefix, oManualPlaceholder) + oItems.Add(GetGalleryItem(oPlaceholder, oImage)) Next Else Return Nothing End If @@ -51,17 +73,19 @@ Public Class Placeholders Return oGroup1 End Function - Public Function GetAutomaticPlaceholders() As GalleryItemGroup - Return GetAutomaticPlaceholders(New List(Of String)) - End Function - - Public Function GetAutomaticPlaceholders(pPlaceholders As List(Of String)) As GalleryItemGroup - Dim oImage = My.Resources.autoarrange + Public Function GetAutomaticPlaceholders(pPlaceholders As List(Of String), pPrefix As String) As GalleryItemGroup + Dim oImage As SvgImage = My.Resources.autoarrange Dim oItems As New List(Of GalleryItem)() + Dim oPrefix As String = pPrefix + + If oPrefix Is Nothing Then + oPrefix = AUTO_INDEX_ZOOFLOW + End If If pPlaceholders.Count > 0 Then For Each oManualPlaceholder In pPlaceholders - oItems.Add(GetGalleryItem(New Placeholder(oManualPlaceholder, "Automatisches Attribut", "ATTR_A", oManualPlaceholder), oImage)) + Dim oPlaceholder = New Placeholder(oManualPlaceholder, "Automatisches Attribut", oPrefix, oManualPlaceholder) + oItems.Add(GetGalleryItem(oPlaceholder, oImage)) Next Else Return Nothing @@ -73,7 +97,7 @@ Public Class Placeholders Return oGroup1 End Function - Public Function GetUserGroup() As GalleryItemGroup + Public Function GetUserPlaceholders() As GalleryItemGroup Dim oModule = "USER" Dim oImage = My.Resources.actions_user @@ -84,7 +108,7 @@ Public Class Placeholders GetGalleryItem(New Placeholder("USER_ID", "Benutzer-ID", oModule, "USER_ID"), oImage), GetGalleryItem(New Placeholder("PROFILE_ID", "Profil-ID", oModule, "PROFILE_ID"), oImage), GetGalleryItem(New Placeholder("PROFILE_TITLE", "Profil-Name", oModule, "PROFILE_TITLE"), oImage), - GetGalleryItem(New Placeholder("LANGUAGE", "Sprache", oModule, "LANGUAGE"), oImage) + GetGalleryItem(New Placeholder("LANGUAGE", "Sprache", oModule, "LANGUAGE"), oImage) } Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Benutzer"} @@ -106,4 +130,6 @@ Public Class Placeholders Return oItem End Function + + End Class diff --git a/Controls.SQLEditor/Resources/bo_contract.svg b/Controls.SQLEditor/Resources/bo_contract.svg new file mode 100644 index 00000000..1d31dea8 --- /dev/null +++ b/Controls.SQLEditor/Resources/bo_contract.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Controls.SQLEditor/SQLEditor.vbproj b/Controls.SQLEditor/SQLEditor.vbproj index a0a3d920..85f37d66 100644 --- a/Controls.SQLEditor/SQLEditor.vbproj +++ b/Controls.SQLEditor/SQLEditor.vbproj @@ -261,5 +261,8 @@ + + + \ No newline at end of file diff --git a/Controls.SQLEditor/frmSQLEditor.Designer.vb b/Controls.SQLEditor/frmSQLEditor.Designer.vb index 13bf6e05..e6e78e85 100644 --- a/Controls.SQLEditor/frmSQLEditor.Designer.vb +++ b/Controls.SQLEditor/frmSQLEditor.Designer.vb @@ -35,6 +35,7 @@ Partial Class frmSQLEditor Me.chkShowPlaceholders = New DevExpress.XtraBars.BarCheckItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -62,9 +63,9 @@ Partial Class frmSQLEditor 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.GalleryPlaceholders, Me.btnEditConnections, Me.btnSave, Me.btnExecuteSQL, Me.GalleryConnection, Me.chkClearPlaceholders, Me.btnClearPlaceholders, Me.chkShowPlaceholders, Me.BarButtonItem1, Me.BarButtonItem2}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.GalleryPlaceholders, Me.btnEditConnections, Me.btnSave, Me.btnExecuteSQL, Me.GalleryConnection, Me.chkClearPlaceholders, Me.btnClearPlaceholders, Me.chkShowPlaceholders, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 15 + Me.RibbonControl1.MaxItemId = 16 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -158,6 +159,13 @@ Partial Class frmSQLEditor Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.autoarrange Me.BarButtonItem2.Name = "BarButtonItem2" ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "BarButtonItem3" + Me.BarButtonItem3.Id = 15 + Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.bo_contract + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup4, Me.RibbonPageGroup1}) @@ -317,4 +325,5 @@ Partial Class frmSQLEditor Friend WithEvents chkShowPlaceholders As DevExpress.XtraBars.BarCheckItem Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/Controls.SQLEditor/frmSQLEditor.vb b/Controls.SQLEditor/frmSQLEditor.vb index d742071c..5d1d68ba 100644 --- a/Controls.SQLEditor/frmSQLEditor.vb +++ b/Controls.SQLEditor/frmSQLEditor.vb @@ -20,7 +20,12 @@ Public Class frmSQLEditor Public Property LoadClipboardPlaceholders As Boolean = False Public Property PlaceholdersManual As List(Of String) + Public Property PlaceholdersManualPrefix As String + Public Property PlaceholdersAutomatic As List(Of String) + Public Property PlaceholdersAutomaticPrefix As String + + Public Property PlaceholdersWindream As List(Of String) Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer) ' Dieser Aufruf ist für den Designer erforderlich. @@ -44,6 +49,10 @@ Public Class frmSQLEditor PlaceholdersManual = New List(Of String) End If + If PlaceholdersWindream Is Nothing Then + PlaceholdersWindream = New List(Of String) + End If + If SQLCommand <> String.Empty Then txtSQLCommand.Document.Text = SQLCommand End If @@ -90,19 +99,24 @@ Public Class frmSQLEditor Private Function LoadPlaceholders() As List(Of GalleryItemGroup) Dim oPlaceholders = New List(Of GalleryItemGroup)() From { Placeholders.GetInternalPlaceholders(), - Placeholders.GetUserGroup() + Placeholders.GetUserPlaceholders() } - Dim oAutomaticAttributes = Placeholders.GetAutomaticPlaceholders(PlaceholdersAutomatic) + Dim oAutomaticAttributes = Placeholders.GetAutomaticPlaceholders(PlaceholdersAutomatic, PlaceholdersAutomaticPrefix) If oAutomaticAttributes IsNot Nothing Then oPlaceholders.Add(oAutomaticAttributes) End If - Dim oManualPlaceholders = Placeholders.GetManualPlaceholders(PlaceholdersManual) + Dim oManualPlaceholders = Placeholders.GetManualPlaceholders(PlaceholdersManual, PlaceholdersManualPrefix) If oManualPlaceholders IsNot Nothing Then oPlaceholders.Add(oManualPlaceholders) End If + Dim oWindreamPlaceholders = Placeholders.GetWindreamPlaceholders(PlaceholdersWindream) + If oWindreamPlaceholders IsNot Nothing Then + oPlaceholders.Add(oWindreamPlaceholders) + End If + If LoadClipboardPlaceholders Then oPlaceholders.Add(Placeholders.GetClipboardPlaceholder) End If @@ -243,6 +257,9 @@ Public Class frmSQLEditor Private Sub chkShowPlaceholders_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkShowPlaceholders.CheckedChanged SplitContainerControl1.Collapsed = Not chkShowPlaceholders.Checked End Sub + Private Sub SplitContainerControl1_SplitGroupPanelCollapsed(sender As Object, e As DevExpress.XtraEditors.SplitGroupPanelCollapsedEventArgs) Handles SplitContainerControl1.SplitGroupPanelCollapsed + chkShowPlaceholders.Checked = Not e.Collapsed + End Sub Private Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick SQLCommand = txtSQLCommand.Text diff --git a/DDMonorepo.sln b/DDMonorepo.sln index e0cb67bf..0c34db18 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -124,8 +124,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.File.Test", "Modules.E EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GlobalIndexer", "GUIs.GlobalIndexer\GlobalIndexer.vbproj", "{40384B94-1F94-4249-9A5A-D02E0B346738}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SQLEditor", "Controls.SQLEditor\SQLEditor.vbproj", "{3E7BC8A9-91EF-49B8-8110-2C01F664C24A}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SQLConfig", "SQLConfig\SQLConfig.vbproj", "{65EFB268-C0E0-40C1-8981-9F70DEE5C74A}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Monitor", "GUIs.Monitor\Monitor.vbproj", "{E24E8D40-0361-4C07-8FAE-3621DE316E70}" @@ -144,8 +142,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIService.Tests", "EDMISe EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Base", "Modules.Base\Base\Base.vbproj", "{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MessageBoxEx", "MessageBoxEx\MessageBoxEx.vbproj", "{EF29F400-BE45-4283-9D18-CA7ACD9ACCC9}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterReader", "FilterReader\FilterReader.csproj", "{10C922FB-DD8D-4E0B-A50C-30EE658FBDDC}" EndProject Global @@ -350,10 +346,6 @@ Global {40384B94-1F94-4249-9A5A-D02E0B346738}.Debug|Any CPU.Build.0 = Debug|Any CPU {40384B94-1F94-4249-9A5A-D02E0B346738}.Release|Any CPU.ActiveCfg = Release|Any CPU {40384B94-1F94-4249-9A5A-D02E0B346738}.Release|Any CPU.Build.0 = Release|Any CPU - {3E7BC8A9-91EF-49B8-8110-2C01F664C24A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E7BC8A9-91EF-49B8-8110-2C01F664C24A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E7BC8A9-91EF-49B8-8110-2C01F664C24A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E7BC8A9-91EF-49B8-8110-2C01F664C24A}.Release|Any CPU.Build.0 = Release|Any CPU {65EFB268-C0E0-40C1-8981-9F70DEE5C74A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {65EFB268-C0E0-40C1-8981-9F70DEE5C74A}.Debug|Any CPU.Build.0 = Debug|Any CPU {65EFB268-C0E0-40C1-8981-9F70DEE5C74A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -390,10 +382,6 @@ Global {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.ActiveCfg = Release|Any CPU {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.Build.0 = Release|Any CPU - {EF29F400-BE45-4283-9D18-CA7ACD9ACCC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF29F400-BE45-4283-9D18-CA7ACD9ACCC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF29F400-BE45-4283-9D18-CA7ACD9ACCC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF29F400-BE45-4283-9D18-CA7ACD9ACCC9}.Release|Any CPU.Build.0 = Release|Any CPU {10C922FB-DD8D-4E0B-A50C-30EE658FBDDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {10C922FB-DD8D-4E0B-A50C-30EE658FBDDC}.Debug|Any CPU.Build.0 = Debug|Any CPU {10C922FB-DD8D-4E0B-A50C-30EE658FBDDC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -452,7 +440,6 @@ Global {1477032D-7A02-4C5F-B026-A7117DA4BC6B} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {16857A4E-2609-47E6-9C35-7669D64DD040} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {40384B94-1F94-4249-9A5A-D02E0B346738} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} - {3E7BC8A9-91EF-49B8-8110-2C01F664C24A} = {F98C0329-C004-417F-B2AB-7466E88D8220} {65EFB268-C0E0-40C1-8981-9F70DEE5C74A} = {F98C0329-C004-417F-B2AB-7466E88D8220} {E24E8D40-0361-4C07-8FAE-3621DE316E70} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} {9D4AC920-C78E-41C3-994E-91690FF79380} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} @@ -462,7 +449,6 @@ Global {C9827B8D-9EF9-411A-A6BF-4807794F8C8F} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {E3DA65CA-964D-4896-991A-B5426884E215} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} - {EF29F400-BE45-4283-9D18-CA7ACD9ACCC9} = {F98C0329-C004-417F-B2AB-7466E88D8220} {10C922FB-DD8D-4E0B-A50C-30EE658FBDDC} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index ae901f75..b194a6de 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -47,8 +47,10 @@ + + @@ -57,6 +59,10 @@ + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraRichEdit.v21.2.dll + D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll @@ -133,6 +139,18 @@ Form + + frmSQLEditor.vb + + + Form + + + frmSQLResult.vb + + + Form + frmWorkflow_Adhoc_start.vb @@ -142,6 +160,12 @@ + + MsgBoxEx.vb + + + Form + True @@ -166,6 +190,9 @@ Form + + + @@ -181,9 +208,18 @@ frmDocumentResultList.vb Designer + + frmSQLEditor.vb + + + frmSQLResult.vb + frmWorkflow_Adhoc_start.vb + + MsgBoxEx.vb + VbMyResourcesResXFileCodeGenerator @@ -218,10 +254,6 @@ {3DCD6D1A-C830-4241-B7E4-27430E7EA483} LookupControl - - {ef29f400-be45-4283-9d18-ca7acd9accc9} - MessageBoxEx - {6ea0c51f-c2b1-4462-8198-3de0b32b74f8} Base @@ -250,6 +282,10 @@ {903B2D7D-3B80-4BE9-8713-7447B704E1B0} Logging + + {7c3b0c7e-59fe-4e1a-a655-27ae119f9444} + Patterns + {81cac44f-3711-4c8f-ae98-e02a7448782a} ZooFlow @@ -398,5 +434,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/DocumentResultList/Layout.vb b/GUIs.Common/DocumentResultList/Layout.vb index 86adb47f..0919fdf3 100644 --- a/GUIs.Common/DocumentResultList/Layout.vb +++ b/GUIs.Common/DocumentResultList/Layout.vb @@ -138,6 +138,15 @@ Namespace DocumentResultList End Sub #End Region +#Region "Resetting Layout" + Public Sub DockManager_ResetLayout(pDockManager As DockManager) + Dim oFile = GetDockmanager_LayoutName() + If IO.File.Exists(oFile) Then + IO.File.Delete(oFile) + End If + End Sub +#End Region + Public Sub SetGroupPanelVisible(pVisible As Boolean) For Each oView In GridViews oView.OptionsView.ShowGroupPanel = pVisible diff --git a/MessageBoxEx/MsgBoxEx.Designer.vb b/GUIs.Common/MsgBoxEx.Designer.vb similarity index 100% rename from MessageBoxEx/MsgBoxEx.Designer.vb rename to GUIs.Common/MsgBoxEx.Designer.vb diff --git a/MessageBoxEx/MsgBoxEx.resx b/GUIs.Common/MsgBoxEx.resx similarity index 100% rename from MessageBoxEx/MsgBoxEx.resx rename to GUIs.Common/MsgBoxEx.resx diff --git a/MessageBoxEx/MsgBoxEx.vb b/GUIs.Common/MsgBoxEx.vb similarity index 98% rename from MessageBoxEx/MsgBoxEx.vb rename to GUIs.Common/MsgBoxEx.vb index 65457406..84e81a0b 100644 --- a/MessageBoxEx/MsgBoxEx.vb +++ b/GUIs.Common/MsgBoxEx.vb @@ -1,4 +1,7 @@ -Public Class MsgBoxEx +Imports System.Drawing +Imports System.Windows.Forms + +Public Class MsgBoxEx Public Sub New(message As String, title As String) Me.New(message, title, MessageBoxIcon.None) End Sub diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb index 61893c01..97e9ecc2 100644 --- a/GUIs.Common/My Project/AssemblyInfo.vb +++ b/GUIs.Common/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/GUIs.Common/My Project/Resources.Designer.vb b/GUIs.Common/My Project/Resources.Designer.vb index 876316be..4d4b2c7c 100644 --- a/GUIs.Common/My Project/Resources.Designer.vb +++ b/GUIs.Common/My Project/Resources.Designer.vb @@ -90,6 +90,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_database() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_database", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -100,6 +110,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_user() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_user", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -110,6 +130,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property autoarrange() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("autoarrange", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property bo_contract() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("bo_contract", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -150,6 +190,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property clearall() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("clearall", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -160,6 +210,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property clearpivottable1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("clearpivottable1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -230,6 +290,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property electronics_desktopmac() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("electronics_desktopmac", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -270,6 +340,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property handtool() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("handtool", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -370,6 +450,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property save2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("save2", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -380,6 +470,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property selectdatamember() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("selectdatamember", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -420,6 +520,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property togglefieldcodes() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("togglefieldcodes", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -430,6 +540,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property updatedataextract() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("updatedataextract", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/GUIs.Common/My Project/Resources.resx b/GUIs.Common/My Project/Resources.resx index cff44005..2c33fd80 100644 --- a/GUIs.Common/My Project/Resources.resx +++ b/GUIs.Common/My Project/Resources.resx @@ -121,12 +121,12 @@ ..\Resources\bo_transition.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\groupheader.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\security_unlock.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\electronics_desktopmac1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\zoom_less.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -145,8 +145,8 @@ ..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\grid.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -160,11 +160,14 @@ ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\autoarrange1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\clearpivottable1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\copy.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -172,8 +175,11 @@ ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\togglefieldcodes1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\updatedataextract4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -184,26 +190,38 @@ ..\Resources\title.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\singlepageview1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\txt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\groupheader.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_contract1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\clearall1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\categorize.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_database3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -211,6 +229,9 @@ ..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_user1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -223,6 +244,9 @@ ..\Resources\png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\private.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -232,13 +256,25 @@ ..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\handtool1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\business_world.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\selectdatamember.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + \ No newline at end of file diff --git a/GUIs.Common/My Project/licenses.licx b/GUIs.Common/My Project/licenses.licx index e22582e6..fd9da379 100644 --- a/GUIs.Common/My Project/licenses.licx +++ b/GUIs.Common/My Project/licenses.licx @@ -1,13 +1,14 @@ -DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Common/Resources/actions_check.svg b/GUIs.Common/Resources/actions_check.svg new file mode 100644 index 00000000..35c68028 --- /dev/null +++ b/GUIs.Common/Resources/actions_check.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/actions_checkcircled.svg b/GUIs.Common/Resources/actions_checkcircled.svg new file mode 100644 index 00000000..b1b6aa99 --- /dev/null +++ b/GUIs.Common/Resources/actions_checkcircled.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/actions_database.svg b/GUIs.Common/Resources/actions_database.svg new file mode 100644 index 00000000..af7a23c1 --- /dev/null +++ b/GUIs.Common/Resources/actions_database.svg @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/actions_database1.svg b/GUIs.Common/Resources/actions_database1.svg new file mode 100644 index 00000000..af7a23c1 --- /dev/null +++ b/GUIs.Common/Resources/actions_database1.svg @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/actions_database2.svg b/GUIs.Common/Resources/actions_database2.svg new file mode 100644 index 00000000..af7a23c1 --- /dev/null +++ b/GUIs.Common/Resources/actions_database2.svg @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/actions_database3.svg b/GUIs.Common/Resources/actions_database3.svg new file mode 100644 index 00000000..af7a23c1 --- /dev/null +++ b/GUIs.Common/Resources/actions_database3.svg @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/actions_user.svg b/GUIs.Common/Resources/actions_user.svg new file mode 100644 index 00000000..8c183040 --- /dev/null +++ b/GUIs.Common/Resources/actions_user.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/actions_user1.svg b/GUIs.Common/Resources/actions_user1.svg new file mode 100644 index 00000000..8c183040 --- /dev/null +++ b/GUIs.Common/Resources/actions_user1.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/autoarrange.svg b/GUIs.Common/Resources/autoarrange.svg new file mode 100644 index 00000000..a736935b --- /dev/null +++ b/GUIs.Common/Resources/autoarrange.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/autoarrange1.svg b/GUIs.Common/Resources/autoarrange1.svg new file mode 100644 index 00000000..a736935b --- /dev/null +++ b/GUIs.Common/Resources/autoarrange1.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/bo_contract.svg b/GUIs.Common/Resources/bo_contract.svg new file mode 100644 index 00000000..1d31dea8 --- /dev/null +++ b/GUIs.Common/Resources/bo_contract.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/bo_contract1.svg b/GUIs.Common/Resources/bo_contract1.svg new file mode 100644 index 00000000..1d31dea8 --- /dev/null +++ b/GUIs.Common/Resources/bo_contract1.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/check.svg b/GUIs.Common/Resources/check.svg new file mode 100644 index 00000000..bc91b5a7 --- /dev/null +++ b/GUIs.Common/Resources/check.svg @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/clearall.svg b/GUIs.Common/Resources/clearall.svg new file mode 100644 index 00000000..0ebb0456 --- /dev/null +++ b/GUIs.Common/Resources/clearall.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/clearall1.svg b/GUIs.Common/Resources/clearall1.svg new file mode 100644 index 00000000..0ebb0456 --- /dev/null +++ b/GUIs.Common/Resources/clearall1.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/clearpivottable1.svg b/GUIs.Common/Resources/clearpivottable1.svg new file mode 100644 index 00000000..0e4e7bb2 --- /dev/null +++ b/GUIs.Common/Resources/clearpivottable1.svg @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/cleartablestyle.svg b/GUIs.Common/Resources/cleartablestyle.svg new file mode 100644 index 00000000..f5becce1 --- /dev/null +++ b/GUIs.Common/Resources/cleartablestyle.svg @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/editdatasource.svg b/GUIs.Common/Resources/editdatasource.svg new file mode 100644 index 00000000..6e46621c --- /dev/null +++ b/GUIs.Common/Resources/editdatasource.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/editdatasource1.svg b/GUIs.Common/Resources/editdatasource1.svg new file mode 100644 index 00000000..6e46621c --- /dev/null +++ b/GUIs.Common/Resources/editdatasource1.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/editdatasource2.svg b/GUIs.Common/Resources/editdatasource2.svg new file mode 100644 index 00000000..6e46621c --- /dev/null +++ b/GUIs.Common/Resources/editdatasource2.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/electronics_desktopmac.svg b/GUIs.Common/Resources/electronics_desktopmac.svg new file mode 100644 index 00000000..919cfe4d --- /dev/null +++ b/GUIs.Common/Resources/electronics_desktopmac.svg @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/electronics_desktopmac1.svg b/GUIs.Common/Resources/electronics_desktopmac1.svg new file mode 100644 index 00000000..919cfe4d --- /dev/null +++ b/GUIs.Common/Resources/electronics_desktopmac1.svg @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/handtool.svg b/GUIs.Common/Resources/handtool.svg new file mode 100644 index 00000000..1718d3f1 --- /dev/null +++ b/GUIs.Common/Resources/handtool.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/handtool1.svg b/GUIs.Common/Resources/handtool1.svg new file mode 100644 index 00000000..1718d3f1 --- /dev/null +++ b/GUIs.Common/Resources/handtool1.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/highimportance.svg b/GUIs.Common/Resources/highimportance.svg new file mode 100644 index 00000000..7f7764cf --- /dev/null +++ b/GUIs.Common/Resources/highimportance.svg @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/removegroupheader.svg b/GUIs.Common/Resources/removegroupheader.svg new file mode 100644 index 00000000..beb2c741 --- /dev/null +++ b/GUIs.Common/Resources/removegroupheader.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/save2.svg b/GUIs.Common/Resources/save2.svg new file mode 100644 index 00000000..b09d6ee8 --- /dev/null +++ b/GUIs.Common/Resources/save2.svg @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/selectdatamember.svg b/GUIs.Common/Resources/selectdatamember.svg new file mode 100644 index 00000000..126ea856 --- /dev/null +++ b/GUIs.Common/Resources/selectdatamember.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/togglefieldcodes.svg b/GUIs.Common/Resources/togglefieldcodes.svg new file mode 100644 index 00000000..31917a1e --- /dev/null +++ b/GUIs.Common/Resources/togglefieldcodes.svg @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/togglefieldcodes1.svg b/GUIs.Common/Resources/togglefieldcodes1.svg new file mode 100644 index 00000000..31917a1e --- /dev/null +++ b/GUIs.Common/Resources/togglefieldcodes1.svg @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/updatedataextract.svg b/GUIs.Common/Resources/updatedataextract.svg new file mode 100644 index 00000000..e7dda038 --- /dev/null +++ b/GUIs.Common/Resources/updatedataextract.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/updatedataextract1.svg b/GUIs.Common/Resources/updatedataextract1.svg new file mode 100644 index 00000000..e7dda038 --- /dev/null +++ b/GUIs.Common/Resources/updatedataextract1.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/updatedataextract2.svg b/GUIs.Common/Resources/updatedataextract2.svg new file mode 100644 index 00000000..e7dda038 --- /dev/null +++ b/GUIs.Common/Resources/updatedataextract2.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/updatedataextract3.svg b/GUIs.Common/Resources/updatedataextract3.svg new file mode 100644 index 00000000..e7dda038 --- /dev/null +++ b/GUIs.Common/Resources/updatedataextract3.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/updatedataextract4.svg b/GUIs.Common/Resources/updatedataextract4.svg new file mode 100644 index 00000000..e7dda038 --- /dev/null +++ b/GUIs.Common/Resources/updatedataextract4.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/SQLEditor/Placeholder.vb b/GUIs.Common/SQLEditor/Placeholder.vb new file mode 100644 index 00000000..17ee398f --- /dev/null +++ b/GUIs.Common/SQLEditor/Placeholder.vb @@ -0,0 +1,48 @@ +Imports DigitalData.Modules.Patterns + +Namespace SQLEditor + Public Class Placeholder + ''' + ''' The internal Category of the placeholder, ie. the INT Part of {#INT#USERNAME} + ''' + Public Property [Module] As String + + ''' + ''' The internal Name of the placeholder, ie. the USERNAME Part of {#INT#USERNAME} + ''' + Public Property Name As String + + ''' + ''' The Value that this palceholder is replaced by, user entry. + ''' + ''' + Public Property Value As String + + ''' + ''' The internal pattern object + ''' + ''' + Public Property Pattern As Pattern + + Public Title As String + Public Description As String + + Public Enum PlaceholderType + FileFlow + End Enum + + Public Sub New(pTitle As String, pDescription As String, pModule As String, pValue As String) + Title = pTitle + Description = pDescription + + Name = pValue + [Module] = pModule + End Sub + + Public Overrides Function Equals(obj As Object) As Boolean + Return DirectCast(obj, Placeholder).Module = [Module] And + DirectCast(obj, Placeholder).Name = Name + End Function + End Class + +End Namespace \ No newline at end of file diff --git a/GUIs.Common/SQLEditor/Placeholders.vb b/GUIs.Common/SQLEditor/Placeholders.vb new file mode 100644 index 00000000..b5db4b83 --- /dev/null +++ b/GUIs.Common/SQLEditor/Placeholders.vb @@ -0,0 +1,137 @@ +Imports DevExpress.Utils.Svg +Imports DevExpress.XtraBars.Ribbon + +Namespace SQLEditor + Public Class Placeholders + Public Const AUTO_INDEX_ZOOFLOW = "ATTR_M" + Public Const MAN_INDEX_ZOOFLOW = "ATTR_A" + + Public Function GetInternalPlaceholders() As GalleryItemGroup + Dim oModule = "INT" + Dim oImage = My.Resources.electronics_desktopmac + + Dim oItems As New List(Of GalleryItem)() From { + GetGalleryItem(New Placeholder("USERNAME", "Benutzername", oModule, "USERNAME"), oImage), + GetGalleryItem(New Placeholder("MACHINE", "Aktuelles Datum", oModule, "MACHINE"), oImage), + GetGalleryItem(New Placeholder("DOMAIN", "Email-Adresse", oModule, "DOMAIN"), oImage), + GetGalleryItem(New Placeholder("DATE", "Vorname", oModule, "DATE"), oImage) + } + Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Intern"} + + oGroup1.Items.AddRange(oItems.ToArray) + Return oGroup1 + End Function + + Public Function GetClipboardPlaceholder() As GalleryItemGroup + Dim oModule = "CLIP" + Dim oImage = My.Resources.electronics_desktopmac + + Dim oItems As New List(Of GalleryItem)() From { + GetGalleryItem(New Placeholder("BOARD", "Zwischenablage", oModule, "BOARD"), oImage) + } + Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Zwischenablage"} + + oGroup1.Items.AddRange(oItems.ToArray) + Return oGroup1 + End Function + + Friend Function GetWindreamPlaceholders(pPlaceholders As List(Of String)) As GalleryItemGroup + Dim oImage = My.Resources.bo_contract + Dim oItems As New List(Of GalleryItem)() + + If pPlaceholders.Count > 0 Then + For Each oWindreamPlaceholder In pPlaceholders + Dim oPlaceholder = New Placeholder(oWindreamPlaceholder, "Windream Index", "WMI", oWindreamPlaceholder) + oItems.Add(GetGalleryItem(oPlaceholder, oImage)) + Next + Else Return Nothing + End If + + Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Windream Indizies"} + oGroup1.Items.AddRange(oItems.ToArray) + Return oGroup1 + End Function + + Public Function GetManualPlaceholders(pPlaceholders As Dictionary(Of String, String), pPrefix As String, pTitle As String) As GalleryItemGroup + Dim oImage As SvgImage = My.Resources.handtool + Dim oItems As New List(Of GalleryItem)() + Dim oPrefix As String = pPrefix + + If oPrefix Is Nothing Then + oPrefix = AUTO_INDEX_ZOOFLOW + End If + + If pPlaceholders.Count > 0 Then + For Each oManualPlaceholder In pPlaceholders + Dim oPlaceholder = New Placeholder(oManualPlaceholder.Key, pTitle, oPrefix, oManualPlaceholder.Value) + oItems.Add(GetGalleryItem(oPlaceholder, oImage)) + Next + Else Return Nothing + End If + + Dim oGroup1 = New GalleryItemGroup() With {.Caption = pTitle} + oGroup1.Items.AddRange(oItems.ToArray) + Return oGroup1 + End Function + + Public Function GetAutomaticPlaceholders(pPlaceholders As Dictionary(Of String, String), pPrefix As String, pTitle As String) As GalleryItemGroup + Dim oImage As SvgImage = My.Resources.autoarrange + Dim oItems As New List(Of GalleryItem)() + Dim oPrefix As String = pPrefix + + If oPrefix Is Nothing Then + oPrefix = AUTO_INDEX_ZOOFLOW + End If + + If pPlaceholders.Count > 0 Then + For Each oManualPlaceholder In pPlaceholders + Dim oPlaceholder = New Placeholder(oManualPlaceholder.Key, pTitle, oPrefix, oManualPlaceholder.Value) + oItems.Add(GetGalleryItem(oPlaceholder, oImage)) + Next + + Else Return Nothing + End If + + Dim oGroup1 = New GalleryItemGroup() With {.Caption = pTitle} + + oGroup1.Items.AddRange(oItems.ToArray) + Return oGroup1 + End Function + + Public Function GetUserPlaceholders() As GalleryItemGroup + Dim oModule = "USER" + Dim oImage = My.Resources.actions_user + + Dim oItems As New List(Of GalleryItem)() From { + GetGalleryItem(New Placeholder("PRENAME", "Vorname", oModule, "PRENAME"), oImage), + GetGalleryItem(New Placeholder("SURNAME", "Nachname", oModule, "SURNAME"), oImage), + GetGalleryItem(New Placeholder("EMAIL", "Email-Adresse", oModule, "EMAIL"), oImage), + GetGalleryItem(New Placeholder("USER_ID", "Benutzer-ID", oModule, "USER_ID"), oImage), + GetGalleryItem(New Placeholder("PROFILE_ID", "Profil-ID", oModule, "PROFILE_ID"), oImage), + GetGalleryItem(New Placeholder("PROFILE_TITLE", "Profil-Name", oModule, "PROFILE_TITLE"), oImage), + GetGalleryItem(New Placeholder("LANGUAGE", "Sprache", oModule, "LANGUAGE"), oImage) + } + Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Benutzer"} + + oGroup1.Items.AddRange(oItems.ToArray) + Return oGroup1 + End Function + + Private Function GetGalleryItem(pPlaceholder As Placeholder) As GalleryItem + Return New GalleryItem(Nothing, pPlaceholder.Title, pPlaceholder.Description) With { + .Tag = pPlaceholder + } + End Function + + Private Function GetGalleryItem(pPlaceholder As Placeholder, pImage As SvgImage) As GalleryItem + Dim oItem = New GalleryItem(Nothing, pPlaceholder.Title, pPlaceholder.Description) With { + .Tag = pPlaceholder + } + oItem.ImageOptions.SvgImage = pImage + + Return oItem + End Function + + + End Class +End Namespace diff --git a/GUIs.Common/SQLEditor/SQLSyntaxHighlightService.vb b/GUIs.Common/SQLEditor/SQLSyntaxHighlightService.vb new file mode 100644 index 00000000..5fd28854 --- /dev/null +++ b/GUIs.Common/SQLEditor/SQLSyntaxHighlightService.vb @@ -0,0 +1,165 @@ +Imports System.Collections.Generic +Imports System.Drawing +Imports System.Windows.Forms +Imports DevExpress.Office.Utils +Imports DevExpress.XtraRichEdit.API.Native +Imports DevExpress.XtraRichEdit.Services +Imports System.Linq +Imports System.Text.RegularExpressions + +Namespace SQLEditor + Public Class SQLSyntaxHighlightService + Implements ISyntaxHighlightService + + Private ReadOnly document As Document + + Private _keywords As Regex + Private _quotedString As New Regex("'([^']|'')*'") + Private _commentedString As New Regex("(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/)") + Private _placeholderString As New Regex("{#(\w+)#([\:\.\w\s_/-]+)}") + + Private ReadOnly keywords As New List(Of String) From { + "INSERT", + "SELECT", + "CREATE", + "TABLE", + "USE", + "IDENTITY", + "JOIN", + "ON", + "OFF", + "NOT", + "NULL", + "WITH", + "SET", + "GO", + "DECLARE", + "EXECUTE", + "NVARCHAR", + "FROM", + "INTO", + "VALUES", + "WHERE", + "AND" + } + + Public Sub New(ByVal document As Document) + Me.document = document + + Me._keywords = New Regex("\b(" & String.Join("|", keywords.Select(Function(w) Regex.Escape(w))) & ")\b") + End Sub + Public Sub ForceExecute() Implements ISyntaxHighlightService.ForceExecute + Execute() + End Sub + Public Sub Execute() Implements ISyntaxHighlightService.Execute + Dim tSqltokens As List(Of SyntaxHighlightToken) = ParseTokens() + document.ApplySyntaxHighlight(tSqltokens) + End Sub + + Private Function ParseTokens() As List(Of SyntaxHighlightToken) + Dim tokens As New List(Of SyntaxHighlightToken)() + Dim ranges() As DocumentRange = Nothing + + ' search for quoted strings + ranges = TryCast(document.FindAll(_quotedString).GetAsFrozen(), DocumentRange()) + For i As Integer = 0 To ranges.Length - 1 + tokens.Add(CreateToken(ranges(i).Start.ToInt(), ranges(i).End.ToInt(), Color.Red)) + Next i + + 'Extract all keywords + ranges = TryCast(document.FindAll(_keywords).GetAsFrozen(), DocumentRange()) + For j As Integer = 0 To ranges.Length - 1 + If Not IsRangeInTokens(ranges(j), tokens) Then + tokens.Add(CreateToken(ranges(j).Start.ToInt(), ranges(j).End.ToInt(), Color.Blue)) + End If + Next j + + 'Find all placeholders + ranges = TryCast(document.FindAll(_placeholderString).GetAsFrozen(), DocumentRange()) + For j As Integer = 0 To ranges.Length - 1 + If Not IsRangeInTokens(ranges(j), tokens) Then + tokens.Add(CreateToken(ranges(j).Start.ToInt(), ranges(j).End.ToInt(), Color.DarkTurquoise)) + End If + Next j + + 'Find all comments + ranges = TryCast(document.FindAll(_commentedString).GetAsFrozen(), DocumentRange()) + For j As Integer = 0 To ranges.Length - 1 + If Not IsRangeInTokens(ranges(j), tokens) Then + tokens.Add(CreateToken(ranges(j).Start.ToInt(), ranges(j).End.ToInt(), Color.Green)) + End If + Next j + + ' order tokens by their start position + tokens.Sort(New SyntaxHighlightTokenComparer()) + + ' fill in gaps in document coverage + tokens = CombineWithPlainTextTokens(tokens) + Return tokens + End Function + + 'Parse the remaining text into tokens: + Private Function CombineWithPlainTextTokens(ByVal tokens As List(Of SyntaxHighlightToken)) As List(Of SyntaxHighlightToken) + Dim result As New List(Of SyntaxHighlightToken)(tokens.Count * 2 + 1) + Dim documentStart As Integer = Me.document.Range.Start.ToInt() + Dim documentEnd As Integer = Me.document.Range.End.ToInt() + If tokens.Count = 0 Then + result.Add(CreateToken(documentStart, documentEnd, Color.Black)) + Else + Dim firstToken As SyntaxHighlightToken = tokens(0) + If documentStart < firstToken.Start Then + result.Add(CreateToken(documentStart, firstToken.Start, Color.Black)) + End If + result.Add(firstToken) + For i As Integer = 1 To tokens.Count - 1 + Dim token As SyntaxHighlightToken = tokens(i) + Dim prevToken As SyntaxHighlightToken = tokens(i - 1) + If prevToken.End <> token.Start Then + result.Add(CreateToken(prevToken.End, token.Start, Color.Black)) + End If + result.Add(token) + Next i + Dim lastToken As SyntaxHighlightToken = tokens(tokens.Count - 1) + If documentEnd > lastToken.End Then + result.Add(CreateToken(lastToken.End, documentEnd, Color.Black)) + End If + End If + Return result + End Function + + 'Create a token from the retrieved range and specify its forecolor + Private Function CreateToken(ByVal start As Integer, ByVal [end] As Integer, ByVal foreColor As Color) As SyntaxHighlightToken + Dim properties As New SyntaxHighlightProperties() + properties.ForeColor = foreColor + Return New SyntaxHighlightToken(start, [end] - start, properties) + End Function + + 'Check whether tokens intersect each other + Private Function IsRangeInTokens(ByVal range As DocumentRange, ByVal tokens As List(Of SyntaxHighlightToken)) As Boolean + Return tokens.Any(Function(t) IsIntersect(range, t)) + End Function + Private Function IsIntersect(ByVal range As DocumentRange, ByVal token As SyntaxHighlightToken) As Boolean + Dim start As Integer = range.Start.ToInt() + If start >= token.Start AndAlso start < token.End Then + Return True + End If + Dim [end] As Integer = range.End.ToInt() - 1 + If [end] >= token.Start AndAlso [end] < token.End Then + Return True + End If + If start < token.Start AndAlso [end] >= token.End Then + Return True + End If + Return False + End Function + End Class + + 'Compare token's initial positions to sort them + Public Class SyntaxHighlightTokenComparer + Implements IComparer(Of SyntaxHighlightToken) + + Public Function Compare(ByVal x As SyntaxHighlightToken, ByVal y As SyntaxHighlightToken) As Integer Implements IComparer(Of SyntaxHighlightToken).Compare + Return x.Start - y.Start + End Function + End Class +End Namespace \ No newline at end of file diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb index a47735c9..fd15f654 100644 --- a/GUIs.Common/frmDocumentResultList.vb +++ b/GUIs.Common/frmDocumentResultList.vb @@ -854,19 +854,7 @@ Public Class frmDocumentResultList End Try End Sub - Private Sub BarButtonResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonResetGridLayout.ItemClick - If Not IsNothing(_ActiveGrid) Then - Try - Dim oFile = LayoutManager.GetGrid_LayoutName(_ActiveGrid.MainView) - If IO.File.Exists(oFile) Then - IO.File.Delete(oFile) - End If - LoadGridDataAndLayout() - Catch ex As Exception - Logger.Error(ex) - End Try - End If - End Sub + Private Function TestFileExists(pTitle As String) As Boolean If _CurrentDocument Is Nothing Then @@ -1025,6 +1013,29 @@ Public Class frmDocumentResultList End Sub #End Region #Region "Layout" + + Private Sub BarButtonResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonResetGridLayout.ItemClick + If Not IsNothing(_ActiveGrid) Then + Try + Dim oFile = LayoutManager.GetGrid_LayoutName(_ActiveGrid.MainView) + If IO.File.Exists(oFile) Then + IO.File.Delete(oFile) + End If + LoadGridDataAndLayout() + Catch ex As Exception + Logger.Error(ex) + End Try + End If + End Sub + + Private Sub BarButtonItem6_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonResetWindowLayout.ItemClick + Try + LayoutManager.DockManager_ResetLayout(DockManager1) + Catch ex As Exception + Logger.Error(ex) + End Try + End Sub + Private Sub SplitContainerControl1_SplitterPositionChanged(sender As Object, e As EventArgs) Handles SplitContainerControl1.SplitterPositionChanged If IsLoading = False Then Config1.Config.SplitContainer1Distance = SplitContainerControl1.SplitterPosition @@ -1057,16 +1068,7 @@ Public Class frmDocumentResultList RaiseEvent NeedsRefresh(Me, Params.ProfileGuid) End Sub - Private Sub BarButtonItem6_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonResetWindowLayout.ItemClick - Try - Dim oFile = LayoutManager.GetDockmanager_LayoutName() - If File.Exists(oFile) Then - File.Delete(oFile) - End If - Catch ex As Exception - Logger.Error(ex) - End Try - End Sub + Private Sub chkGridShowGrouping_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles chkGridShowGrouping.CheckedChanged diff --git a/GUIs.Common/frmSQLEditor.Designer.vb b/GUIs.Common/frmSQLEditor.Designer.vb new file mode 100644 index 00000000..56858458 --- /dev/null +++ b/GUIs.Common/frmSQLEditor.Designer.vb @@ -0,0 +1,338 @@ + +Partial Class frmSQLEditor + Inherits DevExpress.XtraBars.Ribbon.RibbonForm + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.GalleryPlaceholders = New DevExpress.XtraBars.RibbonGalleryBarItem() + Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) + Me.btnEditConnections = New DevExpress.XtraBars.BarButtonItem() + Me.btnSave = New DevExpress.XtraBars.BarButtonItem() + Me.btnExecuteSQL = New DevExpress.XtraBars.BarButtonItem() + Me.GalleryConnection = New DevExpress.XtraBars.RibbonGalleryBarItem() + Me.chkClearPlaceholders = New DevExpress.XtraBars.BarCheckItem() + Me.btnClearPlaceholders = New DevExpress.XtraBars.BarButtonItem() + Me.chkShowPlaceholders = New DevExpress.XtraBars.BarCheckItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.txtSQLCommand = New DevExpress.XtraRichEdit.RichEditControl() + Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.GridPlaceholders = New DevExpress.XtraGrid.GridControl() + Me.ViewPlaceholders = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colPattern = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colValue = New DevExpress.XtraGrid.Columns.GridColumn() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel1.SuspendLayout() + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel2.SuspendLayout() + Me.SplitContainerControl1.SuspendLayout() + CType(Me.GridPlaceholders, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ViewPlaceholders, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'RibbonControl1 + ' + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.GalleryPlaceholders, Me.btnEditConnections, Me.btnSave, Me.btnExecuteSQL, Me.GalleryConnection, Me.chkClearPlaceholders, Me.btnClearPlaceholders, Me.chkShowPlaceholders, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 19 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowToolbarCustomizeItem = False + Me.RibbonControl1.Size = New System.Drawing.Size(1056, 158) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False + ' + 'GalleryPlaceholders + ' + Me.GalleryPlaceholders.Caption = "RibbonGalleryBarItem1" + ' + ' + ' + Me.GalleryPlaceholders.Gallery.ColumnCount = 4 + Me.GalleryPlaceholders.Gallery.Images = Me.SvgImageCollection1 + Me.GalleryPlaceholders.Gallery.ShowGroupCaption = True + Me.GalleryPlaceholders.Gallery.ShowItemText = True + Me.GalleryPlaceholders.Id = 1 + Me.GalleryPlaceholders.Name = "GalleryPlaceholders" + ' + 'SvgImageCollection1 + ' + Me.SvgImageCollection1.Add("bo_list", "image://svgimages/business objects/bo_list.svg") + ' + 'btnEditConnections + ' + Me.btnEditConnections.Caption = "Verbindungen" + Me.btnEditConnections.Id = 2 + Me.btnEditConnections.Name = "btnEditConnections" + ' + 'btnSave + ' + Me.btnSave.Caption = "Speichern und Schließen" + Me.btnSave.Id = 3 + Me.btnSave.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.save2 + Me.btnSave.Name = "btnSave" + ' + 'btnExecuteSQL + ' + Me.btnExecuteSQL.Caption = "SQL Ausführen (F5)" + Me.btnExecuteSQL.Id = 4 + Me.btnExecuteSQL.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.updatedataextract + Me.btnExecuteSQL.Name = "btnExecuteSQL" + ' + 'GalleryConnection + ' + Me.GalleryConnection.Caption = "RibbonGalleryBarItem2" + ' + ' + ' + Me.GalleryConnection.Gallery.CheckDrawMode = DevExpress.XtraBars.Ribbon.Gallery.CheckDrawMode.ImageAndText + Me.GalleryConnection.Gallery.ColumnCount = 4 + Me.GalleryConnection.Gallery.ItemCheckMode = DevExpress.XtraBars.Ribbon.Gallery.ItemCheckMode.SingleRadio + Me.GalleryConnection.Gallery.RowCount = 2 + Me.GalleryConnection.Gallery.ShowItemText = True + Me.GalleryConnection.Id = 5 + Me.GalleryConnection.Name = "GalleryConnection" + ' + 'chkClearPlaceholders + ' + Me.chkClearPlaceholders.Caption = "Platzhalter nach Ausführung leeren" + Me.chkClearPlaceholders.Id = 9 + Me.chkClearPlaceholders.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.clearpivottable1 + Me.chkClearPlaceholders.Name = "chkClearPlaceholders" + ' + 'btnClearPlaceholders + ' + Me.btnClearPlaceholders.Caption = "Platzhalter jetzt leeren" + Me.btnClearPlaceholders.Id = 10 + Me.btnClearPlaceholders.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.clearall + Me.btnClearPlaceholders.Name = "btnClearPlaceholders" + ' + 'chkShowPlaceholders + ' + Me.chkShowPlaceholders.BindableChecked = True + Me.chkShowPlaceholders.Caption = "Platzhalter anzeigen" + Me.chkShowPlaceholders.Checked = True + Me.chkShowPlaceholders.Id = 12 + Me.chkShowPlaceholders.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.togglefieldcodes + Me.chkShowPlaceholders.Name = "chkShowPlaceholders" + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "BarButtonItem1" + Me.BarButtonItem1.Id = 13 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "BarButtonItem2" + Me.BarButtonItem2.Id = 14 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "BarButtonItem3" + Me.BarButtonItem3.Id = 15 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "BarButtonItem4" + Me.BarButtonItem4.Id = 16 + Me.BarButtonItem4.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.actions_user + Me.BarButtonItem4.Name = "BarButtonItem4" + ' + 'BarButtonItem5 + ' + Me.BarButtonItem5.Caption = "BarButtonItem5" + Me.BarButtonItem5.Id = 18 + Me.BarButtonItem5.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.actions_database + Me.BarButtonItem5.Name = "BarButtonItem5" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "Start" + ' + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.ItemLinks.Add(Me.btnSave) + Me.RibbonPageGroup3.ItemLinks.Add(Me.btnExecuteSQL) + Me.RibbonPageGroup3.ItemLinks.Add(Me.GalleryConnection) + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + Me.RibbonPageGroup3.Text = "Start" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.GalleryPlaceholders) + Me.RibbonPageGroup1.ItemLinks.Add(Me.chkShowPlaceholders) + Me.RibbonPageGroup1.ItemLinks.Add(Me.chkClearPlaceholders) + Me.RibbonPageGroup1.ItemLinks.Add(Me.btnClearPlaceholders) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Platzhalter" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 666) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1056, 24) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'txtSQLCommand + ' + Me.txtSQLCommand.Dock = System.Windows.Forms.DockStyle.Fill + Me.txtSQLCommand.Location = New System.Drawing.Point(0, 0) + Me.txtSQLCommand.MenuManager = Me.RibbonControl1 + Me.txtSQLCommand.Name = "txtSQLCommand" + Me.txtSQLCommand.Size = New System.Drawing.Size(802, 508) + Me.txtSQLCommand.TabIndex = 2 + ' + 'SplitContainerControl1 + ' + Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 + Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 158) + Me.SplitContainerControl1.Name = "SplitContainerControl1" + ' + 'SplitContainerControl1.Panel1 + ' + Me.SplitContainerControl1.Panel1.Controls.Add(Me.txtSQLCommand) + Me.SplitContainerControl1.Panel1.Text = "Panel1" + ' + 'SplitContainerControl1.Panel2 + ' + Me.SplitContainerControl1.Panel2.Controls.Add(Me.GridPlaceholders) + Me.SplitContainerControl1.Panel2.Text = "Panel2" + Me.SplitContainerControl1.Size = New System.Drawing.Size(1056, 508) + Me.SplitContainerControl1.SplitterPosition = 802 + Me.SplitContainerControl1.TabIndex = 4 + ' + 'GridPlaceholders + ' + Me.GridPlaceholders.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridPlaceholders.Location = New System.Drawing.Point(0, 0) + Me.GridPlaceholders.MainView = Me.ViewPlaceholders + Me.GridPlaceholders.MenuManager = Me.RibbonControl1 + Me.GridPlaceholders.Name = "GridPlaceholders" + Me.GridPlaceholders.Size = New System.Drawing.Size(244, 508) + Me.GridPlaceholders.TabIndex = 0 + Me.GridPlaceholders.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewPlaceholders}) + ' + 'ViewPlaceholders + ' + Me.ViewPlaceholders.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPattern, Me.colValue}) + Me.ViewPlaceholders.GridControl = Me.GridPlaceholders + Me.ViewPlaceholders.Name = "ViewPlaceholders" + ' + 'colPattern + ' + Me.colPattern.Caption = "Platzhalter" + Me.colPattern.FieldName = "Pattern" + Me.colPattern.Name = "colPattern" + Me.colPattern.OptionsColumn.AllowEdit = False + Me.colPattern.OptionsColumn.ReadOnly = True + Me.colPattern.Visible = True + Me.colPattern.VisibleIndex = 0 + ' + 'colValue + ' + Me.colValue.Caption = "Wert" + Me.colValue.FieldName = "Value" + Me.colValue.Name = "colValue" + Me.colValue.Visible = True + Me.colValue.VisibleIndex = 1 + ' + 'frmSQLEditor + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1056, 690) + Me.Controls.Add(Me.SplitContainerControl1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.selectdatamember + Me.KeyPreview = True + Me.Name = "frmSQLEditor" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "SQL Designer" + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel2.ResumeLayout(False) + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.ResumeLayout(False) + CType(Me.GridPlaceholders, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ViewPlaceholders, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents GalleryPlaceholders As DevExpress.XtraBars.RibbonGalleryBarItem + Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection + Friend WithEvents txtSQLCommand As DevExpress.XtraRichEdit.RichEditControl + Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents GridPlaceholders As DevExpress.XtraGrid.GridControl + Friend WithEvents ViewPlaceholders As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents btnEditConnections As DevExpress.XtraBars.BarButtonItem + Friend WithEvents btnSave As DevExpress.XtraBars.BarButtonItem + Friend WithEvents btnExecuteSQL As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents colPattern As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colValue As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GalleryConnection As DevExpress.XtraBars.RibbonGalleryBarItem + Friend WithEvents chkClearPlaceholders As DevExpress.XtraBars.BarCheckItem + Friend WithEvents btnClearPlaceholders As DevExpress.XtraBars.BarButtonItem + Friend WithEvents chkShowPlaceholders As DevExpress.XtraBars.BarCheckItem + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem +End Class diff --git a/MessageBoxEx/My Project/Resources.resx b/GUIs.Common/frmSQLEditor.resx similarity index 87% rename from MessageBoxEx/My Project/Resources.resx rename to GUIs.Common/frmSQLEditor.resx index af7dbebb..f722219e 100644 --- a/MessageBoxEx/My Project/Resources.resx +++ b/GUIs.Common/frmSQLEditor.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/GUIs.Common/frmSQLEditor.vb b/GUIs.Common/frmSQLEditor.vb new file mode 100644 index 00000000..07e104b5 --- /dev/null +++ b/GUIs.Common/frmSQLEditor.vb @@ -0,0 +1,297 @@ +Imports System.ComponentModel +Imports System.Windows.Forms +Imports DevExpress.XtraBars.Ribbon +Imports DevExpress.XtraRichEdit.Services +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Patterns + +Public Class frmSQLEditor + + Private ReadOnly Patterns As ClassPatterns + Private ReadOnly LogConfig As LogConfig + Private ReadOnly Database As MSSQLServer + Private ReadOnly Placeholders As SQLEditor.Placeholders + + Private ClearPlaceholdersAfterSuccessfulExecute As Boolean = False + Private FormLoading As Boolean = False + Private FormResult As DialogResult = DialogResult.Cancel + + Public Property SQLCommand As String = "" + Public Property SQLConnection As Integer = 0 + Public Property LoadClipboardPlaceholders As Boolean = False + + Public Property PlaceholdersManual As Dictionary(Of String, String) + Public Property PlaceholdersManualPrefix As String + Public Property PlaceholdersManualTitle As String = "Manuelles Attribut" + + Public Property PlaceholdersAutomatic As Dictionary(Of String, String) + Public Property PlaceholdersAutomaticPrefix As String + Public Property PlaceholdersAutomaticTitle As String = "Automatisches Attribut" + Public Property PlaceholdersWindream As List(Of String) + + Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + LogConfig = pLogConfig + Database = pDatabase + Patterns = New ClassPatterns(LogConfig) + Placeholders = New SQLEditor.Placeholders() + End Sub + + Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load + FormLoading = True + Try + If PlaceholdersAutomatic Is Nothing Then + PlaceholdersAutomatic = New Dictionary(Of String, String) + End If + + If PlaceholdersManual Is Nothing Then + PlaceholdersManual = New Dictionary(Of String, String) + End If + + If PlaceholdersWindream Is Nothing Then + PlaceholdersWindream = New List(Of String) + End If + + If SQLCommand <> String.Empty Then + txtSQLCommand.Document.Text = SQLCommand + End If + + Dim oConnectionGroup = LoadConnections() + Dim oSelectedItem = Nothing + + If SQLConnection > 0 Then + For Each oItem As GalleryItem In oConnectionGroup.Items + Dim oConnection = oItem.Tag + If SQLConnection = oConnection.id Then + oSelectedItem = oItem + End If + Next + End If + + GalleryConnection.Gallery.Groups.Add(oConnectionGroup) + + If oSelectedItem IsNot Nothing Then + GalleryConnection.Gallery.SetItemCheck(oSelectedItem, True) + End If + + Dim oPlaceholderGroups = LoadPlaceholders() + GalleryPlaceholders.Gallery.Groups.AddRange(oPlaceholderGroups.ToArray) + + ConfigureRichEditControl() + + chkClearPlaceholders.Checked = ClearPlaceholdersAfterSuccessfulExecute + Catch ex As Exception + Finally + FormLoading = False + End Try + + End Sub + + Private Sub RibbonGalleryBarItem1_GalleryItemClick(sender As Object, e As GalleryItemClickEventArgs) Handles GalleryPlaceholders.GalleryItemClick + Dim oPlaceholder As SQLEditor.Placeholder = e.Item.Tag + Dim pPosition = txtSQLCommand.Document.CaretPosition + txtSQLCommand.Document.InsertSingleLineText(pPosition, Patterns.WrapPatternValue(oPlaceholder.Module, oPlaceholder.Name)) + End Sub + + Private Sub RibbonGalleryBarItem2_GalleryItemClick(sender As Object, e As GalleryItemClickEventArgs) Handles GalleryConnection.GalleryItemClick + Dim oConnection As Connection = e.Item.Tag + SQLConnection = oConnection.Id + End Sub + + Private Function LoadPlaceholders() As List(Of GalleryItemGroup) + Dim oPlaceholders = New List(Of GalleryItemGroup)() From { + Placeholders.GetInternalPlaceholders(), + Placeholders.GetUserPlaceholders() + } + + Dim oAutomaticAttributes = Placeholders.GetAutomaticPlaceholders(PlaceholdersAutomatic, PlaceholdersAutomaticPrefix, PlaceholdersAutomaticTitle) + If oAutomaticAttributes IsNot Nothing Then + oPlaceholders.Add(oAutomaticAttributes) + End If + + Dim oManualPlaceholders = Placeholders.GetManualPlaceholders(PlaceholdersManual, PlaceholdersManualPrefix, PlaceholdersManualTitle) + If oManualPlaceholders IsNot Nothing Then + oPlaceholders.Add(oManualPlaceholders) + End If + + Dim oWindreamPlaceholders = Placeholders.GetWindreamPlaceholders(PlaceholdersWindream) + If oWindreamPlaceholders IsNot Nothing Then + oPlaceholders.Add(oWindreamPlaceholders) + End If + + If LoadClipboardPlaceholders Then + oPlaceholders.Add(Placeholders.GetClipboardPlaceholder) + End If + + Return oPlaceholders + End Function + + Private Function LoadConnections() As GalleryItemGroup + Try + Dim oSql = "SELECT GUID, Bezeichnung FROM TBDD_CONNECTION WHERE AKTIV = 1" + Dim oTable = Database.GetDatatable(oSql) + Dim oConnections = New List(Of Connection) + + For Each oRow As DataRow In oTable.Rows + oConnections.Add(New Connection() With { + .Id = oRow.Item("GUID"), + .Name = oRow.Item("Bezeichnung")}) + Next + + Dim oConnectionGroup = New GalleryItemGroup() With {.Caption = "Verbindungen"} + Dim oItems As New List(Of GalleryItem) + For Each oConnection In oConnections + oItems.Add(GetGalleryItem(oConnection)) + Next + oConnectionGroup.Items.AddRange(oItems.ToArray) + + Return oConnectionGroup + Catch ex As Exception + Return Nothing + End Try + End Function + + Private Sub ConfigureRichEditControl() + txtSQLCommand.Options.Search.RegExResultMaxGuaranteedLength = 500 + txtSQLCommand.ReplaceService(Of ISyntaxHighlightService)(New SQLEditor.SQLSyntaxHighlightService(txtSQLCommand.Document)) + txtSQLCommand.ActiveViewType = DevExpress.XtraRichEdit.RichEditViewType.Simple + txtSQLCommand.Document.Sections(0).Page.Width = DevExpress.Office.Utils.Units.InchesToDocumentsF(80.0F) + + txtSQLCommand.Document.DefaultCharacterProperties.FontName = "Courier New" + txtSQLCommand.Document.DefaultCharacterProperties.FontSize = 12 + End Sub + + + Private Sub ClearPlaceholders() + Dim oPlaceholders As List(Of SQLEditor.Placeholder) = GridPlaceholders.DataSource + + oPlaceholders.ForEach(Sub(placeholder) placeholder.Value = "") + + GridPlaceholders.DataSource = oPlaceholders + End Sub + + Private Function GetGalleryItem(pConnection As Connection) As GalleryItem + Dim oItem = New GalleryItem(Nothing, pConnection.Name, Nothing) With { + .Tag = pConnection + } + + oItem.ImageOptions.SvgImage = My.Resources.actions_database + + Return oItem + End Function + + Private Property LastPatterns As New List(Of Pattern) + + Private Sub RichEditControl1_ContentChanged(sender As Object, e As EventArgs) Handles txtSQLCommand.ContentChanged + UpdatePlaceholders() + End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExecuteSQL.ItemClick + ExecuteSQL() + End Sub + + Private Class Connection + Public Property Id As Integer + Public Property Name As String + End Class + + Private Sub UpdatePlaceholders() + Dim oSqlText = txtSQLCommand.Document.Text + Dim oPatterns = Patterns.GetAllPatterns(oSqlText) + + If oPatterns.Count = 0 Then + GridPlaceholders.DataSource = New List(Of SQLEditor.Placeholder) + ElseIf oPatterns.Count.Equals(LastPatterns.Count) Then + ' noop + Else + Dim oPlaceholders = oPatterns. + Select(Function(pattern) New SQLEditor.Placeholder(pattern.Value, pattern.Value, pattern.Type, pattern.Value) With {.Pattern = pattern}). + ToList() + GridPlaceholders.DataSource = oPlaceholders + End If + + LastPatterns = oPatterns + End Sub + + Private Sub ExecuteSQL() + Try + ViewPlaceholders.FocusInvalidRow() + + Dim oSql = txtSQLCommand.Document.Text + Dim oPlaceholders As List(Of SQLEditor.Placeholder) = GridPlaceholders.DataSource + + If oPlaceholders IsNot Nothing Then + For Each oPlaceholder In oPlaceholders + Dim oWrapped = Patterns.WrapPatternValue(oPlaceholder.Module, oPlaceholder.Name) + + If oPlaceholder.Value Is Nothing Then + Throw New ApplicationException($"Der Platzhalter '{oWrapped}' wurde nicht ausgefüllt!") + End If + + + oSql = oSql.Replace(oWrapped, oPlaceholder.Value) + Next + End If + + Dim oDatatable As DataTable + + If SQLConnection > 0 Then + Dim oConnectionString = Database.GetConnectionStringForId(SQLConnection) + oDatatable = Database.GetDatatableWithConnection(oSql, oConnectionString) + Else + oDatatable = Database.GetDatatable(oSql) + End If + + If ClearPlaceholdersAfterSuccessfulExecute Then + ClearPlaceholders() + End If + + Dim oForm As New frmSQLResult(oDatatable) + oForm.Show() + + Catch ex As ApplicationException + MsgBox(ex.Message, MsgBoxStyle.Exclamation, Text) + + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, Text) + End Try + End Sub + + Private Sub BarCheckItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkClearPlaceholders.CheckedChanged + If FormLoading = False Then + ClearPlaceholdersAfterSuccessfulExecute = chkClearPlaceholders.Checked + End If + End Sub + + Private Sub btnClearPlaceholders_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnClearPlaceholders.ItemClick + ClearPlaceholders() + End Sub + + Private Sub chkShowPlaceholders_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkShowPlaceholders.CheckedChanged + SplitContainerControl1.Collapsed = Not chkShowPlaceholders.Checked + End Sub + Private Sub SplitContainerControl1_SplitGroupPanelCollapsed(sender As Object, e As DevExpress.XtraEditors.SplitGroupPanelCollapsedEventArgs) Handles SplitContainerControl1.SplitGroupPanelCollapsed + chkShowPlaceholders.Checked = Not e.Collapsed + End Sub + + Private Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick + SQLCommand = txtSQLCommand.Text + FormResult = DialogResult.OK + Close() + End Sub + + Private Sub frmSQLEditor_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown + If e.KeyCode = Keys.F5 Then + ExecuteSQL() + End If + End Sub + + Private Sub frmSQLEditor_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing + DialogResult = FormResult + + End Sub +End Class diff --git a/GUIs.Common/frmSQLResult.Designer.vb b/GUIs.Common/frmSQLResult.Designer.vb new file mode 100644 index 00000000..6ecd114f --- /dev/null +++ b/GUIs.Common/frmSQLResult.Designer.vb @@ -0,0 +1,62 @@ + _ +Partial Class frmSQLResult + Inherits DevExpress.XtraEditors.XtraForm + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.GridControlResult = New DevExpress.XtraGrid.GridControl() + Me.GridViewResult = New DevExpress.XtraGrid.Views.Grid.GridView() + CType(Me.GridControlResult, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewResult, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'GridControlResult + ' + Me.GridControlResult.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControlResult.Location = New System.Drawing.Point(0, 0) + Me.GridControlResult.MainView = Me.GridViewResult + Me.GridControlResult.Name = "GridControlResult" + Me.GridControlResult.Size = New System.Drawing.Size(800, 450) + Me.GridControlResult.TabIndex = 0 + Me.GridControlResult.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewResult}) + ' + 'GridViewResult + ' + Me.GridViewResult.GridControl = Me.GridControlResult + Me.GridViewResult.Name = "GridViewResult" + ' + 'frmSQLResult + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.GridControlResult) + Me.Name = "frmSQLResult" + Me.Text = "SQL Ergebnis" + CType(Me.GridControlResult, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewResult, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents GridControlResult As DevExpress.XtraGrid.GridControl + Friend WithEvents GridViewResult As DevExpress.XtraGrid.Views.Grid.GridView +End Class diff --git a/SQLEditorTest/Form1.resx b/GUIs.Common/frmSQLResult.resx similarity index 100% rename from SQLEditorTest/Form1.resx rename to GUIs.Common/frmSQLResult.resx diff --git a/GUIs.Common/frmSQLResult.vb b/GUIs.Common/frmSQLResult.vb new file mode 100644 index 00000000..f7ced580 --- /dev/null +++ b/GUIs.Common/frmSQLResult.vb @@ -0,0 +1,20 @@ +Imports DigitalData.GUIs.Common + +Public Class frmSQLResult + Private ReadOnly Table As DataTable + Private ReadOnly GridBuilder As GridBuilder + + Public Sub New(pTable As DataTable) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Table = pTable + GridBuilder = New GridBuilder(GridViewResult). + WithClipboardHandler() + End Sub + + Private Sub frmSQLResult_Load(sender As Object, e As EventArgs) Handles MyBase.Load + GridControlResult.DataSource = Table + End Sub +End Class \ No newline at end of file diff --git a/GUIs.Monitor/Monitor.vbproj b/GUIs.Monitor/Monitor.vbproj index e43e15ec..dfee285b 100644 --- a/GUIs.Monitor/Monitor.vbproj +++ b/GUIs.Monitor/Monitor.vbproj @@ -154,10 +154,6 @@ - - {3e7bc8a9-91ef-49b8-8110-2c01f664c24a} - SQLEditor - {d20a6bf2-c7c6-4a7a-b34d-fa27d775a049} Common diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index f98e4215..f0c5358b 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -326,10 +326,6 @@ {3dcd6d1a-c830-4241-b7e4-27430e7ea483} LookupControl - - {3e7bc8a9-91ef-49b8-8110-2c01f664c24a} - SQLEditor - {10c922fb-dd8d-4e0b-a50c-30ee658fbddc} FilterReader @@ -338,10 +334,6 @@ {D20A6BF2-C7C6-4A7A-B34D-FA27D775A049} Common - - {ef29f400-be45-4283-9d18-ca7acd9accc9} - MessageBoxEx - {44982f9b-6116-44e2-85d0-f39650b1ef99} Config diff --git a/GUIs.Test.TestGUI/frmMsgBox.vb b/GUIs.Test.TestGUI/frmMsgBox.vb index 439dda5b..9794d77f 100644 --- a/GUIs.Test.TestGUI/frmMsgBox.vb +++ b/GUIs.Test.TestGUI/frmMsgBox.vb @@ -1,6 +1,6 @@ -Imports DigitalData.Modules.Database +Imports DigitalData.GUIs.Common +Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging -Imports DigitalData.Controls.MessageBoxEx Public Class frmMsgBox Private LogConfig As LogConfig diff --git a/GUIs.Test.TestGUI/frmStart.vb b/GUIs.Test.TestGUI/frmStart.vb index 7af85fd6..78ca09a3 100644 --- a/GUIs.Test.TestGUI/frmStart.vb +++ b/GUIs.Test.TestGUI/frmStart.vb @@ -1,7 +1,6 @@ -Imports DigitalData.Controls.SQLEditor -Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging - +Imports DigitalData.GUIs.Common Public Class frmStart Private LogConfig As LogConfig @@ -49,7 +48,10 @@ Public Class frmStart Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click Dim oForm As New frmSQLEditor(LogConfig, Database) With { .SQLCommand = "SELECT * FROM TBDD_USER WHERE EMAIL = '{#USER#EMAIL}'", - .SQLConnection = 1 + .SQLConnection = 1, + .PlaceholdersAutomatic = New Dictionary(Of String, String) From {{"Testindex 1", "test 1"}, {"Testindex 2", "test 2"}}, + .PlaceholdersAutomaticPrefix = "MAN", + .PlaceholdersWindream = New List(Of String) From {"String Index 1", "String Index 2"} } oForm.Show() End Sub diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb index f8caa18d..6e745450 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb @@ -55,8 +55,6 @@ Partial Class frmAdmin_Globix Me.VWIDB_OBJECT_STOREBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.SEQUENCENumericUpDown = New System.Windows.Forms.NumericUpDown() Me.TBDD_INDEX_MANBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.AKTIVCheckBox = New System.Windows.Forms.CheckBox() - Me.GEAENDERTWANNTextBox = New System.Windows.Forms.TextBox() Me.TextEditErstelltWer = New DevExpress.XtraEditors.TextEdit() Me.TextEditGeandertWer = New DevExpress.XtraEditors.TextEdit() Me.TextEditNamenkonvention = New DevExpress.XtraEditors.TextEdit() @@ -65,25 +63,26 @@ Partial Class frmAdmin_Globix Me.TextEditDoctypeID = New DevExpress.XtraEditors.TextEdit() Me.ComboBoxEditDupl_handling = New DevExpress.XtraEditors.ComboBoxEdit() Me.SimpleButtonNameconvention = New DevExpress.XtraEditors.SimpleButton() + Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() + Me.TextEditGeaendertWann = New DevExpress.XtraEditors.TextEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem30 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem20 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() - Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() - Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem25 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem3 = New DevExpress.XtraLayout.EmptySpaceItem() Me.LayoutControlItem26 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem32 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem36 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem28 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem12 = New DevExpress.XtraLayout.EmptySpaceItem() Me.LayoutControlItem61 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem() Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageManIndexe = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControlManIndexe = New DevExpress.XtraLayout.LayoutControl() @@ -126,6 +125,8 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem46 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem63 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem64 = New DevExpress.XtraLayout.LayoutControlItem() + Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.ListBoxAutoIndexe = New DevExpress.XtraEditors.ListBoxControl() Me.XtraTabPageRework = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControlRework = New DevExpress.XtraLayout.LayoutControl() Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup() @@ -246,8 +247,6 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem38 = New DevExpress.XtraLayout.LayoutControlItem() Me.TBGI_REGEX_DOCTYPETableAdapter = New DigitalData.GUIs.ZooFlow.GlobixDatasetTableAdapters.TBGI_REGEX_DOCTYPETableAdapter() Me.VWIDB_DOCTYPE_LANGUAGETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.VWIDB_DOCTYPE_LANGUAGETableAdapter() - Me.ListBoxAutoIndexe = New DevExpress.XtraEditors.ListBoxControl() - Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() SEQUENCELabel = New System.Windows.Forms.Label() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -272,25 +271,26 @@ Partial Class frmAdmin_Globix CType(Me.TextEditBezeichnung.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEditDoctypeID.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ComboBoxEditDupl_handling.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEditGeaendertWann.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem32, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem36, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem12, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem61, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl2.SuspendLayout() Me.XtraTabPageManIndexe.SuspendLayout() @@ -328,6 +328,8 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem46, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem63, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem64, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ListBoxAutoIndexe, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageRework.SuspendLayout() CType(Me.LayoutControlRework, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -421,8 +423,6 @@ Partial Class frmAdmin_Globix CType(Me.viewAvailableGroups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem38, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ListBoxAutoIndexe, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SEQUENCELabel @@ -582,8 +582,6 @@ Partial Class frmAdmin_Globix Me.LayoutControlProfile.Controls.Add(Me.TextEdit1) Me.LayoutControlProfile.Controls.Add(Me.IDB_OBJECT_STORE_IDComboBox) Me.LayoutControlProfile.Controls.Add(Me.SEQUENCENumericUpDown) - Me.LayoutControlProfile.Controls.Add(Me.AKTIVCheckBox) - Me.LayoutControlProfile.Controls.Add(Me.GEAENDERTWANNTextBox) Me.LayoutControlProfile.Controls.Add(Me.TextEditErstelltWer) Me.LayoutControlProfile.Controls.Add(Me.TextEditGeandertWer) Me.LayoutControlProfile.Controls.Add(Me.TextEditNamenkonvention) @@ -592,6 +590,8 @@ Partial Class frmAdmin_Globix Me.LayoutControlProfile.Controls.Add(Me.TextEditDoctypeID) Me.LayoutControlProfile.Controls.Add(Me.ComboBoxEditDupl_handling) Me.LayoutControlProfile.Controls.Add(Me.SimpleButtonNameconvention) + Me.LayoutControlProfile.Controls.Add(Me.CheckEdit1) + Me.LayoutControlProfile.Controls.Add(Me.TextEditGeaendertWann) Me.LayoutControlProfile.Location = New System.Drawing.Point(-2, -7) Me.LayoutControlProfile.Name = "LayoutControlProfile" Me.LayoutControlProfile.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(948, 640, 650, 400) @@ -603,7 +603,7 @@ Partial Class frmAdmin_Globix 'GridLookUpEdit1 ' Me.GridLookUpEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "IDB_DOCTYPE_ID", True)) - Me.GridLookUpEdit1.Location = New System.Drawing.Point(156, 76) + Me.GridLookUpEdit1.Location = New System.Drawing.Point(166, 76) Me.GridLookUpEdit1.MenuManager = Me.RibbonControl1 Me.GridLookUpEdit1.Name = "GridLookUpEdit1" Me.GridLookUpEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -611,7 +611,7 @@ Partial Class frmAdmin_Globix Me.GridLookUpEdit1.Properties.DisplayMember = "Doctype" Me.GridLookUpEdit1.Properties.PopupView = Me.GridLookUpEdit1View Me.GridLookUpEdit1.Properties.ValueMember = "Doctype_ID" - Me.GridLookUpEdit1.Size = New System.Drawing.Size(931, 20) + Me.GridLookUpEdit1.Size = New System.Drawing.Size(921, 20) Me.GridLookUpEdit1.StyleController = Me.LayoutControlProfile Me.GridLookUpEdit1.TabIndex = 61 ' @@ -633,19 +633,19 @@ Partial Class frmAdmin_Globix Me.IDB_DOCTYPE_IDComboBox.DataSource = Me.VWIDB_DOCTYPE_LANGUAGEBindingSource Me.IDB_DOCTYPE_IDComboBox.DisplayMember = "Doctype" Me.IDB_DOCTYPE_IDComboBox.FormattingEnabled = True - Me.IDB_DOCTYPE_IDComboBox.Location = New System.Drawing.Point(156, 45) + Me.IDB_DOCTYPE_IDComboBox.Location = New System.Drawing.Point(166, 45) Me.IDB_DOCTYPE_IDComboBox.Name = "IDB_DOCTYPE_IDComboBox" - Me.IDB_DOCTYPE_IDComboBox.Size = New System.Drawing.Size(389, 21) + Me.IDB_DOCTYPE_IDComboBox.Size = New System.Drawing.Size(380, 21) Me.IDB_DOCTYPE_IDComboBox.TabIndex = 60 Me.IDB_DOCTYPE_IDComboBox.ValueMember = "Doctype_ID" ' 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "ERSTELLTWANN", True)) - Me.TextEdit1.Location = New System.Drawing.Point(156, 257) + Me.TextEdit1.Location = New System.Drawing.Point(166, 257) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Size = New System.Drawing.Size(389, 20) + Me.TextEdit1.Size = New System.Drawing.Size(380, 20) Me.TextEdit1.StyleController = Me.LayoutControlProfile Me.TextEdit1.TabIndex = 59 ' @@ -656,9 +656,9 @@ Partial Class frmAdmin_Globix Me.IDB_OBJECT_STORE_IDComboBox.DataSource = Me.VWIDB_OBJECT_STOREBindingSource Me.IDB_OBJECT_STORE_IDComboBox.DisplayMember = "Objectstore" Me.IDB_OBJECT_STORE_IDComboBox.FormattingEnabled = True - Me.IDB_OBJECT_STORE_IDComboBox.Location = New System.Drawing.Point(156, 166) + Me.IDB_OBJECT_STORE_IDComboBox.Location = New System.Drawing.Point(166, 166) Me.IDB_OBJECT_STORE_IDComboBox.Name = "IDB_OBJECT_STORE_IDComboBox" - Me.IDB_OBJECT_STORE_IDComboBox.Size = New System.Drawing.Size(389, 21) + Me.IDB_OBJECT_STORE_IDComboBox.Size = New System.Drawing.Size(380, 21) Me.IDB_OBJECT_STORE_IDComboBox.TabIndex = 57 Me.IDB_OBJECT_STORE_IDComboBox.ValueMember = "GUID" ' @@ -670,10 +670,10 @@ Partial Class frmAdmin_Globix 'SEQUENCENumericUpDown ' Me.SEQUENCENumericUpDown.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_INDEX_MANBindingSource, "SEQUENCE", True)) - Me.SEQUENCENumericUpDown.Location = New System.Drawing.Point(385, 15) + Me.SEQUENCENumericUpDown.Location = New System.Drawing.Point(395, 15) Me.SEQUENCENumericUpDown.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) Me.SEQUENCENumericUpDown.Name = "SEQUENCENumericUpDown" - Me.SEQUENCENumericUpDown.Size = New System.Drawing.Size(44, 21) + Me.SEQUENCENumericUpDown.Size = New System.Drawing.Size(34, 22) Me.SEQUENCENumericUpDown.TabIndex = 56 Me.SEQUENCENumericUpDown.Value = New Decimal(New Integer() {1, 0, 0, 0}) ' @@ -682,94 +682,75 @@ Partial Class frmAdmin_Globix Me.TBDD_INDEX_MANBindingSource.DataMember = "TBDD_INDEX_MAN" Me.TBDD_INDEX_MANBindingSource.DataSource = Me.GlobixDataset ' - 'AKTIVCheckBox - ' - Me.AKTIVCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_DOKUMENTARTBindingSource, "AKTIV", True)) - Me.AKTIVCheckBox.Location = New System.Drawing.Point(436, 12) - Me.AKTIVCheckBox.Name = "AKTIVCheckBox" - Me.AKTIVCheckBox.Size = New System.Drawing.Size(274, 20) - Me.AKTIVCheckBox.TabIndex = 25 - Me.AKTIVCheckBox.Text = "Aktiv" - Me.AKTIVCheckBox.UseVisualStyleBackColor = True - ' - 'GEAENDERTWANNTextBox - ' - Me.GEAENDERTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GEAENDERTWANN", True)) - Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(696, 257) - Me.GEAENDERTWANNTextBox.Name = "GEAENDERTWANNTextBox" - Me.GEAENDERTWANNTextBox.ReadOnly = True - Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(391, 20) - Me.GEAENDERTWANNTextBox.TabIndex = 39 - ' 'TextEditErstelltWer ' Me.TextEditErstelltWer.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "ERSTELLTWER", True)) - Me.TextEditErstelltWer.Location = New System.Drawing.Point(156, 227) + Me.TextEditErstelltWer.Location = New System.Drawing.Point(166, 227) Me.TextEditErstelltWer.MenuManager = Me.RibbonControl1 Me.TextEditErstelltWer.Name = "TextEditErstelltWer" - Me.TextEditErstelltWer.Size = New System.Drawing.Size(389, 20) + Me.TextEditErstelltWer.Size = New System.Drawing.Size(380, 20) Me.TextEditErstelltWer.StyleController = Me.LayoutControlProfile Me.TextEditErstelltWer.TabIndex = 44 ' 'TextEditGeandertWer ' Me.TextEditGeandertWer.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GEANDERTWER", True)) - Me.TextEditGeandertWer.Location = New System.Drawing.Point(696, 227) + Me.TextEditGeandertWer.Location = New System.Drawing.Point(707, 227) Me.TextEditGeandertWer.MenuManager = Me.RibbonControl1 Me.TextEditGeandertWer.Name = "TextEditGeandertWer" - Me.TextEditGeandertWer.Size = New System.Drawing.Size(391, 20) + Me.TextEditGeandertWer.Size = New System.Drawing.Size(380, 20) Me.TextEditGeandertWer.StyleController = Me.LayoutControlProfile Me.TextEditGeandertWer.TabIndex = 45 ' 'TextEditNamenkonvention ' Me.TextEditNamenkonvention.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "NAMENKONVENTION", True)) - Me.TextEditNamenkonvention.Location = New System.Drawing.Point(156, 136) + Me.TextEditNamenkonvention.Location = New System.Drawing.Point(166, 136) Me.TextEditNamenkonvention.MenuManager = Me.RibbonControl1 Me.TextEditNamenkonvention.Name = "TextEditNamenkonvention" - Me.TextEditNamenkonvention.Size = New System.Drawing.Size(672, 20) + Me.TextEditNamenkonvention.Size = New System.Drawing.Size(662, 20) Me.TextEditNamenkonvention.StyleController = Me.LayoutControlProfile Me.TextEditNamenkonvention.TabIndex = 46 ' 'TextEditBeschreibung ' Me.TextEditBeschreibung.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "BESCHREIBUNG", True)) - Me.TextEditBeschreibung.Location = New System.Drawing.Point(156, 197) + Me.TextEditBeschreibung.Location = New System.Drawing.Point(166, 197) Me.TextEditBeschreibung.MenuManager = Me.RibbonControl1 Me.TextEditBeschreibung.Name = "TextEditBeschreibung" - Me.TextEditBeschreibung.Size = New System.Drawing.Size(931, 20) + Me.TextEditBeschreibung.Size = New System.Drawing.Size(921, 20) Me.TextEditBeschreibung.StyleController = Me.LayoutControlProfile Me.TextEditBeschreibung.TabIndex = 48 ' 'TextEditBezeichnung ' Me.TextEditBezeichnung.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "BEZEICHNUNG", True)) - Me.TextEditBezeichnung.Location = New System.Drawing.Point(696, 45) + Me.TextEditBezeichnung.Location = New System.Drawing.Point(707, 45) Me.TextEditBezeichnung.MenuManager = Me.RibbonControl1 Me.TextEditBezeichnung.Name = "TextEditBezeichnung" - Me.TextEditBezeichnung.Size = New System.Drawing.Size(391, 20) + Me.TextEditBezeichnung.Size = New System.Drawing.Size(380, 20) Me.TextEditBezeichnung.StyleController = Me.LayoutControlProfile Me.TextEditBezeichnung.TabIndex = 51 ' 'TextEditDoctypeID ' Me.TextEditDoctypeID.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GUID", True)) - Me.TextEditDoctypeID.Location = New System.Drawing.Point(156, 15) + Me.TextEditDoctypeID.Location = New System.Drawing.Point(166, 15) Me.TextEditDoctypeID.MenuManager = Me.RibbonControl1 Me.TextEditDoctypeID.Name = "TextEditDoctypeID" - Me.TextEditDoctypeID.Size = New System.Drawing.Size(78, 20) + Me.TextEditDoctypeID.Size = New System.Drawing.Size(68, 20) Me.TextEditDoctypeID.StyleController = Me.LayoutControlProfile Me.TextEditDoctypeID.TabIndex = 52 ' 'ComboBoxEditDupl_handling ' Me.ComboBoxEditDupl_handling.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "DUPLICATE_HANDLING", True)) - Me.ComboBoxEditDupl_handling.Location = New System.Drawing.Point(156, 106) + Me.ComboBoxEditDupl_handling.Location = New System.Drawing.Point(166, 106) Me.ComboBoxEditDupl_handling.MenuManager = Me.RibbonControl1 Me.ComboBoxEditDupl_handling.Name = "ComboBoxEditDupl_handling" Me.ComboBoxEditDupl_handling.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.ComboBoxEditDupl_handling.Properties.Items.AddRange(New Object() {"New version", "Default", "Question"}) - Me.ComboBoxEditDupl_handling.Size = New System.Drawing.Size(931, 20) + Me.ComboBoxEditDupl_handling.Size = New System.Drawing.Size(921, 20) Me.ComboBoxEditDupl_handling.StyleController = Me.LayoutControlProfile Me.ComboBoxEditDupl_handling.TabIndex = 54 ' @@ -784,11 +765,32 @@ Partial Class frmAdmin_Globix Me.SimpleButtonNameconvention.TabIndex = 58 Me.SimpleButtonNameconvention.Text = "Editor" ' + 'CheckEdit1 + ' + Me.CheckEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "AKTIV", True)) + Me.CheckEdit1.Location = New System.Drawing.Point(439, 15) + Me.CheckEdit1.MenuManager = Me.RibbonControl1 + Me.CheckEdit1.Name = "CheckEdit1" + Me.CheckEdit1.Properties.Caption = "Aktiv" + Me.CheckEdit1.Size = New System.Drawing.Size(648, 20) + Me.CheckEdit1.StyleController = Me.LayoutControlProfile + Me.CheckEdit1.TabIndex = 62 + ' + 'TextEditGeaendertWann + ' + Me.TextEditGeaendertWann.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "GEAENDERTWANN", True)) + Me.TextEditGeaendertWann.Location = New System.Drawing.Point(707, 257) + Me.TextEditGeaendertWann.MenuManager = Me.RibbonControl1 + Me.TextEditGeaendertWann.Name = "TextEditGeaendertWann" + Me.TextEditGeaendertWann.Size = New System.Drawing.Size(380, 20) + Me.TextEditGeaendertWann.StyleController = Me.LayoutControlProfile + Me.TextEditGeaendertWann.TabIndex = 63 + ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem3, Me.LayoutControlItem30, Me.LayoutControlItem20, Me.LayoutControlItem4, Me.EmptySpaceItem1, Me.LayoutControlItem22, Me.LayoutControlItem25, Me.EmptySpaceItem3, Me.LayoutControlItem26, Me.LayoutControlItem1, Me.LayoutControlItem32, Me.LayoutControlItem5, Me.LayoutControlItem36, Me.LayoutControlItem28, Me.EmptySpaceItem12, Me.LayoutControlItem61, Me.LayoutControlItem12}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem3, Me.LayoutControlItem30, Me.LayoutControlItem20, Me.LayoutControlItem4, Me.LayoutControlItem25, Me.EmptySpaceItem3, Me.LayoutControlItem26, Me.LayoutControlItem1, Me.LayoutControlItem32, Me.LayoutControlItem5, Me.LayoutControlItem28, Me.EmptySpaceItem12, Me.LayoutControlItem61, Me.LayoutControlItem12, Me.LayoutControlItem7, Me.LayoutControlItem22}) Me.Root.Name = "Root" Me.Root.Size = New System.Drawing.Size(1102, 302) Me.Root.TextVisible = False @@ -796,12 +798,12 @@ Partial Class frmAdmin_Globix 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.TextEditBezeichnung - Me.LayoutControlItem10.Location = New System.Drawing.Point(540, 30) + Me.LayoutControlItem10.Location = New System.Drawing.Point(541, 30) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem10.Size = New System.Drawing.Size(542, 31) + Me.LayoutControlItem10.Size = New System.Drawing.Size(541, 31) Me.LayoutControlItem10.Text = "Bezeichnung" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(129, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem3 ' @@ -812,9 +814,9 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 212) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem3.Size = New System.Drawing.Size(540, 30) + Me.LayoutControlItem3.Size = New System.Drawing.Size(541, 30) Me.LayoutControlItem3.Text = "Erstellt wer" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(129, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem30 ' @@ -824,7 +826,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem30.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem30.Size = New System.Drawing.Size(823, 30) Me.LayoutControlItem30.Text = "Namenkonvention" - Me.LayoutControlItem30.TextSize = New System.Drawing.Size(129, 13) + Me.LayoutControlItem30.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem20 ' @@ -835,7 +837,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem20.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem20.Size = New System.Drawing.Size(195, 30) Me.LayoutControlItem20.Text = "Reihenfolge" - Me.LayoutControlItem20.TextSize = New System.Drawing.Size(129, 13) + Me.LayoutControlItem20.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem4 ' @@ -847,24 +849,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem4.Size = New System.Drawing.Size(229, 30) Me.LayoutControlItem4.Text = "ID" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(129, 13) - ' - 'EmptySpaceItem1 - ' - Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(702, 0) - Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(380, 30) - Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) - ' - 'LayoutControlItem22 - ' - Me.LayoutControlItem22.Control = Me.AKTIVCheckBox - Me.LayoutControlItem22.Location = New System.Drawing.Point(424, 0) - Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Size = New System.Drawing.Size(278, 30) - Me.LayoutControlItem22.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem22.TextVisible = False + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem25 ' @@ -874,9 +859,9 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 151) Me.LayoutControlItem25.Name = "LayoutControlItem25" Me.LayoutControlItem25.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem25.Size = New System.Drawing.Size(540, 31) + Me.LayoutControlItem25.Size = New System.Drawing.Size(541, 31) Me.LayoutControlItem25.Text = "File-Store:" - Me.LayoutControlItem25.TextSize = New System.Drawing.Size(129, 13) + Me.LayoutControlItem25.TextSize = New System.Drawing.Size(139, 13) ' 'EmptySpaceItem3 ' @@ -894,7 +879,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem26.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem26.Size = New System.Drawing.Size(1082, 30) Me.LayoutControlItem26.Text = "Verhalten Datei vorhanden" - Me.LayoutControlItem26.TextSize = New System.Drawing.Size(129, 13) + Me.LayoutControlItem26.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem1 ' @@ -914,9 +899,9 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem32.Location = New System.Drawing.Point(0, 242) Me.LayoutControlItem32.Name = "LayoutControlItem32" Me.LayoutControlItem32.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem32.Size = New System.Drawing.Size(540, 30) + Me.LayoutControlItem32.Size = New System.Drawing.Size(541, 30) Me.LayoutControlItem32.Text = "Erstellt wann" - Me.LayoutControlItem32.TextSize = New System.Drawing.Size(129, 13) + Me.LayoutControlItem32.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem5 ' @@ -924,25 +909,12 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem5.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem5.Control = Me.TextEditGeandertWer Me.LayoutControlItem5.Enabled = False - Me.LayoutControlItem5.Location = New System.Drawing.Point(540, 212) + Me.LayoutControlItem5.Location = New System.Drawing.Point(541, 212) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem5.Size = New System.Drawing.Size(542, 30) + Me.LayoutControlItem5.Size = New System.Drawing.Size(541, 30) Me.LayoutControlItem5.Text = "Geändert wer" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(129, 13) - ' - 'LayoutControlItem36 - ' - Me.LayoutControlItem36.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LayoutControlItem36.AppearanceItemCaption.Options.UseFont = True - Me.LayoutControlItem36.Control = Me.GEAENDERTWANNTextBox - Me.LayoutControlItem36.Enabled = False - Me.LayoutControlItem36.Location = New System.Drawing.Point(540, 242) - Me.LayoutControlItem36.Name = "LayoutControlItem36" - Me.LayoutControlItem36.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem36.Size = New System.Drawing.Size(542, 30) - Me.LayoutControlItem36.Text = "Geändert wann:" - Me.LayoutControlItem36.TextSize = New System.Drawing.Size(129, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem28 ' @@ -952,14 +924,14 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem28.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem28.Size = New System.Drawing.Size(1082, 30) Me.LayoutControlItem28.Text = "Beschreibung" - Me.LayoutControlItem28.TextSize = New System.Drawing.Size(129, 13) + Me.LayoutControlItem28.TextSize = New System.Drawing.Size(139, 13) ' 'EmptySpaceItem12 ' Me.EmptySpaceItem12.AllowHotTrack = False - Me.EmptySpaceItem12.Location = New System.Drawing.Point(540, 151) + Me.EmptySpaceItem12.Location = New System.Drawing.Point(541, 151) Me.EmptySpaceItem12.Name = "EmptySpaceItem12" - Me.EmptySpaceItem12.Size = New System.Drawing.Size(542, 31) + Me.EmptySpaceItem12.Size = New System.Drawing.Size(541, 31) Me.EmptySpaceItem12.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem61 @@ -968,9 +940,9 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem61.Location = New System.Drawing.Point(0, 30) Me.LayoutControlItem61.Name = "LayoutControlItem61" Me.LayoutControlItem61.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem61.Size = New System.Drawing.Size(540, 31) + Me.LayoutControlItem61.Size = New System.Drawing.Size(541, 31) Me.LayoutControlItem61.Text = "Dokumentart" - Me.LayoutControlItem61.TextSize = New System.Drawing.Size(129, 13) + Me.LayoutControlItem61.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem12 ' @@ -979,7 +951,30 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem12.Name = "LayoutControlItem12" Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem12.Size = New System.Drawing.Size(1082, 30) - Me.LayoutControlItem12.TextSize = New System.Drawing.Size(129, 13) + Me.LayoutControlItem12.TextSize = New System.Drawing.Size(139, 13) + ' + 'LayoutControlItem7 + ' + Me.LayoutControlItem7.Control = Me.CheckEdit1 + Me.LayoutControlItem7.Location = New System.Drawing.Point(424, 0) + Me.LayoutControlItem7.Name = "LayoutControlItem7" + Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem7.Size = New System.Drawing.Size(658, 30) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem7.TextVisible = False + ' + 'LayoutControlItem22 + ' + Me.LayoutControlItem22.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic) + Me.LayoutControlItem22.AppearanceItemCaption.Options.UseFont = True + Me.LayoutControlItem22.Control = Me.TextEditGeaendertWann + Me.LayoutControlItem22.Enabled = False + Me.LayoutControlItem22.Location = New System.Drawing.Point(541, 242) + Me.LayoutControlItem22.Name = "LayoutControlItem22" + Me.LayoutControlItem22.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem22.Size = New System.Drawing.Size(541, 30) + Me.LayoutControlItem22.Text = "Geändert Wann" + Me.LayoutControlItem22.TextSize = New System.Drawing.Size(139, 13) ' 'XtraTabControl2 ' @@ -1035,7 +1030,7 @@ Partial Class frmAdmin_Globix 'TextEdit4 ' Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit4.Location = New System.Drawing.Point(498, 235) + Me.TextEdit4.Location = New System.Drawing.Point(498, 240) Me.TextEdit4.MenuManager = Me.RibbonControl1 Me.TextEdit4.Name = "TextEdit4" Me.TextEdit4.Size = New System.Drawing.Size(394, 20) @@ -1045,7 +1040,7 @@ Partial Class frmAdmin_Globix 'CONNECTION_IDTextBox ' Me.CONNECTION_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "CONNECTION_ID", True)) - Me.CONNECTION_IDTextBox.Location = New System.Drawing.Point(97, 168) + Me.CONNECTION_IDTextBox.Location = New System.Drawing.Point(97, 173) Me.CONNECTION_IDTextBox.Name = "CONNECTION_IDTextBox" Me.CONNECTION_IDTextBox.Size = New System.Drawing.Size(20, 20) Me.CONNECTION_IDTextBox.TabIndex = 30 @@ -1053,7 +1048,7 @@ Partial Class frmAdmin_Globix 'SQL_RESULTTextBox ' Me.SQL_RESULTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "SQL_RESULT", True)) - Me.SQL_RESULTTextBox.Location = New System.Drawing.Point(206, 168) + Me.SQL_RESULTTextBox.Location = New System.Drawing.Point(206, 173) Me.SQL_RESULTTextBox.Name = "SQL_RESULTTextBox" Me.SQL_RESULTTextBox.Size = New System.Drawing.Size(689, 20) Me.SQL_RESULTTextBox.TabIndex = 29 @@ -1064,7 +1059,7 @@ Partial Class frmAdmin_Globix Me.WD_INDEXComboBox.DataSource = Me.VWIDB_BE_ATTRIBUTEBindingSource Me.WD_INDEXComboBox.DisplayMember = "ATTR_TITLE" Me.WD_INDEXComboBox.FormattingEnabled = True - Me.WD_INDEXComboBox.Location = New System.Drawing.Point(530, 42) + Me.WD_INDEXComboBox.Location = New System.Drawing.Point(530, 52) Me.WD_INDEXComboBox.Name = "WD_INDEXComboBox" Me.WD_INDEXComboBox.Size = New System.Drawing.Size(365, 21) Me.WD_INDEXComboBox.TabIndex = 28 @@ -1078,7 +1073,7 @@ Partial Class frmAdmin_Globix 'VKT_ADD_ITEMCheckBox ' Me.VKT_ADD_ITEMCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "VKT_ADD_ITEM", True)) - Me.VKT_ADD_ITEMCheckBox.Location = New System.Drawing.Point(635, 102) + Me.VKT_ADD_ITEMCheckBox.Location = New System.Drawing.Point(635, 107) Me.VKT_ADD_ITEMCheckBox.Name = "VKT_ADD_ITEMCheckBox" Me.VKT_ADD_ITEMCheckBox.Size = New System.Drawing.Size(260, 20) Me.VKT_ADD_ITEMCheckBox.TabIndex = 14 @@ -1088,7 +1083,7 @@ Partial Class frmAdmin_Globix 'VKT_PREVENT_MULTIPLE_VALUESCheckBox ' Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "VKT_PREVENT_MULTIPLE_VALUES", True)) - Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Location = New System.Drawing.Point(446, 102) + Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Location = New System.Drawing.Point(446, 107) Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Name = "VKT_PREVENT_MULTIPLE_VALUESCheckBox" Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Size = New System.Drawing.Size(185, 20) Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.TabIndex = 13 @@ -1098,7 +1093,7 @@ Partial Class frmAdmin_Globix 'MULTISELECTCheckBox ' Me.MULTISELECTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "MULTISELECT", True)) - Me.MULTISELECTCheckBox.Location = New System.Drawing.Point(232, 102) + Me.MULTISELECTCheckBox.Location = New System.Drawing.Point(232, 107) Me.MULTISELECTCheckBox.Name = "MULTISELECTCheckBox" Me.MULTISELECTCheckBox.Size = New System.Drawing.Size(210, 20) Me.MULTISELECTCheckBox.TabIndex = 12 @@ -1109,7 +1104,7 @@ Partial Class frmAdmin_Globix ' Me.btneditSQLmanIndex.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.editdatasource Me.btneditSQLmanIndex.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) - Me.btneditSQLmanIndex.Location = New System.Drawing.Point(12, 132) + Me.btneditSQLmanIndex.Location = New System.Drawing.Point(12, 137) Me.btneditSQLmanIndex.Name = "btneditSQLmanIndex" Me.btneditSQLmanIndex.Padding = New System.Windows.Forms.Padding(5) Me.btneditSQLmanIndex.Size = New System.Drawing.Size(883, 32) @@ -1121,7 +1116,7 @@ Partial Class frmAdmin_Globix ' Me.TextEditAddedWho_ManIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "ADDED_WHO", True)) Me.TextEditAddedWho_ManIndex.Enabled = False - Me.TextEditAddedWho_ManIndex.Location = New System.Drawing.Point(100, 205) + Me.TextEditAddedWho_ManIndex.Location = New System.Drawing.Point(100, 210) Me.TextEditAddedWho_ManIndex.MenuManager = Me.RibbonControl1 Me.TextEditAddedWho_ManIndex.Name = "TextEditAddedWho_ManIndex" Me.TextEditAddedWho_ManIndex.Size = New System.Drawing.Size(303, 20) @@ -1131,7 +1126,7 @@ Partial Class frmAdmin_Globix 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "ADDED_WHEN", True)) - Me.TextEdit2.Location = New System.Drawing.Point(100, 235) + Me.TextEdit2.Location = New System.Drawing.Point(100, 240) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" Me.TextEdit2.Size = New System.Drawing.Size(303, 20) @@ -1141,7 +1136,7 @@ Partial Class frmAdmin_Globix 'TextEditChangedWho_ManIndex ' Me.TextEditChangedWho_ManIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "CHANGED_WHO", True)) - Me.TextEditChangedWho_ManIndex.Location = New System.Drawing.Point(498, 205) + Me.TextEditChangedWho_ManIndex.Location = New System.Drawing.Point(498, 210) Me.TextEditChangedWho_ManIndex.MenuManager = Me.RibbonControl1 Me.TextEditChangedWho_ManIndex.Name = "TextEditChangedWho_ManIndex" Me.TextEditChangedWho_ManIndex.Size = New System.Drawing.Size(394, 20) @@ -1171,7 +1166,7 @@ Partial Class frmAdmin_Globix 'TextEdit11 ' Me.TextEdit11.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "COMMENT", True)) - Me.TextEdit11.Location = New System.Drawing.Point(100, 75) + Me.TextEdit11.Location = New System.Drawing.Point(100, 80) Me.TextEdit11.MenuManager = Me.RibbonControl1 Me.TextEdit11.Name = "TextEdit11" Me.TextEdit11.Size = New System.Drawing.Size(792, 20) @@ -1193,7 +1188,7 @@ Partial Class frmAdmin_Globix 'ComboBoxEdit4 ' Me.ComboBoxEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_INDEX_MANBindingSource, "DATATYPE", True)) - Me.ComboBoxEdit4.Location = New System.Drawing.Point(100, 105) + Me.ComboBoxEdit4.Location = New System.Drawing.Point(100, 110) Me.ComboBoxEdit4.MenuManager = Me.RibbonControl1 Me.ComboBoxEdit4.Name = "ComboBoxEdit4" Me.ComboBoxEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -1205,22 +1200,22 @@ Partial Class frmAdmin_Globix 'ACTIVECheckBox2 ' Me.ACTIVECheckBox2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_INDEX_MANBindingSource, "ACTIVE", True)) - Me.ACTIVECheckBox2.Location = New System.Drawing.Point(445, 12) + Me.ACTIVECheckBox2.Location = New System.Drawing.Point(307, 15) Me.ACTIVECheckBox2.MenuManager = Me.RibbonControl1 Me.ACTIVECheckBox2.Name = "ACTIVECheckBox2" Me.ACTIVECheckBox2.Properties.Caption = "Aktiv" - Me.ACTIVECheckBox2.Size = New System.Drawing.Size(207, 20) + Me.ACTIVECheckBox2.Size = New System.Drawing.Size(341, 20) Me.ACTIVECheckBox2.StyleController = Me.LayoutControlManIndexe Me.ACTIVECheckBox2.TabIndex = 33 ' 'OPTIONALCheckBox2 ' Me.OPTIONALCheckBox2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_INDEX_MANBindingSource, "OPTIONAL", True)) - Me.OPTIONALCheckBox2.Location = New System.Drawing.Point(656, 12) + Me.OPTIONALCheckBox2.Location = New System.Drawing.Point(658, 15) Me.OPTIONALCheckBox2.MenuManager = Me.RibbonControl1 Me.OPTIONALCheckBox2.Name = "OPTIONALCheckBox2" Me.OPTIONALCheckBox2.Properties.Caption = "Optional" - Me.OPTIONALCheckBox2.Size = New System.Drawing.Size(239, 20) + Me.OPTIONALCheckBox2.Size = New System.Drawing.Size(234, 20) Me.OPTIONALCheckBox2.StyleController = Me.LayoutControlManIndexe Me.OPTIONALCheckBox2.TabIndex = 34 ' @@ -1230,13 +1225,13 @@ Partial Class frmAdmin_Globix Me.LayoutControlGroupDoctype.GroupBordersVisible = False Me.LayoutControlGroupDoctype.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem17, Me.LayoutControlItem19, Me.LayoutControlItem21, Me.LayoutControlItem6, Me.LayoutControlItem24, Me.LayoutControlItem2, Me.LayoutControlItem8, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlItem9, Me.LayoutControlItem27, Me.LayoutControlItem29, Me.LayoutControlItem16, Me.LayoutControlItem31, Me.LayoutControlItem18, Me.EmptySpaceItem6, Me.LayoutControlItem46, Me.LayoutControlItem63, Me.LayoutControlItem64, Me.EmptySpaceItem2}) Me.LayoutControlGroupDoctype.Name = "LayoutControlGroupDoctype" - Me.LayoutControlGroupDoctype.Size = New System.Drawing.Size(907, 270) + Me.LayoutControlGroupDoctype.Size = New System.Drawing.Size(907, 275) Me.LayoutControlGroupDoctype.TextVisible = False ' 'LayoutControlItem17 ' Me.LayoutControlItem17.Control = Me.MULTISELECTCheckBox - Me.LayoutControlItem17.Location = New System.Drawing.Point(220, 90) + Me.LayoutControlItem17.Location = New System.Drawing.Point(220, 95) Me.LayoutControlItem17.Name = "LayoutControlItem17" Me.LayoutControlItem17.Size = New System.Drawing.Size(214, 30) Me.LayoutControlItem17.Text = "MULTISELECT:" @@ -1246,7 +1241,7 @@ Partial Class frmAdmin_Globix 'LayoutControlItem19 ' Me.LayoutControlItem19.Control = Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox - Me.LayoutControlItem19.Location = New System.Drawing.Point(434, 90) + Me.LayoutControlItem19.Location = New System.Drawing.Point(434, 95) Me.LayoutControlItem19.Name = "LayoutControlItem19" Me.LayoutControlItem19.Size = New System.Drawing.Size(189, 30) Me.LayoutControlItem19.Text = "VKT PREVENT MULTIPLE VALUES:" @@ -1256,7 +1251,7 @@ Partial Class frmAdmin_Globix 'LayoutControlItem21 ' Me.LayoutControlItem21.Control = Me.VKT_ADD_ITEMCheckBox - Me.LayoutControlItem21.Location = New System.Drawing.Point(623, 90) + Me.LayoutControlItem21.Location = New System.Drawing.Point(623, 95) Me.LayoutControlItem21.Name = "LayoutControlItem21" Me.LayoutControlItem21.Size = New System.Drawing.Size(264, 30) Me.LayoutControlItem21.Text = "VKT ADD ITEM:" @@ -1266,7 +1261,7 @@ Partial Class frmAdmin_Globix 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.btneditSQLmanIndex - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 120) + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 125) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Size = New System.Drawing.Size(887, 36) Me.LayoutControlItem6.Text = "SQL Abfrage bearbeiten" @@ -1279,7 +1274,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem24.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem24.Control = Me.TextEditAddedWho_ManIndex Me.LayoutControlItem24.Enabled = False - Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 190) + Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 195) Me.LayoutControlItem24.Name = "LayoutControlItem24" Me.LayoutControlItem24.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem24.Size = New System.Drawing.Size(398, 30) @@ -1304,14 +1299,14 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 30) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem8.Size = New System.Drawing.Size(433, 30) + Me.LayoutControlItem8.Size = New System.Drawing.Size(433, 35) Me.LayoutControlItem8.Text = "Bezeichnung" Me.LayoutControlItem8.TextSize = New System.Drawing.Size(73, 13) ' 'LayoutControlItem11 ' Me.LayoutControlItem11.Control = Me.TextEdit11 - Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 60) + Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 65) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem11.Size = New System.Drawing.Size(887, 30) @@ -1321,7 +1316,7 @@ Partial Class frmAdmin_Globix 'LayoutControlItem13 ' Me.LayoutControlItem13.Control = Me.ComboBoxEdit4 - Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 90) + Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 95) Me.LayoutControlItem13.Name = "LayoutControlItem13" Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem13.Size = New System.Drawing.Size(220, 30) @@ -1344,7 +1339,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem27.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem27.Control = Me.TextEdit2 Me.LayoutControlItem27.Enabled = False - Me.LayoutControlItem27.Location = New System.Drawing.Point(0, 220) + Me.LayoutControlItem27.Location = New System.Drawing.Point(0, 225) Me.LayoutControlItem27.Name = "LayoutControlItem27" Me.LayoutControlItem27.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem27.Size = New System.Drawing.Size(398, 30) @@ -1357,7 +1352,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem29.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem29.Control = Me.TextEditChangedWho_ManIndex Me.LayoutControlItem29.Enabled = False - Me.LayoutControlItem29.Location = New System.Drawing.Point(398, 190) + Me.LayoutControlItem29.Location = New System.Drawing.Point(398, 195) Me.LayoutControlItem29.Name = "LayoutControlItem29" Me.LayoutControlItem29.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem29.Size = New System.Drawing.Size(489, 30) @@ -1367,9 +1362,9 @@ Partial Class frmAdmin_Globix 'LayoutControlItem16 ' Me.LayoutControlItem16.Control = Me.WD_INDEXComboBox - Me.LayoutControlItem16.Location = New System.Drawing.Point(433, 30) + Me.LayoutControlItem16.Location = New System.Drawing.Point(433, 40) Me.LayoutControlItem16.Name = "LayoutControlItem16" - Me.LayoutControlItem16.Size = New System.Drawing.Size(454, 30) + Me.LayoutControlItem16.Size = New System.Drawing.Size(454, 25) Me.LayoutControlItem16.Text = "Attribut" Me.LayoutControlItem16.TextSize = New System.Drawing.Size(73, 13) ' @@ -1378,7 +1373,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem31.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LayoutControlItem31.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem31.Control = Me.CONNECTION_IDTextBox - Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 156) + Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 161) Me.LayoutControlItem31.Name = "LayoutControlItem31" Me.LayoutControlItem31.Size = New System.Drawing.Size(109, 24) Me.LayoutControlItem31.Text = "ConnId:" @@ -1389,7 +1384,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem18.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LayoutControlItem18.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem18.Control = Me.SQL_RESULTTextBox - Me.LayoutControlItem18.Location = New System.Drawing.Point(109, 156) + Me.LayoutControlItem18.Location = New System.Drawing.Point(109, 161) Me.LayoutControlItem18.Name = "LayoutControlItem18" Me.LayoutControlItem18.Size = New System.Drawing.Size(778, 24) Me.LayoutControlItem18.Text = "SQL:" @@ -1398,7 +1393,7 @@ Partial Class frmAdmin_Globix 'EmptySpaceItem6 ' Me.EmptySpaceItem6.AllowHotTrack = False - Me.EmptySpaceItem6.Location = New System.Drawing.Point(0, 180) + Me.EmptySpaceItem6.Location = New System.Drawing.Point(0, 185) Me.EmptySpaceItem6.Name = "EmptySpaceItem6" Me.EmptySpaceItem6.Size = New System.Drawing.Size(887, 10) Me.EmptySpaceItem6.TextSize = New System.Drawing.Size(0, 0) @@ -1409,7 +1404,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem46.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem46.Control = Me.TextEdit4 Me.LayoutControlItem46.Enabled = False - Me.LayoutControlItem46.Location = New System.Drawing.Point(398, 220) + Me.LayoutControlItem46.Location = New System.Drawing.Point(398, 225) Me.LayoutControlItem46.Name = "LayoutControlItem46" Me.LayoutControlItem46.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem46.Size = New System.Drawing.Size(489, 30) @@ -1419,21 +1414,42 @@ Partial Class frmAdmin_Globix 'LayoutControlItem63 ' Me.LayoutControlItem63.Control = Me.ACTIVECheckBox2 - Me.LayoutControlItem63.Location = New System.Drawing.Point(433, 0) + Me.LayoutControlItem63.Location = New System.Drawing.Point(292, 0) Me.LayoutControlItem63.Name = "LayoutControlItem63" - Me.LayoutControlItem63.Size = New System.Drawing.Size(211, 30) + Me.LayoutControlItem63.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem63.Size = New System.Drawing.Size(351, 30) Me.LayoutControlItem63.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem63.TextVisible = False ' 'LayoutControlItem64 ' Me.LayoutControlItem64.Control = Me.OPTIONALCheckBox2 - Me.LayoutControlItem64.Location = New System.Drawing.Point(644, 0) + Me.LayoutControlItem64.Location = New System.Drawing.Point(643, 0) Me.LayoutControlItem64.Name = "LayoutControlItem64" - Me.LayoutControlItem64.Size = New System.Drawing.Size(243, 30) + Me.LayoutControlItem64.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem64.Size = New System.Drawing.Size(244, 30) Me.LayoutControlItem64.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem64.TextVisible = False ' + 'EmptySpaceItem2 + ' + Me.EmptySpaceItem2.AllowHotTrack = False + Me.EmptySpaceItem2.Location = New System.Drawing.Point(433, 30) + Me.EmptySpaceItem2.Name = "EmptySpaceItem2" + Me.EmptySpaceItem2.Size = New System.Drawing.Size(454, 10) + Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) + ' + 'ListBoxAutoIndexe + ' + Me.ListBoxAutoIndexe.DataSource = Me.TBDD_INDEX_MANBindingSource + Me.ListBoxAutoIndexe.DisplayMember = "NAME" + Me.ListBoxAutoIndexe.Dock = System.Windows.Forms.DockStyle.Left + Me.ListBoxAutoIndexe.Location = New System.Drawing.Point(0, 0) + Me.ListBoxAutoIndexe.Name = "ListBoxAutoIndexe" + Me.ListBoxAutoIndexe.Size = New System.Drawing.Size(187, 267) + Me.ListBoxAutoIndexe.TabIndex = 2 + Me.ListBoxAutoIndexe.ValueMember = "GUID" + ' 'XtraTabPageRework ' Me.XtraTabPageRework.Controls.Add(Me.LayoutControlRework) @@ -1515,9 +1531,9 @@ Partial Class frmAdmin_Globix Me.CONNECTION_IDTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "CONNECTION_ID", True)) Me.CONNECTION_IDTextBox1.Enabled = False Me.CONNECTION_IDTextBox1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CONNECTION_IDTextBox1.Location = New System.Drawing.Point(350, 142) + Me.CONNECTION_IDTextBox1.Location = New System.Drawing.Point(352, 142) Me.CONNECTION_IDTextBox1.Name = "CONNECTION_IDTextBox1" - Me.CONNECTION_IDTextBox1.Size = New System.Drawing.Size(26, 20) + Me.CONNECTION_IDTextBox1.Size = New System.Drawing.Size(24, 20) Me.CONNECTION_IDTextBox1.TabIndex = 23 ' 'SQL_RESULTTextBox1 @@ -1543,9 +1559,9 @@ Partial Class frmAdmin_Globix 'VALUETextBox ' Me.VALUETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "VALUE", True)) - Me.VALUETextBox.Location = New System.Drawing.Point(361, 76) + Me.VALUETextBox.Location = New System.Drawing.Point(369, 76) Me.VALUETextBox.Name = "VALUETextBox" - Me.VALUETextBox.Size = New System.Drawing.Size(185, 20) + Me.VALUETextBox.Size = New System.Drawing.Size(177, 20) Me.VALUETextBox.TabIndex = 9 ' 'INDEXNAMEComboBox @@ -1554,9 +1570,9 @@ Partial Class frmAdmin_Globix Me.INDEXNAMEComboBox.DataSource = Me.VWIDB_BE_ATTRIBUTEBindingSource Me.INDEXNAMEComboBox.DisplayMember = "ATTR_TITLE" Me.INDEXNAMEComboBox.FormattingEnabled = True - Me.INDEXNAMEComboBox.Location = New System.Drawing.Point(361, 45) + Me.INDEXNAMEComboBox.Location = New System.Drawing.Point(369, 45) Me.INDEXNAMEComboBox.Name = "INDEXNAMEComboBox" - Me.INDEXNAMEComboBox.Size = New System.Drawing.Size(384, 21) + Me.INDEXNAMEComboBox.Size = New System.Drawing.Size(376, 21) Me.INDEXNAMEComboBox.TabIndex = 8 ' 'ACTIVECheckBox1 @@ -1572,19 +1588,19 @@ Partial Class frmAdmin_Globix 'SEQUENCENumericUpDown1 ' Me.SEQUENCENumericUpDown1.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_INDEX_AUTOMBindingSource, "SEQUENCE", True)) - Me.SEQUENCENumericUpDown1.Location = New System.Drawing.Point(463, 15) + Me.SEQUENCENumericUpDown1.Location = New System.Drawing.Point(469, 15) Me.SEQUENCENumericUpDown1.Name = "SEQUENCENumericUpDown1" - Me.SEQUENCENumericUpDown1.Size = New System.Drawing.Size(52, 21) + Me.SEQUENCENumericUpDown1.Size = New System.Drawing.Size(46, 22) Me.SEQUENCENumericUpDown1.TabIndex = 6 ' 'GUIDTextBoxAutoAttribute ' Me.GUIDTextBoxAutoAttribute.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "GUID", True)) Me.GUIDTextBoxAutoAttribute.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GUIDTextBoxAutoAttribute.Location = New System.Drawing.Point(361, 15) + Me.GUIDTextBoxAutoAttribute.Location = New System.Drawing.Point(369, 15) Me.GUIDTextBoxAutoAttribute.Name = "GUIDTextBoxAutoAttribute" Me.GUIDTextBoxAutoAttribute.ReadOnly = True - Me.GUIDTextBoxAutoAttribute.Size = New System.Drawing.Size(30, 20) + Me.GUIDTextBoxAutoAttribute.Size = New System.Drawing.Size(22, 20) Me.GUIDTextBoxAutoAttribute.TabIndex = 5 ' 'SimpleButton1 @@ -1601,12 +1617,12 @@ Partial Class frmAdmin_Globix ' 'ComboBoxEditAAttrFileParam ' - Me.ComboBoxEditAAttrFileParam.Location = New System.Drawing.Point(836, 76) + Me.ComboBoxEditAAttrFileParam.Location = New System.Drawing.Point(844, 76) Me.ComboBoxEditAAttrFileParam.MenuManager = Me.RibbonControl1 Me.ComboBoxEditAAttrFileParam.Name = "ComboBoxEditAAttrFileParam" Me.ComboBoxEditAAttrFileParam.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.ComboBoxEditAAttrFileParam.Properties.Items.AddRange(New Object() {"FILENAME_EXT", "FILENAME", "EXTENSION", "DATE_CREATED", "DATE_MODIFIED"}) - Me.ComboBoxEditAAttrFileParam.Size = New System.Drawing.Size(260, 20) + Me.ComboBoxEditAAttrFileParam.Size = New System.Drawing.Size(252, 20) Me.ComboBoxEditAAttrFileParam.StyleController = Me.LayoutControlAutoIndexe Me.ComboBoxEditAAttrFileParam.TabIndex = 11 ' @@ -1625,12 +1641,12 @@ Partial Class frmAdmin_Globix ' Me.ADDED_WHOTextBoxAutoAttribut.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "ADDED_WHO", True)) Me.ADDED_WHOTextBoxAutoAttribut.Enabled = False - Me.ADDED_WHOTextBoxAutoAttribut.Location = New System.Drawing.Point(361, 202) + Me.ADDED_WHOTextBoxAutoAttribut.Location = New System.Drawing.Point(369, 202) Me.ADDED_WHOTextBoxAutoAttribut.MenuManager = Me.RibbonControl1 Me.ADDED_WHOTextBoxAutoAttribut.Name = "ADDED_WHOTextBoxAutoAttribut" Me.ADDED_WHOTextBoxAutoAttribut.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.ADDED_WHOTextBoxAutoAttribut.Properties.Appearance.Options.UseFont = True - Me.ADDED_WHOTextBoxAutoAttribut.Size = New System.Drawing.Size(279, 20) + Me.ADDED_WHOTextBoxAutoAttribut.Size = New System.Drawing.Size(271, 20) Me.ADDED_WHOTextBoxAutoAttribut.StyleController = Me.LayoutControlAutoIndexe Me.ADDED_WHOTextBoxAutoAttribut.TabIndex = 19 ' @@ -1638,12 +1654,12 @@ Partial Class frmAdmin_Globix ' Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "ADDED_WHEN", True)) Me.TextEdit3.Enabled = False - Me.TextEdit3.Location = New System.Drawing.Point(361, 232) + Me.TextEdit3.Location = New System.Drawing.Point(369, 232) Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" Me.TextEdit3.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEdit3.Properties.Appearance.Options.UseFont = True - Me.TextEdit3.Size = New System.Drawing.Size(279, 20) + Me.TextEdit3.Size = New System.Drawing.Size(271, 20) Me.TextEdit3.StyleController = Me.LayoutControlAutoIndexe Me.TextEdit3.TabIndex = 20 ' @@ -1651,24 +1667,24 @@ Partial Class frmAdmin_Globix ' Me.CHANGED_WHOTextEditAutoAttribut.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "CHANGED_WHO", True)) Me.CHANGED_WHOTextEditAutoAttribut.EditValue = "" - Me.CHANGED_WHOTextEditAutoAttribut.Location = New System.Drawing.Point(817, 202) + Me.CHANGED_WHOTextEditAutoAttribut.Location = New System.Drawing.Point(825, 202) Me.CHANGED_WHOTextEditAutoAttribut.MenuManager = Me.RibbonControl1 Me.CHANGED_WHOTextEditAutoAttribut.Name = "CHANGED_WHOTextEditAutoAttribut" Me.CHANGED_WHOTextEditAutoAttribut.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CHANGED_WHOTextEditAutoAttribut.Properties.Appearance.Options.UseFont = True - Me.CHANGED_WHOTextEditAutoAttribut.Size = New System.Drawing.Size(279, 20) + Me.CHANGED_WHOTextEditAutoAttribut.Size = New System.Drawing.Size(271, 20) Me.CHANGED_WHOTextEditAutoAttribut.StyleController = Me.LayoutControlAutoIndexe Me.CHANGED_WHOTextEditAutoAttribut.TabIndex = 21 ' 'TextEdit5 ' Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit5.Location = New System.Drawing.Point(817, 232) + Me.TextEdit5.Location = New System.Drawing.Point(825, 232) Me.TextEdit5.MenuManager = Me.RibbonControl1 Me.TextEdit5.Name = "TextEdit5" Me.TextEdit5.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEdit5.Properties.Appearance.Options.UseFont = True - Me.TextEdit5.Size = New System.Drawing.Size(279, 20) + Me.TextEdit5.Size = New System.Drawing.Size(271, 20) Me.TextEdit5.StyleController = Me.LayoutControlAutoIndexe Me.TextEdit5.TabIndex = 22 ' @@ -1689,7 +1705,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem15.Size = New System.Drawing.Size(207, 30) Me.LayoutControlItem15.Text = "ID" - Me.LayoutControlItem15.TextSize = New System.Drawing.Size(155, 13) + Me.LayoutControlItem15.TextSize = New System.Drawing.Size(163, 13) ' 'LayoutControlItem23 ' @@ -1700,7 +1716,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem23.Size = New System.Drawing.Size(124, 30) Me.LayoutControlItem23.Text = "Reihenfolge" Me.LayoutControlItem23.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize - Me.LayoutControlItem23.TextSize = New System.Drawing.Size(57, 13) + Me.LayoutControlItem23.TextSize = New System.Drawing.Size(63, 13) Me.LayoutControlItem23.TextToControlDistance = 5 ' 'LayoutControlItem33 @@ -1721,7 +1737,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem34.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem34.Size = New System.Drawing.Size(561, 31) Me.LayoutControlItem34.Text = "Attribut" - Me.LayoutControlItem34.TextSize = New System.Drawing.Size(155, 13) + Me.LayoutControlItem34.TextSize = New System.Drawing.Size(163, 13) ' 'LayoutControlItem35 ' @@ -1733,7 +1749,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem35.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem35.Size = New System.Drawing.Size(362, 40) Me.LayoutControlItem35.Text = "Fester oder Automatischer Wert" - Me.LayoutControlItem35.TextSize = New System.Drawing.Size(155, 13) + Me.LayoutControlItem35.TextSize = New System.Drawing.Size(163, 13) ' 'LayoutControlItem14 ' @@ -1765,7 +1781,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem37.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem37.Size = New System.Drawing.Size(437, 40) Me.LayoutControlItem37.Text = "FILE-Parameter" - Me.LayoutControlItem37.TextSize = New System.Drawing.Size(155, 13) + Me.LayoutControlItem37.TextSize = New System.Drawing.Size(163, 13) ' 'LayoutControlItem39 ' @@ -1804,7 +1820,7 @@ Partial Class frmAdmin_Globix Me.ADDED_WHOAutoAttribut.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.ADDED_WHOAutoAttribut.Size = New System.Drawing.Size(456, 30) Me.ADDED_WHOAutoAttribut.Text = "Erstellt wer" - Me.ADDED_WHOAutoAttribut.TextSize = New System.Drawing.Size(155, 13) + Me.ADDED_WHOAutoAttribut.TextSize = New System.Drawing.Size(163, 13) ' 'LayoutControlItem41 ' @@ -1814,7 +1830,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem41.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem41.Size = New System.Drawing.Size(456, 30) Me.LayoutControlItem41.Text = "Erstellt wann" - Me.LayoutControlItem41.TextSize = New System.Drawing.Size(155, 13) + Me.LayoutControlItem41.TextSize = New System.Drawing.Size(163, 13) ' 'CHANGED_WHOItemAutoAttribut ' @@ -1824,7 +1840,7 @@ Partial Class frmAdmin_Globix Me.CHANGED_WHOItemAutoAttribut.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.CHANGED_WHOItemAutoAttribut.Size = New System.Drawing.Size(456, 30) Me.CHANGED_WHOItemAutoAttribut.Text = "Geändert wer" - Me.CHANGED_WHOItemAutoAttribut.TextSize = New System.Drawing.Size(155, 13) + Me.CHANGED_WHOItemAutoAttribut.TextSize = New System.Drawing.Size(163, 13) ' 'LayoutControlItem43 ' @@ -1834,7 +1850,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem43.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem43.Size = New System.Drawing.Size(456, 30) Me.LayoutControlItem43.Text = "Geändert wann" - Me.LayoutControlItem43.TextSize = New System.Drawing.Size(155, 13) + Me.LayoutControlItem43.TextSize = New System.Drawing.Size(163, 13) ' 'LayoutControlItem45 ' @@ -1845,7 +1861,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem45.Size = New System.Drawing.Size(84, 30) Me.LayoutControlItem45.Text = "Conn ID:" Me.LayoutControlItem45.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize - Me.LayoutControlItem45.TextSize = New System.Drawing.Size(43, 13) + Me.LayoutControlItem45.TextSize = New System.Drawing.Size(45, 13) Me.LayoutControlItem45.TextToControlDistance = 5 ' 'LayoutControlItem44 @@ -2071,10 +2087,10 @@ Partial Class frmAdmin_Globix ' Me.ChangedWhenAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "CHANGED_WHEN", True)) Me.ChangedWhenAutoSelect.Enabled = False - Me.ChangedWhenAutoSelect.Location = New System.Drawing.Point(505, 117) + Me.ChangedWhenAutoSelect.Location = New System.Drawing.Point(511, 117) Me.ChangedWhenAutoSelect.MenuManager = Me.RibbonControl1 Me.ChangedWhenAutoSelect.Name = "ChangedWhenAutoSelect" - Me.ChangedWhenAutoSelect.Size = New System.Drawing.Size(272, 20) + Me.ChangedWhenAutoSelect.Size = New System.Drawing.Size(266, 20) Me.ChangedWhenAutoSelect.StyleController = Me.LayoutControl2 Me.ChangedWhenAutoSelect.TabIndex = 16 ' @@ -2087,10 +2103,10 @@ Partial Class frmAdmin_Globix ' Me.TextEdit8.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "ADDED_WHEN", True)) Me.TextEdit8.Enabled = False - Me.TextEdit8.Location = New System.Drawing.Point(119, 117) + Me.TextEdit8.Location = New System.Drawing.Point(125, 117) Me.TextEdit8.MenuManager = Me.RibbonControl1 Me.TextEdit8.Name = "TextEdit8" - Me.TextEdit8.Size = New System.Drawing.Size(272, 20) + Me.TextEdit8.Size = New System.Drawing.Size(266, 20) Me.TextEdit8.StyleController = Me.LayoutControl2 Me.TextEdit8.TabIndex = 15 ' @@ -2098,10 +2114,10 @@ Partial Class frmAdmin_Globix ' Me.AddedWhoAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "ADDED_WHO", True)) Me.AddedWhoAutoSelect.Enabled = False - Me.AddedWhoAutoSelect.Location = New System.Drawing.Point(119, 87) + Me.AddedWhoAutoSelect.Location = New System.Drawing.Point(125, 87) Me.AddedWhoAutoSelect.MenuManager = Me.RibbonControl1 Me.AddedWhoAutoSelect.Name = "AddedWhoAutoSelect" - Me.AddedWhoAutoSelect.Size = New System.Drawing.Size(272, 20) + Me.AddedWhoAutoSelect.Size = New System.Drawing.Size(266, 20) Me.AddedWhoAutoSelect.StyleController = Me.LayoutControl2 Me.AddedWhoAutoSelect.TabIndex = 14 ' @@ -2109,18 +2125,18 @@ Partial Class frmAdmin_Globix ' Me.ChangedWhoAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "CHANGED_WHO", True)) Me.ChangedWhoAutoSelect.Enabled = False - Me.ChangedWhoAutoSelect.Location = New System.Drawing.Point(505, 87) + Me.ChangedWhoAutoSelect.Location = New System.Drawing.Point(511, 87) Me.ChangedWhoAutoSelect.MenuManager = Me.RibbonControl1 Me.ChangedWhoAutoSelect.Name = "ChangedWhoAutoSelect" - Me.ChangedWhoAutoSelect.Size = New System.Drawing.Size(272, 20) + Me.ChangedWhoAutoSelect.Size = New System.Drawing.Size(266, 20) Me.ChangedWhoAutoSelect.StyleController = Me.LayoutControl2 Me.ChangedWhoAutoSelect.TabIndex = 13 ' 'txtDateinameTest ' - Me.txtDateinameTest.Location = New System.Drawing.Point(116, 60) + Me.txtDateinameTest.Location = New System.Drawing.Point(122, 60) Me.txtDateinameTest.Name = "txtDateinameTest" - Me.txtDateinameTest.Size = New System.Drawing.Size(664, 20) + Me.txtDateinameTest.Size = New System.Drawing.Size(658, 20) Me.txtDateinameTest.TabIndex = 12 Me.txtDateinameTest.Text = "Example.pdf" ' @@ -2137,18 +2153,18 @@ Partial Class frmAdmin_Globix 'REGEXTextBox ' Me.REGEXTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "REGEX", True)) - Me.REGEXTextBox.Location = New System.Drawing.Point(116, 36) + Me.REGEXTextBox.Location = New System.Drawing.Point(122, 36) Me.REGEXTextBox.Name = "REGEXTextBox" - Me.REGEXTextBox.Size = New System.Drawing.Size(664, 20) + Me.REGEXTextBox.Size = New System.Drawing.Size(658, 20) Me.REGEXTextBox.TabIndex = 6 ' 'GUIDTextBoxAutoSelect ' Me.GUIDTextBoxAutoSelect.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "GUID", True)) - Me.GUIDTextBoxAutoSelect.Location = New System.Drawing.Point(116, 12) + Me.GUIDTextBoxAutoSelect.Location = New System.Drawing.Point(122, 12) Me.GUIDTextBoxAutoSelect.Name = "GUIDTextBoxAutoSelect" Me.GUIDTextBoxAutoSelect.ReadOnly = True - Me.GUIDTextBoxAutoSelect.Size = New System.Drawing.Size(48, 20) + Me.GUIDTextBoxAutoSelect.Size = New System.Drawing.Size(42, 20) Me.GUIDTextBoxAutoSelect.TabIndex = 5 ' 'LayoutControlGroup5 @@ -2167,7 +2183,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem55.Name = "LayoutControlItem55" Me.LayoutControlItem55.Size = New System.Drawing.Size(772, 24) Me.LayoutControlItem55.Text = "Regular Expression" - Me.LayoutControlItem55.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem55.TextSize = New System.Drawing.Size(98, 13) ' 'EmptySpaceItem9 ' @@ -2195,7 +2211,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem54.Name = "LayoutControlItem54" Me.LayoutControlItem54.Size = New System.Drawing.Size(156, 24) Me.LayoutControlItem54.Text = "ID" - Me.LayoutControlItem54.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem54.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem53 ' @@ -2224,7 +2240,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem57.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem57.Size = New System.Drawing.Size(386, 30) Me.LayoutControlItem57.Text = "Erstellt wer" - Me.LayoutControlItem57.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem57.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem59 ' @@ -2236,7 +2252,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem59.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem59.Size = New System.Drawing.Size(386, 145) Me.LayoutControlItem59.Text = "Geändert wann" - Me.LayoutControlItem59.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem59.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem58 ' @@ -2248,7 +2264,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem58.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem58.Size = New System.Drawing.Size(386, 145) Me.LayoutControlItem58.Text = "Erstellt wann" - Me.LayoutControlItem58.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem58.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem56 ' @@ -2260,7 +2276,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem56.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem56.Size = New System.Drawing.Size(386, 30) Me.LayoutControlItem56.Text = "Geändert wer" - Me.LayoutControlItem56.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem56.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem60 ' @@ -2269,7 +2285,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem60.Name = "LayoutControlItem60" Me.LayoutControlItem60.Size = New System.Drawing.Size(772, 24) Me.LayoutControlItem60.Text = "Dateiname für Test" - Me.LayoutControlItem60.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem60.TextSize = New System.Drawing.Size(98, 13) ' 'ListBox2 ' @@ -2687,25 +2703,6 @@ Partial Class frmAdmin_Globix ' Me.VWIDB_DOCTYPE_LANGUAGETableAdapter.ClearBeforeFill = True ' - 'ListBoxAutoIndexe - ' - Me.ListBoxAutoIndexe.DataSource = Me.TBDD_INDEX_MANBindingSource - Me.ListBoxAutoIndexe.DisplayMember = "NAME" - Me.ListBoxAutoIndexe.Dock = System.Windows.Forms.DockStyle.Left - Me.ListBoxAutoIndexe.Location = New System.Drawing.Point(0, 0) - Me.ListBoxAutoIndexe.Name = "ListBoxAutoIndexe" - Me.ListBoxAutoIndexe.Size = New System.Drawing.Size(187, 267) - Me.ListBoxAutoIndexe.TabIndex = 2 - Me.ListBoxAutoIndexe.ValueMember = "GUID" - ' - 'EmptySpaceItem2 - ' - Me.EmptySpaceItem2.AllowHotTrack = False - Me.EmptySpaceItem2.Location = New System.Drawing.Point(561, 0) - Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(326, 30) - Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) - ' 'frmAdmin_Globix ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2742,25 +2739,26 @@ Partial Class frmAdmin_Globix CType(Me.TextEditBezeichnung.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEditDoctypeID.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ComboBoxEditDupl_handling.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEditGeaendertWann.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem32, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem36, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem12, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem61, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl2.ResumeLayout(False) Me.XtraTabPageManIndexe.ResumeLayout(False) @@ -2798,6 +2796,8 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem46, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem63, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem64, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ListBoxAutoIndexe, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageRework.ResumeLayout(False) CType(Me.LayoutControlRework, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit() @@ -2891,8 +2891,6 @@ Partial Class frmAdmin_Globix CType(Me.viewAvailableGroups, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem38, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ListBoxAutoIndexe, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -2917,11 +2915,7 @@ Partial Class frmAdmin_Globix Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl Friend WithEvents XtraTabPageProfile As DevExpress.XtraTab.XtraTabPage Friend WithEvents LayoutControlProfile As DevExpress.XtraLayout.LayoutControl - Friend WithEvents AKTIVCheckBox As CheckBox - Friend WithEvents GEAENDERTWANNTextBox As TextBox Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents LayoutControlItem22 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem36 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents XtraTabControl2 As DevExpress.XtraTab.XtraTabControl Friend WithEvents XtraTabPageManIndexe As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPageRework As DevExpress.XtraTab.XtraTabPage @@ -2980,7 +2974,6 @@ Partial Class frmAdmin_Globix Friend WithEvents VWIDB_OBJECT_STORETableAdapter As DSIDB_StammdatenTableAdapters.VWIDB_OBJECT_STORETableAdapter Friend WithEvents IDB_OBJECT_STORE_IDComboBox As ComboBox Friend WithEvents LayoutControlItem25 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents WD_INDEXComboBox As ComboBox Friend WithEvents LayoutControlItem16 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents VWIDB_BE_ATTRIBUTEBindingSource As BindingSource @@ -3119,4 +3112,8 @@ Partial Class frmAdmin_Globix Friend WithEvents LayoutControlItem64 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents ListBoxAutoIndexe As DevExpress.XtraEditors.ListBoxControl Friend WithEvents EmptySpaceItem2 As DevExpress.XtraLayout.EmptySpaceItem + Friend WithEvents CheckEdit1 As DevExpress.XtraEditors.CheckEdit + Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents TextEditGeaendertWann As DevExpress.XtraEditors.TextEdit + Friend WithEvents LayoutControlItem22 As DevExpress.XtraLayout.LayoutControlItem End Class diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx index 36d31cff..c3704ee2 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx @@ -159,9 +159,6 @@ 350, 17 - - 350, 17 - 17, 17 @@ -212,9 +209,6 @@ NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - 1161, 17 - 752, 56 @@ -282,6 +276,26 @@ MC41LTAuMSwwLjctMC4yYzAuMi0wLjEsMC40LTAuMiwwLjYtMC41YzAuMi0wLjIsMC41LTAuNywxLTEu NEwyMSwyNC4zaC0xLjFsMC4zLTEuNCAgYzAuNi0wLjEsMS4yLTAuMywxLjctMC42SDIyLjV6IiBjbGFz cz0iQmx1ZSIgLz4NCjwvc3ZnPgs= + + + + 17, 95 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFycm93MUxlZnQiPg0KICAgIDxwb2x5Z29uIHBvaW50 + cz0iMjgsMTQgMTQsMTQgMTQsMTMuMyAxNCw2IDQsMTYgMTQsMjYgMTQsMTguNyAxNCwxOCAyOCwxOCAg + IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -305,6 +319,26 @@ MTBoLTR2NGg0VjEweiBNMTQsMTZoLTR2MTJoNFYxNnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQog IDxwYXRoIGQ9Ik0yNSwxNmwtNCw0aDNjMCwyLjItMS44LDQtNCw0di0zbC00LDRsNCw0di0zYzMuMyww LDYtMi43LDYtNmgzTDI1LDE2eiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD + MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls + bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w + LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs + YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw + IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH + cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -323,6 +357,22 @@ MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw== + + + + 511, 95 + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj + aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r + K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml + rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz + xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR + 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh + zQ3o4jAe74EDiAAAAABJRU5ErkJggg== @@ -376,93 +426,6 @@ bDEuOCwxLjNsMS40LTEuNGwtMS4zLTEuOCAgIGMwLjMtMC41LDAuNi0xLjIsMC44LTEuOEwzMCwyNXog TTIyLDI2Yy0xLjEsMC0yLTAuOS0yLTJzMC45LTIsMi0yczIsMC45LDIsMlMyMy4xLDI2LDIyLDI2eiIg Y2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN - YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz - MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 - QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs - MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 - IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x - VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx - LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x - LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM - MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - 246, 56 - - - 752, 56 - - - 17, 95 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFycm93MUxlZnQiPg0KICAgIDxwb2x5Z29uIHBvaW50 - cz0iMjgsMTQgMTQsMTQgMTQsMTMuMyAxNCw2IDQsMTYgMTQsMjYgMTQsMTguNyAxNCwxOCAyOCwxOCAg - IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - 17, 95 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD - MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls - bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w - LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs - YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw - IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH - cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - 511, 95 - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj - aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r - K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml - rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz - xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR - 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh - zQ3o4jAe74EDiAAAAABJRU5ErkJggg== @@ -514,6 +477,28 @@ NFYyNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8L2c+DQogICAgPHJlY3QgeD0iMTgiIHk9IjE4IiB3 aWR0aD0iNCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0K PC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN + YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz + MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 + QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs + MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x + VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx + LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x + LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM + MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb index 9b5c9abe..cdc2bd0a 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb @@ -1,6 +1,6 @@ Imports System.Text.RegularExpressions Imports DevExpress.XtraLayout -Imports DigitalData.Controls.SQLEditor +Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Logging Public Class frmAdmin_Globix @@ -10,8 +10,8 @@ Public Class frmAdmin_Globix Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey Public Property GlobixHelper As ClassGIDatatables - Private AttributesManual As List(Of String) - Private AttributesAutomatic As List(Of String) + Private AttributesManual As new Dictionary(Of String, String) + Private AttributesAutomatic As New Dictionary(Of String, String) Private Pages As ClassDetailPageManager Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) @@ -120,10 +120,9 @@ Public Class frmAdmin_Globix TBDD_INDEX_MANTableAdapter.Fill(GlobixDataset.TBDD_INDEX_MAN, PrimaryKey) - AttributesManual = GlobixDataset.TBDD_INDEX_MAN. - Cast(Of DataRow). - Select(Of String)(Function(row) row.Item("NAME")). - ToList() + AttributesManual = GlobixDataset.TBDD_INDEX_MAN.Cast(Of DataRow). + ToDictionary(Of String, String)(Function(row) row.Item("NAME"), Function(row) row.Item("WD_INDEX")) + Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Load IndexeManuell: ") @@ -138,10 +137,8 @@ Public Class frmAdmin_Globix TBDD_INDEX_AUTOMTableAdapter.Fill(GlobixDataset.TBDD_INDEX_AUTOM, PrimaryKey) - AttributesAutomatic = GlobixDataset.TBDD_INDEX_AUTOM. - Cast(Of DataRow). - Select(Of String)(Function(row) row.Item("NAME")). - ToList() + AttributesAutomatic = GlobixDataset.TBDD_INDEX_AUTOM.Cast(Of DataRow). + ToDictionary(Of String, String)(Function(row) row.Item("NAME"), Function(row) row.Item("WD_INDEX")) Catch ex As Exception MessageBox.Show(ex.Message) @@ -273,7 +270,7 @@ Public Class frmAdmin_Globix ,[WINDREAM_DIRECT] ,[FOLDER_FOR_INDEX] ,[DUPLICATE_HANDLING],[AKTIV],[LANGUAGE], [SEQUENCE],[NAMENKONVENTION],[ERSTELLTWER],IDB_OBJECT_STORE_ID) VALUES ('{TextEditBezeichnung.Text}','IDB_DRIVEN',1,{IDB_DOCTYPE_IDComboBox.SelectedValue},'IDB_STORE','{TextEditBeschreibung.Text}' - ,'False','{FOLDER_FOR_INDEXTextEdit.Text}','{ComboBoxEditDupl_handling.EditValue}' ,'{AKTIVCheckBox.Checked}','{My.Application.User.Language}' + ,'False','{FOLDER_FOR_INDEXTextEdit.Text}','{ComboBoxEditDupl_handling.EditValue}' ,'{CheckEdit1.Checked}','{My.Application.User.Language}' , {SEQUENCENumericUpDown.Value},'{TextEditNamenkonvention.Text}','{My.Application.User.UserName}',{IDB_OBJECT_STORE_IDComboBox.SelectedValue})" If My.DatabaseECM.ExecuteNonQuery(oIns) = True Then Dim oSQL = $"SELECT GUID FROM TBDD_DOKUMENTART WHERE BEZEICHNUNG = '{TextEditBezeichnung.Text}'" @@ -295,7 +292,7 @@ Public Class frmAdmin_Globix Private Function Update_Doctype() As Boolean Try Dim oUpd = $"UPDATE TBDD_DOKUMENTART SET [BEZEICHNUNG] = '{TextEditBezeichnung.Text}' ,[IDB_DOCTYPE_ID] = {IDB_DOCTYPE_IDComboBox.SelectedValue} ,[BESCHREIBUNG] = '{TextEditBeschreibung.Text}' - ,[DUPLICATE_HANDLING] = '{ComboBoxEditDupl_handling.EditValue}',[AKTIV] = '{AKTIVCheckBox.Checked}',[SEQUENCE] = {SEQUENCENumericUpDown.Value} + ,[DUPLICATE_HANDLING] = '{ComboBoxEditDupl_handling.EditValue}',[AKTIV] = '{CheckEdit1.Checked}',[SEQUENCE] = {SEQUENCENumericUpDown.Value} ,[NAMENKONVENTION] = '{TextEditNamenkonvention.Text}', [FOLDER_FOR_INDEX] = '{FOLDER_FOR_INDEXTextEdit.Text}',[GEANDERTWER] = '{My.Application.User.UserName}',IDB_OBJECT_STORE_ID = {IDB_OBJECT_STORE_IDComboBox.SelectedValue} WHERE GUID = {TextEditDoctypeID.Text}" Return My.DatabaseECM.ExecuteNonQuery(oUpd) @@ -354,8 +351,7 @@ Public Class frmAdmin_Globix Dim oForm2 As New frmSQLEditor(My.LogConfig, My.DatabaseECM) With { .SQLCommand = SQL_RESULTTextBox.Text, .SQLConnection = CONNECTION_IDTextBox.Text, - .PlaceholdersManual = AttributesManual, - .LoadClipboardPlaceholders = True + .PlaceholdersManual = AttributesManual } oForm2.ShowDialog() diff --git a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb index 01a5dcf9..56e2cf7e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb @@ -216,28 +216,32 @@ Public Class frmAdmin_ClipboardWatcher End If End Sub - Private Sub TextEdit7_ButtonClick(sender As Object, e As DevExpress.XtraEditors.Controls.ButtonPressedEventArgs) Handles TextEdit7.ButtonClick + Private Sub TextEdit7_ButtonClick(sender As Object, e As ButtonPressedEventArgs) Handles TextEdit7.ButtonClick Dim oTextEdit As TextEdit = sender If e.Button.Tag = BUTTON_SEARCH_SQL Then - Dim oForm As New frmSQLEditor_old(My.LogConfig, My.DatabaseECM) With {.SQLString = oTextEdit.EditValue} + Dim oForm As New frmSQLEditor(My.LogConfig, My.DatabaseECM) With { + .SQLCommand = oTextEdit.EditValue + } Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then - oTextEdit.EditValue = oForm.SQLString + oTextEdit.EditValue = oForm.SQLCommand End If End If End Sub - Private Sub TextEdit8_ButtonClick(sender As Object, e As DevExpress.XtraEditors.Controls.ButtonPressedEventArgs) Handles TextEdit8.ButtonClick + Private Sub TextEdit8_ButtonClick(sender As Object, e As ButtonPressedEventArgs) Handles TextEdit8.ButtonClick Dim oTextEdit As TextEdit = sender If e.Button.Tag = BUTTON_COUNT_SQL Then - Dim oForm As New frmSQLEditor_old(My.LogConfig, My.DatabaseECM) With {.SQLString = oTextEdit.EditValue} + Dim oForm As New frmSQLEditor(My.LogConfig, My.DatabaseECM) With { + .SQLCommand = oTextEdit.EditValue + } Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then - oTextEdit.EditValue = oForm.SQLString + oTextEdit.EditValue = oForm.SQLCommand End If End If End Sub diff --git a/GUIs.ZooFlow/Administration/frmSQLDesigner.Designer.vb b/GUIs.ZooFlow/Administration/frmSQLDesigner_old.Designer.vb similarity index 99% rename from GUIs.ZooFlow/Administration/frmSQLDesigner.Designer.vb rename to GUIs.ZooFlow/Administration/frmSQLDesigner_old.Designer.vb index 767627c1..bfb2b629 100644 --- a/GUIs.ZooFlow/Administration/frmSQLDesigner.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmSQLDesigner_old.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class frmSQLDesigner +Partial Class frmSQLDesigner_old Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -22,7 +22,7 @@ Partial Class frmSQLDesigner 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQLDesigner)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQLDesigner_old)) Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.Label14 = New System.Windows.Forms.Label() Me.cmbConnection = New System.Windows.Forms.ComboBox() diff --git a/GUIs.ZooFlow/Administration/frmSQLDesigner.resx b/GUIs.ZooFlow/Administration/frmSQLDesigner_old.resx similarity index 100% rename from GUIs.ZooFlow/Administration/frmSQLDesigner.resx rename to GUIs.ZooFlow/Administration/frmSQLDesigner_old.resx diff --git a/GUIs.ZooFlow/Administration/frmSQLDesigner.vb b/GUIs.ZooFlow/Administration/frmSQLDesigner_old.vb similarity index 97% rename from GUIs.ZooFlow/Administration/frmSQLDesigner.vb rename to GUIs.ZooFlow/Administration/frmSQLDesigner_old.vb index 9d91e330..28e45f53 100644 --- a/GUIs.ZooFlow/Administration/frmSQLDesigner.vb +++ b/GUIs.ZooFlow/Administration/frmSQLDesigner_old.vb @@ -2,11 +2,20 @@ Imports DevExpress.XtraEditors.Repository Imports DigitalData.Modules.Database -Public Class frmSQLDesigner +Public Class frmSQLDesigner_old Dim CurrentPosition As Integer = 0 Dim CurrentPlaceholders As New Placeholders() Dim CurrentTableType As String Dim AtPlaceholderPattern As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" '"\[%[0-9A-Za-z_-]{1,}\]" + + Public Sub New() + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + + End Sub Public Class Placeholders Public Property RecordId As Integer Public Property ParentRecordId As Integer diff --git a/GUIs.ZooFlow/My Project/AssemblyInfo.vb b/GUIs.ZooFlow/My Project/AssemblyInfo.vb index 0390d6c3..3146565d 100644 --- a/GUIs.ZooFlow/My Project/AssemblyInfo.vb +++ b/GUIs.ZooFlow/My Project/AssemblyInfo.vb @@ -33,4 +33,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' [assembly: AssemblyVersion("1.0.*")] - + diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index e61bb074..c970d706 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -215,10 +215,10 @@ Form - - frmSQLDesigner.vb + + frmSQLDesigner_old.vb - + Form @@ -488,8 +488,8 @@ frmAdmin_SourceSQL.vb - - frmSQLDesigner.vb + + frmSQLDesigner_old.vb frmAdmin_UserImport.vb @@ -650,10 +650,6 @@ {bcc6942f-cd4b-4b67-8200-1c0d002e7cc2} RegexEditor - - {3e7bc8a9-91ef-49b8-8110-2c01f664c24a} - SQLEditor - {8a8f20fc-c46e-41ac-bee7-218366cfff99} Encryption @@ -670,10 +666,6 @@ {40384b94-1f94-4249-9a5a-d02e0b346738} GlobalIndexer - - {ef29f400-be45-4283-9d18-ca7acd9accc9} - MessageBoxEx - {6ea0c51f-c2b1-4462-8198-3de0b32b74f8} Base diff --git a/MessageBoxEx/App.config b/MessageBoxEx/App.config deleted file mode 100644 index bd27edc0..00000000 --- a/MessageBoxEx/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/MessageBoxEx/MessageBoxEx.vbproj b/MessageBoxEx/MessageBoxEx.vbproj deleted file mode 100644 index 5c5e5933..00000000 --- a/MessageBoxEx/MessageBoxEx.vbproj +++ /dev/null @@ -1,139 +0,0 @@ - - - - - Debug - AnyCPU - {EF29F400-BE45-4283-9D18-CA7ACD9ACCC9} - Library - - - DigitalData.Controls.MessageBoxEx - DigitalData.Controls.MessageBoxEx - 512 - Windows - v4.6.1 - true - true - - - - AnyCPU - true - full - true - true - bin\Debug\ - DigitalData.Controls.MessageBoxEx.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - AnyCPU - pdbonly - false - true - true - bin\Release\ - DigitalData.Controls.MessageBoxEx.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - False - D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraEditors.v21.2.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - MsgBoxEx.vb - Form - - - - True - Application.myapp - True - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - MsgBoxEx.vb - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - \ No newline at end of file diff --git a/MessageBoxEx/My Project/Application.Designer.vb b/MessageBoxEx/My Project/Application.Designer.vb deleted file mode 100644 index 8ab460ba..00000000 --- a/MessageBoxEx/My Project/Application.Designer.vb +++ /dev/null @@ -1,13 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - diff --git a/MessageBoxEx/My Project/Application.myapp b/MessageBoxEx/My Project/Application.myapp deleted file mode 100644 index 1243847f..00000000 --- a/MessageBoxEx/My Project/Application.myapp +++ /dev/null @@ -1,11 +0,0 @@ - - - true - Form1 - false - 0 - true - 0 - 0 - true - diff --git a/MessageBoxEx/My Project/AssemblyInfo.vb b/MessageBoxEx/My Project/AssemblyInfo.vb deleted file mode 100644 index f8c008b8..00000000 --- a/MessageBoxEx/My Project/AssemblyInfo.vb +++ /dev/null @@ -1,35 +0,0 @@ -Imports System -Imports System.Reflection -Imports System.Runtime.InteropServices - -' Allgemeine Informationen über eine Assembly werden über die folgenden -' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -' die einer Assembly zugeordnet sind. - -' Werte der Assemblyattribute überprüfen - - - - - - - - - - -'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird. - - -' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -' -' Hauptversion -' Nebenversion -' Buildnummer -' Revision -' -' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -' indem Sie "*" wie unten gezeigt eingeben: -' - - - diff --git a/MessageBoxEx/My Project/Resources.Designer.vb b/MessageBoxEx/My Project/Resources.Designer.vb deleted file mode 100644 index 0780c22a..00000000 --- a/MessageBoxEx/My Project/Resources.Designer.vb +++ /dev/null @@ -1,63 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - -Imports System - -Namespace My.Resources - - 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert - '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. - 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - ''' - ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - ''' - _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - ''' - ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - ''' - _ - 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("DigitalData.Controls.MessageBoxEx.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ''' - ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - ''' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set - resourceCulture = value - End Set - End Property - End Module -End Namespace diff --git a/MessageBoxEx/My Project/Settings.Designer.vb b/MessageBoxEx/My Project/Settings.Designer.vb deleted file mode 100644 index 5c0538e7..00000000 --- a/MessageBoxEx/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - _ - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) - -#Region "Automatische My.Settings-Speicherfunktion" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - _ - Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub -#End If -#End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - -#If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.DigitalData.Controls.MessageBoxEx.My.MySettings - Get - Return Global.DigitalData.Controls.MessageBoxEx.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/MessageBoxEx/My Project/Settings.settings b/MessageBoxEx/My Project/Settings.settings deleted file mode 100644 index 85b890b3..00000000 --- a/MessageBoxEx/My Project/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SQLEditor/My Project/Application.Designer.vb b/SQLEditor/My Project/Application.Designer.vb deleted file mode 100644 index 8ab460ba..00000000 --- a/SQLEditor/My Project/Application.Designer.vb +++ /dev/null @@ -1,13 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - diff --git a/SQLEditor/My Project/Application.myapp b/SQLEditor/My Project/Application.myapp deleted file mode 100644 index 758895de..00000000 --- a/SQLEditor/My Project/Application.myapp +++ /dev/null @@ -1,10 +0,0 @@ - - - false - false - 0 - true - 0 - 1 - true - diff --git a/SQLEditor/My Project/AssemblyInfo.vb b/SQLEditor/My Project/AssemblyInfo.vb deleted file mode 100644 index be959c96..00000000 --- a/SQLEditor/My Project/AssemblyInfo.vb +++ /dev/null @@ -1,34 +0,0 @@ -Imports System -Imports System.Reflection -Imports System.Runtime.InteropServices - -' Allgemeine Informationen über eine Assembly werden über die folgenden -' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -' die einer Assembly zugeordnet sind. - -' Werte der Assemblyattribute überprüfen - - - - - - - - - - -'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird. - - -' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -' -' Hauptversion -' Nebenversion -' Buildnummer -' Revision -' -' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -' indem Sie "*" wie unten gezeigt eingeben: - - - diff --git a/SQLEditor/My Project/Resources.Designer.vb b/SQLEditor/My Project/Resources.Designer.vb deleted file mode 100644 index 1f1b8f74..00000000 --- a/SQLEditor/My Project/Resources.Designer.vb +++ /dev/null @@ -1,63 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - -Imports System - -Namespace My.Resources - - 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert - '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. - 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - ''' - ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - ''' - _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - ''' - ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - ''' - _ - 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("DigitalData.Controls.SQLEditor.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ''' - ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - ''' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set - resourceCulture = value - End Set - End Property - End Module -End Namespace diff --git a/SQLEditor/My Project/Resources.resx b/SQLEditor/My Project/Resources.resx deleted file mode 100644 index af7dbebb..00000000 --- a/SQLEditor/My Project/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/SQLEditor/My Project/Settings.Designer.vb b/SQLEditor/My Project/Settings.Designer.vb deleted file mode 100644 index f47e6223..00000000 --- a/SQLEditor/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - _ - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) - -#Region "Automatische My.Settings-Speicherfunktion" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - _ - Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub -#End If -#End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - -#If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.DigitalData.Controls.SQLEditor.My.MySettings - Get - Return Global.DigitalData.Controls.SQLEditor.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/SQLEditor/My Project/Settings.settings b/SQLEditor/My Project/Settings.settings deleted file mode 100644 index 85b890b3..00000000 --- a/SQLEditor/My Project/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SQLEditor/My Project/licenses.licx b/SQLEditor/My Project/licenses.licx deleted file mode 100644 index e69de29b..00000000 diff --git a/SQLEditor/My Project/licenses.licx.bak b/SQLEditor/My Project/licenses.licx.bak deleted file mode 100644 index d7eba39b..00000000 --- a/SQLEditor/My Project/licenses.licx.bak +++ /dev/null @@ -1,2 +0,0 @@ -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/SQLEditor/SQLEditor.vb b/SQLEditor/SQLEditor.vb deleted file mode 100644 index 03d39e73..00000000 --- a/SQLEditor/SQLEditor.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class SQLEditor - -End Class diff --git a/SQLEditor/SQLEditor.vbproj b/SQLEditor/SQLEditor.vbproj deleted file mode 100644 index 2533dc1e..00000000 --- a/SQLEditor/SQLEditor.vbproj +++ /dev/null @@ -1,154 +0,0 @@ - - - - - Debug - AnyCPU - {E707BF50-6799-42B2-869F-E10641D51219} - Library - DigitalData.Controls.SQLEditor - DigitalData.Controls.SQLEditor - 512 - Windows - v4.7.2 - true - - - true - full - true - true - bin\Debug\ - DigitalData.Controls.SQLEditor.xml - _MYFORMS=True - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - pdbonly - false - true - true - bin\Release\ - DigitalData.Controls.SQLEditor.xml - _MYFORMS=True - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - - - - - - - ..\packages\NLog.4.7.2\lib\net45\NLog.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - frmSQLEditor.vb - - - Form - - - True - Application.myapp - - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - - frmSQLEditor.vb - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - - - - {903B2D7D-3B80-4BE9-8713-7447B704E1B0} - Logging - - - {7c3b0c7e-59fe-4e1a-a655-27ae119f9444} - Patterns - - - - \ No newline at end of file diff --git a/SQLEditor/SQLEditor.vbproj.bak b/SQLEditor/SQLEditor.vbproj.bak deleted file mode 100644 index 7aa18685..00000000 --- a/SQLEditor/SQLEditor.vbproj.bak +++ /dev/null @@ -1,153 +0,0 @@ - - - - - Debug - AnyCPU - {E707BF50-6799-42B2-869F-E10641D51219} - Library - DigitalData.Controls.SQLEditor - DigitalData.Controls.SQLEditor - 512 - Windows - v4.7.2 - true - - - true - full - true - true - bin\Debug\ - DigitalData.Controls.SQLEditor.xml - _MYFORMS=True - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - pdbonly - false - true - true - bin\Release\ - DigitalData.Controls.SQLEditor.xml - _MYFORMS=True - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - - - - - - ..\packages\NLog.4.7.2\lib\net45\NLog.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - frmSQLEditor.vb - - - Form - - - True - Application.myapp - - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - - frmSQLEditor.vb - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - - - - {903B2D7D-3B80-4BE9-8713-7447B704E1B0} - Logging - - - {7c3b0c7e-59fe-4e1a-a655-27ae119f9444} - Patterns - - - - \ No newline at end of file diff --git a/SQLEditor/frmSQLEditor.Designer.vb b/SQLEditor/frmSQLEditor.Designer.vb deleted file mode 100644 index 1601d9d0..00000000 --- a/SQLEditor/frmSQLEditor.Designer.vb +++ /dev/null @@ -1,287 +0,0 @@ - _ -Partial Class frmSQLEditor - Inherits DevExpress.XtraEditors.XtraForm - - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ - Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQLEditor)) - Me.MemoEdit1 = New DevExpress.XtraEditors.MemoEdit() - Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() - Me.gridResult = New DevExpress.XtraGrid.GridControl() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.gridPlaceholders = New DevExpress.XtraGrid.GridControl() - Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colPlaceholder = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colReplacement = New DevExpress.XtraGrid.Columns.GridColumn() - Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() - Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() - Me.Label1 = New System.Windows.Forms.Label() - Me.ComboBoxEdit2 = New DevExpress.XtraEditors.ComboBoxEdit() - Me.Label2 = New System.Windows.Forms.Label() - Me.ComboBoxEdit3 = New DevExpress.XtraEditors.ComboBoxEdit() - Me.Label3 = New System.Windows.Forms.Label() - Me.ComboBoxEdit4 = New DevExpress.XtraEditors.ComboBoxEdit() - Me.Label4 = New System.Windows.Forms.Label() - Me.cmbConnections = New DevExpress.XtraEditors.ComboBoxEdit() - Me.Label5 = New System.Windows.Forms.Label() - CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.gridResult, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.gridPlaceholders, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerControl1.SuspendLayout() - CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.cmbConnections.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'MemoEdit1 - ' - Me.MemoEdit1.Location = New System.Drawing.Point(12, 94) - Me.MemoEdit1.Name = "MemoEdit1" - Me.MemoEdit1.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MemoEdit1.Properties.Appearance.Options.UseFont = True - Me.MemoEdit1.Size = New System.Drawing.Size(776, 173) - Me.MemoEdit1.TabIndex = 0 - ' - 'SimpleButton1 - ' - Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleButton1.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) - Me.SimpleButton1.Location = New System.Drawing.Point(641, 443) - Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.Size = New System.Drawing.Size(147, 34) - Me.SimpleButton1.TabIndex = 1 - Me.SimpleButton1.Text = "Speichern" - ' - 'gridResult - ' - Me.gridResult.Dock = System.Windows.Forms.DockStyle.Fill - Me.gridResult.Location = New System.Drawing.Point(0, 0) - Me.gridResult.MainView = Me.GridView1 - Me.gridResult.Name = "gridResult" - Me.gridResult.Size = New System.Drawing.Size(370, 160) - Me.gridResult.TabIndex = 2 - Me.gridResult.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) - ' - 'GridView1 - ' - Me.GridView1.GridControl = Me.gridResult - Me.GridView1.Name = "GridView1" - Me.GridView1.OptionsView.ShowGroupPanel = False - ' - 'gridPlaceholders - ' - Me.gridPlaceholders.Dock = System.Windows.Forms.DockStyle.Fill - Me.gridPlaceholders.Location = New System.Drawing.Point(0, 0) - Me.gridPlaceholders.MainView = Me.GridView2 - Me.gridPlaceholders.Name = "gridPlaceholders" - Me.gridPlaceholders.Size = New System.Drawing.Size(396, 160) - Me.gridPlaceholders.TabIndex = 2 - Me.gridPlaceholders.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) - ' - 'GridView2 - ' - Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPlaceholder, Me.colReplacement}) - Me.GridView2.GridControl = Me.gridPlaceholders - Me.GridView2.Name = "GridView2" - Me.GridView2.OptionsView.ShowGroupPanel = False - ' - 'colPlaceholder - ' - Me.colPlaceholder.Caption = "Platzhalter" - Me.colPlaceholder.Name = "colPlaceholder" - Me.colPlaceholder.Visible = True - Me.colPlaceholder.VisibleIndex = 0 - ' - 'colReplacement - ' - Me.colReplacement.Caption = "Ersetzung" - Me.colReplacement.Name = "colReplacement" - Me.colReplacement.Visible = True - Me.colReplacement.VisibleIndex = 1 - ' - 'SplitContainerControl1 - ' - Me.SplitContainerControl1.Location = New System.Drawing.Point(12, 277) - Me.SplitContainerControl1.Name = "SplitContainerControl1" - Me.SplitContainerControl1.Panel1.Controls.Add(Me.gridPlaceholders) - Me.SplitContainerControl1.Panel1.Text = "Panel1" - Me.SplitContainerControl1.Panel2.Controls.Add(Me.gridResult) - Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(776, 160) - Me.SplitContainerControl1.SplitterPosition = 396 - Me.SplitContainerControl1.TabIndex = 3 - ' - 'ComboBoxEdit1 - ' - Me.ComboBoxEdit1.Location = New System.Drawing.Point(572, 66) - Me.ComboBoxEdit1.Name = "ComboBoxEdit1" - Me.ComboBoxEdit1.Properties.Appearance.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ComboBoxEdit1.Properties.Appearance.Options.UseFont = True - Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Plus)}) - Me.ComboBoxEdit1.Size = New System.Drawing.Size(215, 22) - Me.ComboBoxEdit1.TabIndex = 4 - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(569, 50) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(101, 13) - Me.Label1.TabIndex = 5 - Me.Label1.Text = "Anwendungsdaten:" - ' - 'ComboBoxEdit2 - ' - Me.ComboBoxEdit2.Location = New System.Drawing.Point(351, 66) - Me.ComboBoxEdit2.Name = "ComboBoxEdit2" - Me.ComboBoxEdit2.Properties.Appearance.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ComboBoxEdit2.Properties.Appearance.Options.UseFont = True - Me.ComboBoxEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Plus)}) - Me.ComboBoxEdit2.Size = New System.Drawing.Size(215, 22) - Me.ComboBoxEdit2.TabIndex = 4 - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(348, 50) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(95, 13) - Me.Label2.TabIndex = 5 - Me.Label2.Text = "Umgebungsdaten:" - ' - 'ComboBoxEdit3 - ' - Me.ComboBoxEdit3.Location = New System.Drawing.Point(572, 25) - Me.ComboBoxEdit3.Name = "ComboBoxEdit3" - Me.ComboBoxEdit3.Properties.Appearance.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ComboBoxEdit3.Properties.Appearance.Options.UseFont = True - Me.ComboBoxEdit3.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Plus)}) - Me.ComboBoxEdit3.Size = New System.Drawing.Size(215, 22) - Me.ComboBoxEdit3.TabIndex = 4 - ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(569, 9) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(177, 13) - Me.Label3.TabIndex = 5 - Me.Label3.Text = "Indexe (Zur Laufzeit ausgewertet):" - ' - 'ComboBoxEdit4 - ' - Me.ComboBoxEdit4.Location = New System.Drawing.Point(351, 25) - Me.ComboBoxEdit4.Name = "ComboBoxEdit4" - Me.ComboBoxEdit4.Properties.Appearance.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ComboBoxEdit4.Properties.Appearance.Options.UseFont = True - Me.ComboBoxEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Plus)}) - Me.ComboBoxEdit4.Size = New System.Drawing.Size(215, 22) - Me.ComboBoxEdit4.TabIndex = 4 - ' - 'Label4 - ' - Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(348, 9) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(182, 13) - Me.Label4.TabIndex = 5 - Me.Label4.Text = "Controls (zur Laufzeit ausgewertet):" - ' - 'cmbConnections - ' - Me.cmbConnections.Location = New System.Drawing.Point(12, 66) - Me.cmbConnections.Name = "cmbConnections" - Me.cmbConnections.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.cmbConnections.Size = New System.Drawing.Size(170, 20) - Me.cmbConnections.TabIndex = 6 - ' - 'Label5 - ' - Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(9, 50) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(121, 13) - Me.Label5.TabIndex = 5 - Me.Label5.Text = "Datenbank-Verbindung:" - ' - 'frmSQLEditor - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 489) - Me.Controls.Add(Me.cmbConnections) - Me.Controls.Add(Me.Label4) - Me.Controls.Add(Me.Label5) - Me.Controls.Add(Me.Label2) - Me.Controls.Add(Me.Label3) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.ComboBoxEdit4) - Me.Controls.Add(Me.ComboBoxEdit2) - Me.Controls.Add(Me.ComboBoxEdit3) - Me.Controls.Add(Me.ComboBoxEdit1) - Me.Controls.Add(Me.SplitContainerControl1) - Me.Controls.Add(Me.SimpleButton1) - Me.Controls.Add(Me.MemoEdit1) - Me.IconOptions.SvgImage = CType(resources.GetObject("frmSQLEditor.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.Name = "frmSQLEditor" - Me.Text = "SQL-Editor" - CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.gridResult, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.gridPlaceholders, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerControl1.ResumeLayout(False) - CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.cmbConnections.Properties, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents MemoEdit1 As DevExpress.XtraEditors.MemoEdit - Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton - Friend WithEvents gridResult As DevExpress.XtraGrid.GridControl - Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents gridPlaceholders As DevExpress.XtraGrid.GridControl - Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl - Friend WithEvents colPlaceholder As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colReplacement As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit - Friend WithEvents Label1 As Label - Friend WithEvents ComboBoxEdit2 As DevExpress.XtraEditors.ComboBoxEdit - Friend WithEvents Label2 As Label - Friend WithEvents ComboBoxEdit3 As DevExpress.XtraEditors.ComboBoxEdit - Friend WithEvents Label3 As Label - Friend WithEvents ComboBoxEdit4 As DevExpress.XtraEditors.ComboBoxEdit - Friend WithEvents Label4 As Label - Friend WithEvents cmbConnections As DevExpress.XtraEditors.ComboBoxEdit - Friend WithEvents Label5 As Label -End Class diff --git a/SQLEditor/frmSQLEditor.resx b/SQLEditor/frmSQLEditor.resx deleted file mode 100644 index 84ed9e98..00000000 --- a/SQLEditor/frmSQLEditor.resx +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg - MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5 - bGU+DQogIDxwYXRoIGQ9Ik0yNyw0aC0zdjEwSDhWNEg1QzQuNCw0LDQsNC40LDQsNXYyMmMwLDAuNiww - LjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjVDMjgsNC40LDI3LjYsNCwyNyw0eiBNMjQsMjRIOHYt - NiAgaDE2VjI0eiBNMTAsNHY4aDEwVjRIMTB6IE0xNCwxMGgtMlY2aDJWMTB6IiBjbGFzcz0iQmxhY2si - IC8+DQo8L3N2Zz4L - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAF4DAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iRGF0YXNvdXJjZSI+DQogICAgPHBhdGggZD0iTTYsNmgxMnYySDZWNnogTTE0LDI0 - SDRWMmgxNnYxMC4yYzAuNi0wLjEsMS4zLTAuMiwyLTAuMlYxYzAtMC41LTAuNS0xLTEtMUgzQzIuNSww - LDIsMC41LDIsMXYyNCAgIGMwLDAuNSwwLjUsMSwxLDFoMTFWMjR6IE02LDIwaDh2LTJINlYyMHogTTYs - MTZoOC4yYzAuMi0wLjgsMC43LTEuNCwxLjUtMkg2VjE2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxw - YXRoIGQ9Ik0xOCwxMkg2di0yaDEyVjEyeiBNMjMsMTRjLTMuOSwwLTcsMS4zLTcsM3YxMmMwLDEuNywz - LjEsMyw3LDNzNy0xLjMsNy0zVjE3QzMwLDE1LjMsMjYuOSwxNCwyMywxNHoiIGNsYXNzPSJZZWxsb3ci - IC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - \ No newline at end of file diff --git a/SQLEditor/frmSQLEditor.resx.bak b/SQLEditor/frmSQLEditor.resx.bak deleted file mode 100644 index 9b081d08..00000000 --- a/SQLEditor/frmSQLEditor.resx.bak +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg - MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5 - bGU+DQogIDxwYXRoIGQ9Ik0yNyw0aC0zdjEwSDhWNEg1QzQuNCw0LDQsNC40LDQsNXYyMmMwLDAuNiww - LjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjVDMjgsNC40LDI3LjYsNCwyNyw0eiBNMjQsMjRIOHYt - NiAgaDE2VjI0eiBNMTAsNHY4aDEwVjRIMTB6IE0xNCwxMGgtMlY2aDJWMTB6IiBjbGFzcz0iQmxhY2si - IC8+DQo8L3N2Zz4L - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAF4DAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iRGF0YXNvdXJjZSI+DQogICAgPHBhdGggZD0iTTYsNmgxMnYySDZWNnogTTE0LDI0 - SDRWMmgxNnYxMC4yYzAuNi0wLjEsMS4zLTAuMiwyLTAuMlYxYzAtMC41LTAuNS0xLTEtMUgzQzIuNSww - LDIsMC41LDIsMXYyNCAgIGMwLDAuNSwwLjUsMSwxLDFoMTFWMjR6IE02LDIwaDh2LTJINlYyMHogTTYs - MTZoOC4yYzAuMi0wLjgsMC43LTEuNCwxLjUtMkg2VjE2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxw - YXRoIGQ9Ik0xOCwxMkg2di0yaDEyVjEyeiBNMjMsMTRjLTMuOSwwLTcsMS4zLTcsM3YxMmMwLDEuNywz - LjEsMyw3LDNzNy0xLjMsNy0zVjE3QzMwLDE1LjMsMjYuOSwxNCwyMywxNHoiIGNsYXNzPSJZZWxsb3ci - IC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - \ No newline at end of file diff --git a/SQLEditor/frmSQLEditor.vb b/SQLEditor/frmSQLEditor.vb deleted file mode 100644 index 33c10009..00000000 --- a/SQLEditor/frmSQLEditor.vb +++ /dev/null @@ -1,44 +0,0 @@ -Imports DigitalData.Modules.Logging - -Public Class frmSQLEditor - Private ReadOnly _LogConfig As LogConfig - Private ReadOnly _Logger As Logger - Private ReadOnly _Connections As DataTable - - Public Sub New(LogConfig As LogConfig, DatatableConnections As DataTable) - ' Dieser Aufruf ist für den Designer erforderlich. - InitializeComponent() - - ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - _LogConfig = LogConfig - _Logger = LogConfig.GetLogger() - _Connections = DatatableConnections - End Sub - - Private Sub frmSQLEditor_Load(sender As Object, e As EventArgs) Handles MyBase.Load - LoadConnections() - End Sub - - Private Sub LoadConnections() - Try - For Each oRow As DataRow In _Connections.Rows - cmbConnections.Properties.Items.Add( - New Connection() With { - .Name = oRow.Item("BEZEICHNUNG"), - .Value = oRow.Item("GUID") - }) - Next - Catch ex As Exception - _Logger.Error(ex) - End Try - End Sub - - Private Class Connection - Public Property Value - Public Property Name - - Public Overrides Function ToString() As String - Return Name - End Function - End Class -End Class \ No newline at end of file diff --git a/SQLEditor/packages.config b/SQLEditor/packages.config deleted file mode 100644 index 1baeaab3..00000000 --- a/SQLEditor/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/SQLEditorTest/App.config b/SQLEditorTest/App.config deleted file mode 100644 index ffaf5407..00000000 --- a/SQLEditorTest/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/SQLEditorTest/Form1.Designer.vb b/SQLEditorTest/Form1.Designer.vb deleted file mode 100644 index 88a5a083..00000000 --- a/SQLEditorTest/Form1.Designer.vb +++ /dev/null @@ -1,38 +0,0 @@ - _ -Partial Class Form1 - Inherits System.Windows.Forms.Form - - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ - Private Sub InitializeComponent() - Me.SuspendLayout() - ' - 'Form1 - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) - Me.Name = "Form1" - Me.Text = "Form1" - Me.ResumeLayout(False) - - End Sub - -End Class diff --git a/SQLEditorTest/Form1.vb b/SQLEditorTest/Form1.vb deleted file mode 100644 index 138bcd46..00000000 --- a/SQLEditorTest/Form1.vb +++ /dev/null @@ -1,15 +0,0 @@ -Imports DigitalData.Controls.SQLEditor -Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.Database - -Public Class Form1 - Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Dim oLogCOnfig As New LogConfig(LogConfig.PathType.Temp, Nothing, Nothing, Nothing, Nothing) - Dim oConnString = MSSQLServer.GetConnectionString("SDD-VMP04-SQL17\DD_DEVELOP01", "DD_ECM_TEST", "sa", "dd") - Dim oDatabase As New MSSQLServer(oLogCOnfig, oConnString) - Dim oConnections As DataTable = oDatabase.GetDatatable("SELECT * FROM TBDD_CONNECTION") - Dim oEditor As New frmSQLEditor(oLogCOnfig, oConnections) - - oEditor.Show() - End Sub -End Class diff --git a/SQLEditorTest/My Project/Application.Designer.vb b/SQLEditorTest/My Project/Application.Designer.vb deleted file mode 100644 index fa332de2..00000000 --- a/SQLEditorTest/My Project/Application.Designer.vb +++ /dev/null @@ -1,38 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - 'NOTE: This file is auto-generated; do not modify it directly. To make changes, - ' or if you encounter build errors in this file, go to the Project Designer - ' (go to Project Properties or double-click the My Project node in - ' Solution Explorer), and make changes on the Application tab. - ' - Partial Friend Class MyApplication - - _ - Public Sub New() - MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = false - Me.EnableVisualStyles = true - Me.SaveMySettingsOnExit = true - Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses - End Sub - - _ - Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.SQLEditorTest.Form1 - End Sub - End Class -End Namespace diff --git a/SQLEditorTest/My Project/Application.myapp b/SQLEditorTest/My Project/Application.myapp deleted file mode 100644 index 1243847f..00000000 --- a/SQLEditorTest/My Project/Application.myapp +++ /dev/null @@ -1,11 +0,0 @@ - - - true - Form1 - false - 0 - true - 0 - 0 - true - diff --git a/SQLEditorTest/My Project/AssemblyInfo.vb b/SQLEditorTest/My Project/AssemblyInfo.vb deleted file mode 100644 index 5a0f6e8f..00000000 --- a/SQLEditorTest/My Project/AssemblyInfo.vb +++ /dev/null @@ -1,35 +0,0 @@ -Imports System -Imports System.Reflection -Imports System.Runtime.InteropServices - -' Allgemeine Informationen über eine Assembly werden über die folgenden -' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -' die einer Assembly zugeordnet sind. - -' Werte der Assemblyattribute überprüfen - - - - - - - - - - -'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird. - - -' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -' -' Hauptversion -' Nebenversion -' Buildnummer -' Revision -' -' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -' indem Sie "*" wie unten gezeigt eingeben: -' - - - diff --git a/SQLEditorTest/My Project/Resources.Designer.vb b/SQLEditorTest/My Project/Resources.Designer.vb deleted file mode 100644 index 3ddc0f13..00000000 --- a/SQLEditorTest/My Project/Resources.Designer.vb +++ /dev/null @@ -1,62 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My.Resources - - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. - ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. - ''' - _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - ''' - ''' Returns the cached ResourceManager instance used by this class. - ''' - _ - 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("SQLEditorTest.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. - ''' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) - resourceCulture = value - End Set - End Property - End Module -End Namespace diff --git a/SQLEditorTest/My Project/Resources.resx b/SQLEditorTest/My Project/Resources.resx deleted file mode 100644 index af7dbebb..00000000 --- a/SQLEditorTest/My Project/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/SQLEditorTest/My Project/Settings.Designer.vb b/SQLEditorTest/My Project/Settings.Designer.vb deleted file mode 100644 index 28331798..00000000 --- a/SQLEditorTest/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - _ - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub -#End If -#End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - -#If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.SQLEditorTest.My.MySettings - Get - Return Global.SQLEditorTest.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/SQLEditorTest/My Project/Settings.settings b/SQLEditorTest/My Project/Settings.settings deleted file mode 100644 index 85b890b3..00000000 --- a/SQLEditorTest/My Project/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SQLEditorTest/SQLEditorTest.vbproj b/SQLEditorTest/SQLEditorTest.vbproj deleted file mode 100644 index 71bcc3ac..00000000 --- a/SQLEditorTest/SQLEditorTest.vbproj +++ /dev/null @@ -1,140 +0,0 @@ - - - - - Debug - AnyCPU - {4B0AED11-31C4-431A-B488-72392B63E6E6} - WinExe - SQLEditorTest.My.MyApplication - SQLEditorTest - SQLEditorTest - 512 - WindowsForms - v4.7.2 - true - true - - - AnyCPU - true - full - true - true - bin\Debug\ - SQLEditorTest.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - AnyCPU - pdbonly - false - true - true - bin\Release\ - SQLEditorTest.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - Form1.vb - Form - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - Form1.vb - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} - Database - - - {903B2D7D-3B80-4BE9-8713-7447B704E1B0} - Logging - - - {e707bf50-6799-42b2-869f-e10641d51219} - SQLEditor - - - - \ No newline at end of file diff --git a/SQLEditorTest/SQLEditorTest.vbproj.bak b/SQLEditorTest/SQLEditorTest.vbproj.bak deleted file mode 100644 index f4b286d8..00000000 --- a/SQLEditorTest/SQLEditorTest.vbproj.bak +++ /dev/null @@ -1,138 +0,0 @@ - - - - - Debug - AnyCPU - {4B0AED11-31C4-431A-B488-72392B63E6E6} - WinExe - SQLEditorTest.My.MyApplication - SQLEditorTest - SQLEditorTest - 512 - WindowsForms - v4.7.2 - true - true - - - AnyCPU - true - full - true - true - bin\Debug\ - SQLEditorTest.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - AnyCPU - pdbonly - false - true - true - bin\Release\ - SQLEditorTest.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - Form1.vb - Form - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - Form1.vb - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} - Database - - - {903B2D7D-3B80-4BE9-8713-7447B704E1B0} - Logging - - - {e707bf50-6799-42b2-869f-e10641d51219} - SQLEditor - - - - \ No newline at end of file