diff --git a/Controls.SQLEditor/SQLEditor.vbproj b/Controls.SQLEditor/SQLEditor.vbproj index ff6974bb..1037b070 100644 --- a/Controls.SQLEditor/SQLEditor.vbproj +++ b/Controls.SQLEditor/SQLEditor.vbproj @@ -116,6 +116,12 @@ Form + + frmSQLResult.vb + + + Form + True @@ -141,6 +147,9 @@ frmSQLEditor_old.vb + + frmSQLResult.vb + VbMyResourcesResXFileCodeGenerator diff --git a/Controls.SQLEditor/frmSQLEditor.Designer.vb b/Controls.SQLEditor/frmSQLEditor.Designer.vb index dab1befa..1ef40631 100644 --- a/Controls.SQLEditor/frmSQLEditor.Designer.vb +++ b/Controls.SQLEditor/frmSQLEditor.Designer.vb @@ -26,9 +26,9 @@ Partial Class frmSQLEditor Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.RibbonGalleryBarItem1 = New DevExpress.XtraBars.RibbonGalleryBarItem() Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.btnEditConnections = New DevExpress.XtraBars.BarButtonItem() + Me.btnSave = New DevExpress.XtraBars.BarButtonItem() + Me.btnExecuteSQL = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -39,6 +39,8 @@ Partial Class frmSQLEditor Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.GridView1 = 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() @@ -54,7 +56,7 @@ Partial Class frmSQLEditor 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.RibbonGalleryBarItem1, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.RibbonGalleryBarItem1, Me.btnEditConnections, Me.btnSave, Me.btnExecuteSQL}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" @@ -79,26 +81,26 @@ Partial Class frmSQLEditor ' Me.SvgImageCollection1.Add("bo_list", "image://svgimages/business objects/bo_list.svg") ' - 'BarButtonItem1 + 'btnEditConnections ' - Me.BarButtonItem1.Caption = "Verbindungen" - Me.BarButtonItem1.Id = 2 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.editdatasource1 - Me.BarButtonItem1.Name = "BarButtonItem1" + Me.btnEditConnections.Caption = "Verbindungen" + Me.btnEditConnections.Id = 2 + Me.btnEditConnections.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.editdatasource1 + Me.btnEditConnections.Name = "btnEditConnections" ' - 'BarButtonItem2 + 'btnSave ' - Me.BarButtonItem2.Caption = "Speichern" - Me.BarButtonItem2.Id = 3 - Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.check - Me.BarButtonItem2.Name = "BarButtonItem2" + Me.btnSave.Caption = "Speichern" + Me.btnSave.Id = 3 + Me.btnSave.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.check + Me.btnSave.Name = "btnSave" ' - 'BarButtonItem3 + 'btnExecuteSQL ' - Me.BarButtonItem3.Caption = "SQL Ausführen" - Me.BarButtonItem3.Id = 4 - Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.updatedataextract3 - Me.BarButtonItem3.Name = "BarButtonItem3" + Me.btnExecuteSQL.Caption = "SQL Ausführen" + Me.btnExecuteSQL.Id = 4 + Me.btnExecuteSQL.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.updatedataextract3 + Me.btnExecuteSQL.Name = "btnExecuteSQL" ' 'RibbonPage1 ' @@ -116,14 +118,14 @@ Partial Class frmSQLEditor 'RibbonPageGroup2 ' Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup2.ItemLinks.Add(Me.btnEditConnections) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Datenbank" ' 'RibbonPageGroup3 ' - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup3.ItemLinks.Add(Me.btnSave) + Me.RibbonPageGroup3.ItemLinks.Add(Me.btnExecuteSQL) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" Me.RibbonPageGroup3.Text = "Start" ' @@ -180,10 +182,29 @@ Partial Class frmSQLEditor ' 'GridView1 ' + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPattern, Me.colValue}) Me.GridView1.GridControl = Me.GridControl1 Me.GridView1.Name = "GridView1" ' - 'Form1 + '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 @@ -191,7 +212,7 @@ Partial Class frmSQLEditor Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) - Me.Name = "Form1" + Me.Name = "frmSQLEditor" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "SQL Connector" @@ -221,9 +242,11 @@ Partial Class frmSQLEditor Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents btnEditConnections As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarButtonItem3 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 End Class diff --git a/Controls.SQLEditor/frmSQLEditor.resx b/Controls.SQLEditor/frmSQLEditor.resx index f722219e..1a6c0395 100644 --- a/Controls.SQLEditor/frmSQLEditor.resx +++ b/Controls.SQLEditor/frmSQLEditor.resx @@ -120,4 +120,7 @@ 17, 17 + + 17, 17 + \ No newline at end of file diff --git a/Controls.SQLEditor/frmSQLEditor.vb b/Controls.SQLEditor/frmSQLEditor.vb index 2e5cdbd3..92f579c7 100644 --- a/Controls.SQLEditor/frmSQLEditor.vb +++ b/Controls.SQLEditor/frmSQLEditor.vb @@ -26,6 +26,7 @@ Public Class frmSQLEditor ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. LogConfig = pLogConfig + Database = pDatabase End Sub Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -68,19 +69,22 @@ Public Class frmSQLEditor Private Class Placeholder Public Type As PlaceholderType - Public Name As String + Public Property Name As String + Public Property Value As String + Public Property Pattern As Pattern + + Public Category As String Public Description As String - Public Value As String Public Enum PlaceholderType FileFlow End Enum - Public Sub New(pName As String, pDescription As String, pType As PlaceholderType, pValue As String) + Public Sub New(pName As String, pDescription As String, pType As PlaceholderType, pCategory As String) Name = pName Description = pDescription Type = pType - Value = pValue + Category = pCategory End Sub End Class @@ -90,12 +94,37 @@ Public Class frmSQLEditor } End Function + Private Property LastPatterns As New List(Of Pattern) + Private Sub RichEditControl1_ContentChanged(sender As Object, e As EventArgs) Handles RichEditControl1.ContentChanged Dim oSqlText = RichEditControl1.Document.Text Dim oPatterns = Patterns.GetAllPatterns(oSqlText) + + If oPatterns.Count = 0 Then + Exit Sub + End If + + If oPatterns.SequenceEqual(LastPatterns) Then + Exit Sub + End If + + GridControl1.DataSource = oPatterns.Select(Function(pattern) + Return New Placeholder(pattern.Value, pattern.Type, Placeholder.PlaceholderType.FileFlow, "") With {.Pattern = pattern} + End Function).ToList() + + + LastPatterns = oPatterns + End Sub - Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click - + Private Async Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExecuteSQL.ItemClick + Try + Dim oSql = RichEditControl1.Document.Text + Dim oDatatable = Await Database.GetDatatableAsync(oSql) + Dim oForm As New frmSQLResult(oDatatable) + oForm.Show() + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, Text) + End Try End Sub End Class diff --git a/Controls.SQLEditor/frmSQLResult.Designer.vb b/Controls.SQLEditor/frmSQLResult.Designer.vb new file mode 100644 index 00000000..6ecd114f --- /dev/null +++ b/Controls.SQLEditor/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/Controls.SQLEditor/frmSQLResult.resx b/Controls.SQLEditor/frmSQLResult.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/Controls.SQLEditor/frmSQLResult.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Controls.SQLEditor/frmSQLResult.vb b/Controls.SQLEditor/frmSQLResult.vb new file mode 100644 index 00000000..72c96da8 --- /dev/null +++ b/Controls.SQLEditor/frmSQLResult.vb @@ -0,0 +1,15 @@ +Public Class frmSQLResult + Private ReadOnly Table As DataTable + + 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 + 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.Test.TestGUI/My Project/Application.myapp b/GUIs.Test.TestGUI/My Project/Application.myapp index a1da81d5..0f12f323 100644 --- a/GUIs.Test.TestGUI/My Project/Application.myapp +++ b/GUIs.Test.TestGUI/My Project/Application.myapp @@ -1,7 +1,7 @@  true - frmStart + Form1 false 0 true diff --git a/GUIs.Test.TestGUI/My Project/Resources.Designer.vb b/GUIs.Test.TestGUI/My Project/Resources.Designer.vb index d69a1a29..cd2e2168 100644 --- a/GUIs.Test.TestGUI/My Project/Resources.Designer.vb +++ b/GUIs.Test.TestGUI/My Project/Resources.Designer.vb @@ -60,6 +60,16 @@ Namespace My.Resources End Set End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_send() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_send", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -69,5 +79,35 @@ Namespace My.Resources Return CType(obj,DevExpress.Utils.Svg.SvgImage) End Get End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property managedatasource() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("managedatasource", 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 save() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("save", 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 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 End Module End Namespace diff --git a/GUIs.Test.TestGUI/My Project/Resources.resx b/GUIs.Test.TestGUI/My Project/Resources.resx index 13330b3d..ff426c32 100644 --- a/GUIs.Test.TestGUI/My Project/Resources.resx +++ b/GUIs.Test.TestGUI/My Project/Resources.resx @@ -118,7 +118,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\alignhorizontalbottom.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\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_send.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.Test.TestGUI/My Project/licenses.licx b/GUIs.Test.TestGUI/My Project/licenses.licx index 78d6cc83..fce612c6 100644 --- a/GUIs.Test.TestGUI/My Project/licenses.licx +++ b/GUIs.Test.TestGUI/My Project/licenses.licx @@ -1 +1,4 @@ +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.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.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Test.TestGUI/Resources/actions_send.svg b/GUIs.Test.TestGUI/Resources/actions_send.svg new file mode 100644 index 00000000..c0372ba0 --- /dev/null +++ b/GUIs.Test.TestGUI/Resources/actions_send.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/Resources/managedatasource.svg b/GUIs.Test.TestGUI/Resources/managedatasource.svg new file mode 100644 index 00000000..d08be544 --- /dev/null +++ b/GUIs.Test.TestGUI/Resources/managedatasource.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/Resources/save.svg b/GUIs.Test.TestGUI/Resources/save.svg new file mode 100644 index 00000000..b09d6ee8 --- /dev/null +++ b/GUIs.Test.TestGUI/Resources/save.svg @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/Resources/updatedataextract.svg b/GUIs.Test.TestGUI/Resources/updatedataextract.svg new file mode 100644 index 00000000..e7dda038 --- /dev/null +++ b/GUIs.Test.TestGUI/Resources/updatedataextract.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index 8ae86e86..f98e4215 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -378,5 +378,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj.bak b/GUIs.Test.TestGUI/TestGUI.vbproj.bak deleted file mode 100644 index b43683fa..00000000 --- a/GUIs.Test.TestGUI/TestGUI.vbproj.bak +++ /dev/null @@ -1,345 +0,0 @@ - - - - - Debug - AnyCPU - {93130E7D-A950-4CBD-A0D9-7A6FAF94DDC0} - WinExe - TestGUI.My.MyApplication - TestGUI - TestGUI - 512 - WindowsForms - v4.7.2 - true - - - - AnyCPU - true - full - true - true - bin\Debug\ - TestGUI.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - AnyCPU - pdbonly - false - true - true - bin\Release\ - TestGUI.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - My Project\app.manifest - - - - - - - - - - - - - - - - - - - - - - - - False - D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll - - - P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll - - - - ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - - - ..\packages\NLog.4.7.10\lib\net45\NLog.dll - - - ..\packages\Quartz.3.3.2\lib\net472\Quartz.dll - - - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - - - - ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - - - ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - frmChecksum.vb - - - Form - - - frmConfigTest.vb - - - Form - - - frmDocView.vb - - - Form - - - frmDocViewPure.vb - - - Form - - - frmEmail.vb - - - Form - - - frmFilesystem.vb - - - Form - - - frmFolderWatcher.vb - - - Form - - - frmLookup.vb - - - Form - - - frmMail.vb - - - Form - - - Form - - - frmOld.vb - Form - - - frmRelations.vb - - - Form - - - frmStart.vb - - - Form - - - - True - Application.myapp - True - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - frmChecksum.vb - - - frmConfigTest.vb - - - frmDocView.vb - - - frmDocViewPure.vb - - - frmEmail.vb - - - frmFilesystem.vb - - - frmFolderWatcher.vb - - - frmLookup.vb - - - frmMail.vb - - - frmOld.vb - - - frmRelations.vb - - - frmStart.vb - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - - - - - {0958cddf-4a16-41f6-8837-8335f71d599c} - DocumentViewer - - - {3dcd6d1a-c830-4241-b7e4-27430e7ea483} - LookupControl - - - {3e7bc8a9-91ef-49b8-8110-2c01f664c24a} - SQLEditor - - - {D20A6BF2-C7C6-4A7A-B34D-FA27D775A049} - Common - - - {44982f9b-6116-44e2-85d0-f39650b1ef99} - Config - - - {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} - Database - - - {991d0231-4623-496d-8bd0-9ca906029cbc} - Filesystem - - - {903b2d7d-3b80-4be9-8713-7447b704e1b0} - Logging - - - {af664d85-0a4b-4bab-a2f8-83110c06553a} - Messaging - - - {4c86df8f-a280-40d4-85b0-10b1bf66c15c} - Windream - - - {a8c3f298-76ab-4359-ab3c-986e313b4336} - EDMIService - - - {5efaef9b-90b9-4f05-9f70-f79ad77fff86} - Windows - - - - - - - \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmStart.vb b/GUIs.Test.TestGUI/frmStart.vb index 4c10286d..6dd134be 100644 --- a/GUIs.Test.TestGUI/frmStart.vb +++ b/GUIs.Test.TestGUI/frmStart.vb @@ -13,7 +13,7 @@ Public Class frmStart .ProductName = "TestGUI", .CompanyName = "Digital Data" }) - Database = New MSSQLServer(LogConfig, "Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd") + Database = New MSSQLServer(LogConfig, "Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd") End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click diff --git a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb index 54f4e0c2..01a5dcf9 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb @@ -220,7 +220,7 @@ Public Class frmAdmin_ClipboardWatcher Dim oTextEdit As TextEdit = sender If e.Button.Tag = BUTTON_SEARCH_SQL Then - Dim oForm As New frmSQLEditor(My.LogConfig, My.DatabaseECM) With {.SQLString = oTextEdit.EditValue} + Dim oForm As New frmSQLEditor_old(My.LogConfig, My.DatabaseECM) With {.SQLString = oTextEdit.EditValue} Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then @@ -233,7 +233,7 @@ Public Class frmAdmin_ClipboardWatcher Dim oTextEdit As TextEdit = sender If e.Button.Tag = BUTTON_COUNT_SQL Then - Dim oForm As New frmSQLEditor(My.LogConfig, My.DatabaseECM) With {.SQLString = oTextEdit.EditValue} + Dim oForm As New frmSQLEditor_old(My.LogConfig, My.DatabaseECM) With {.SQLString = oTextEdit.EditValue} Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then