This commit is contained in:
Jonathan Jenne 2018-12-19 17:10:24 +01:00
parent deceba1cad
commit ecad723121
6 changed files with 112 additions and 53 deletions

View File

@ -6,11 +6,10 @@
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<connectionStrings> <connectionStrings>
<add name="DD_PM_WINDREAM.My.MySettings.ConnectionString" connectionString="Data Source=172.24.12.41\Tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd" <add name="DD_PM_WINDREAM.My.MySettings.ConnectionString" connectionString="Data Source=172.24.12.41\Tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient"/>
providerName="System.Data.SqlClient" />
</connectionStrings> </connectionStrings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup> </startup>
<userSettings> <userSettings>
<DD_PM_WINDREAM.My.MySettings> <DD_PM_WINDREAM.My.MySettings>

View File

@ -1,4 +1,5 @@
Imports DD_LIB_Standards Imports DD_LIB_Standards
Imports DigitalData.Controls.LookupGrid
Public Class ClassControlCreator Public Class ClassControlCreator
@ -78,7 +79,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewTextBox(location As Point) As TextBox Public Shared Function CreateNewTextBox(location As Point) As TextBox
Dim control As New TextBox With { Dim control As New TextBox With {
.Name = $"{PREFIX_TEXTBOX}_{clsTools.ShortGUID()}", .Name = $"{PREFIX_TEXTBOX}_{clsTools.ShortGuid()}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT), .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
.Location = location, .Location = location,
.ReadOnly = True, .ReadOnly = True,
@ -91,7 +92,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewLabel(location As Point) As Label Public Shared Function CreateNewLabel(location As Point) As Label
Dim control As New Label With { Dim control As New Label With {
.Name = $"{PREFIX_LABEL}_{clsTools.ShortGUID}", .Name = $"{PREFIX_LABEL}_{clsTools.ShortGuid}",
.Text = DEFAULT_TEXT, .Text = DEFAULT_TEXT,
.AutoSize = True, .AutoSize = True,
.Location = location, .Location = location,
@ -103,7 +104,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewCheckbox(location As Point) As CheckBox Public Shared Function CreateNewCheckbox(location As Point) As CheckBox
Dim control As New CheckBox With { Dim control As New CheckBox With {
.Name = $"{PREFIX_CHECKBOX}_{clsTools.ShortGUID}", .Name = $"{PREFIX_CHECKBOX}_{clsTools.ShortGuid}",
.AutoSize = True, .AutoSize = True,
.Text = DEFAULT_TEXT, .Text = DEFAULT_TEXT,
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
@ -115,7 +116,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewCombobox(location As Point) As ComboBox Public Shared Function CreateNewCombobox(location As Point) As ComboBox
Dim control As New ComboBox With { Dim control As New ComboBox With {
.Name = $"{PREFIX_COMBOBOX}_{clsTools.ShortGUID}", .Name = $"{PREFIX_COMBOBOX}_{clsTools.ShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT), .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
.Location = location .Location = location
@ -126,7 +127,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewDatetimepicker(location As Point) As DateTimePicker Public Shared Function CreateNewDatetimepicker(location As Point) As DateTimePicker
Dim control As New DateTimePicker With { Dim control As New DateTimePicker With {
.Name = $"{PREFIX_DATETIMEPICKER}_{clsTools.ShortGUID}", .Name = $"{PREFIX_DATETIMEPICKER}_{clsTools.ShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT), .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
.Location = location, .Location = location,
@ -138,7 +139,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewDatagridview(location As Point) As DataGridView Public Shared Function CreateNewDatagridview(location As Point) As DataGridView
Dim control As New DataGridView With { Dim control As New DataGridView With {
.Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGUID}", .Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE), .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
.Location = location, .Location = location,
@ -156,9 +157,21 @@ Public Class ClassControlCreator
Return control Return control
End Function End Function
Friend Shared Function CreateNewLookupControl(location As Point) As LookupControl
Dim control As New LookupControl With {
.Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
.Cursor = Cursors.Hand,
.Location = location
}
Return control
End Function
Public Shared Function CreateNewTable(location As Point) As DataGridView Public Shared Function CreateNewTable(location As Point) As DataGridView
Dim control As New DataGridView With { Dim control As New DataGridView With {
.Name = $"{PREFIX_TABLE}_{clsTools.ShortGUID}", .Name = $"{PREFIX_TABLE}_{clsTools.ShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE), .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
.Location = location, .Location = location,
@ -183,7 +196,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewLine(location As Point) As LineLabel Public Shared Function CreateNewLine(location As Point) As LineLabel
Dim control As New LineLabel With { Dim control As New LineLabel With {
.Name = $"{PREFIX_LINE}_{clsTools.ShortGUID}", .Name = $"{PREFIX_LINE}_{clsTools.ShortGuid}",
.Text = "---------------------------------", .Text = "---------------------------------",
.Size = New Size(100, 5), .Size = New Size(100, 5),
.Location = location .Location = location
@ -296,6 +309,16 @@ Public Class ClassControlCreator
Return control Return control
End Function End Function
Public Shared Function CreateExistingLookupControl(row As DataRow, designMode As Boolean)
Dim control As LookupControl = CreateBaseControl(New LookupControl(), row, designMode)
If designMode Then
control.Cursor = Cursors.Hand
End If
Return control
End Function
Public Shared Function CreateExistingTable(row As DataRow, columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow), designMode As Boolean) As DataGridView Public Shared Function CreateExistingTable(row As DataRow, columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow), designMode As Boolean) As DataGridView
Dim control As DataGridView = CreateBaseControl(New DataGridView(), row, designMode) Dim control As DataGridView = CreateBaseControl(New DataGridView(), row, designMode)
@ -402,6 +425,7 @@ Public Class ClassControlCreator
Return 0 Return 0
End Try End Try
End Function End Function
Public Shared Function GET_CONNECTION_INFO(CON_ID As Integer) Public Shared Function GET_CONNECTION_INFO(CON_ID As Integer)
Try Try

View File

@ -13,7 +13,7 @@
<AssemblyName>DD_PM_WINDREAM</AssemblyName> <AssemblyName>DD_PM_WINDREAM</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<MyType>WindowsForms</MyType> <MyType>WindowsForms</MyType>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile> <TargetFrameworkProfile>
</TargetFrameworkProfile> </TargetFrameworkProfile>
</PropertyGroup> </PropertyGroup>
@ -60,58 +60,63 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll</HintPath> <HintPath>P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.Charts.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Charts.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Reference Include="DevExpress.Data.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Charts.v18.1.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.Images.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Images.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Images.v15.2.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Images.v18.1.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.Pdf.v15.2.Drawing, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.Pdf.v18.1.Drawing, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Pdf.v18.1.Drawing.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.Printing.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Xpf.PdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Xpf.PdfViewer.v18.1.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraBars.v18.1.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.XtraCharts.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraCharts.v18.1.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.XtraCharts.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.XtraCharts.v18.1.Extensions, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Reference Include="DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v15.2.Wizard, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraCharts.v18.1.Extensions.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.XtraCharts.v18.1.UI, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraCharts.v18.1.UI.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.XtraLayout.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.XtraCharts.v18.1.Wizard, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraCharts.v18.1.Wizard.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraNavBar.v18.1.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.XtraPrinting.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraPdfViewer.v18.1.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevExpress.XtraTreeList.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll</HintPath> <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraTreeList.v18.1.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Controls.LookupGrid">
<HintPath>..\..\..\DDMonorepo\LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
</Reference> </Reference>
<Reference Include="DLLLicenseManager"> <Reference Include="DLLLicenseManager">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll</HintPath> <HintPath>P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll</HintPath>

View File

@ -1,7 +1,8 @@
DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@ -418,6 +418,7 @@ Partial Class frmFormDesigner
'TableAdapterManager 'TableAdapterManager
' '
Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing
Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing

View File

@ -1,5 +1,6 @@
Imports System.ComponentModel Imports System.ComponentModel
Imports DD_LIB_Standards Imports DD_LIB_Standards
Imports DigitalData.Controls.LookupGrid
Public Class frmFormDesigner Public Class frmFormDesigner
Public ProfileId As Integer Public ProfileId As Integer
@ -175,6 +176,11 @@ Public Class frmFormDesigner
pnldesigner.Controls.Add(table) pnldesigner.Controls.Add(table)
SetMovementHandlers(table) SetMovementHandlers(table)
Case "LOOKUP"
Dim lookup = ClassControlCreator.CreateExistingLookupControl(row, True)
pnldesigner.Controls.Add(lookup)
SetMovementHandlers(lookup)
Case "LINE" Case "LINE"
Dim line = ClassControlCreator.CreateExistingLine(row, True) Dim line = ClassControlCreator.CreateExistingLine(row, True)
pnldesigner.Controls.Add(line) pnldesigner.Controls.Add(line)
@ -290,16 +296,32 @@ Public Class frmFormDesigner
pnldesigner.Controls.Add(chk) pnldesigner.Controls.Add(chk)
'Case ClassControlCreator.PREFIX_DATAGRIDVIEW
' Dim dgv = ClassControlCreator.CreateNewDatagridview(cursorPosition)
' SetMovementHandlers(dgv)
' TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dgv.Name, "DGV", dgv.Name, dgv.Location.X, dgv.Location.Y, Environment.UserName, dgv.Size.Height, dgv.Size.Width)
' CurrentControl = dgv
' CurrentControl.Tag = GetLastID()
' pnldesigner.Controls.Add(dgv)
Case ClassControlCreator.PREFIX_DATAGRIDVIEW Case ClassControlCreator.PREFIX_DATAGRIDVIEW
Dim dgv = ClassControlCreator.CreateNewDatagridview(cursorPosition) Dim lc As LookupControl = ClassControlCreator.CreateNewLookupControl(cursorPosition)
SetMovementHandlers(dgv)
TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dgv.Name, "DGV", dgv.Name, dgv.Location.X, dgv.Location.Y, Environment.UserName, dgv.Size.Height, dgv.Size.Width) SetMovementHandlers(lc)
CurrentControl = dgv AddHandler lc.Click, Sub()
'noop
End Sub
TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, Environment.UserName, lc.Size.Height, lc.Size.Width)
CurrentControl = lc
CurrentControl.Tag = GetLastID() CurrentControl.Tag = GetLastID()
pnldesigner.Controls.Add(dgv) pnldesigner.Controls.Add(lc)
Case ClassControlCreator.PREFIX_TABLE Case ClassControlCreator.PREFIX_TABLE
Dim tb = ClassControlCreator.CreateNewTable(cursorPosition) Dim tb = ClassControlCreator.CreateNewTable(cursorPosition)
@ -688,11 +710,18 @@ Public Class frmFormDesigner
Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, row, Windream_AllIndicies) Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, row, Windream_AllIndicies)
props = dtpProps props = dtpProps
ElseIf TypeOf sender Is DataGridView Then 'ElseIf TypeOf sender Is DataGridView Then
Dim grid As DataGridView = sender ' Dim grid As DataGridView = sender
' Dim gridProps As GridViewProperties = CreatePropsObjectWithIndicies(New GridViewProperties, row, Windream_VectorIndicies)
' props = gridProps
ElseIf TypeOf sender Is LookupControl Then
Dim grid As LookupControl = sender
Dim gridProps As GridViewProperties = CreatePropsObjectWithIndicies(New GridViewProperties, row, Windream_VectorIndicies) Dim gridProps As GridViewProperties = CreatePropsObjectWithIndicies(New GridViewProperties, row, Windream_VectorIndicies)
props = gridProps props = gridProps
Else Else
MsgBox("This is not a supported control type!") MsgBox("This is not a supported control type!")
Exit Sub Exit Sub