9 Commits

Author SHA1 Message Date
Jonathan Jenne
37cc6c9305 Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo 2021-04-06 13:52:14 +02:00
Jonathan Jenne
05c9cc323b ZooFlow: Include sourcesql window again 2021-04-06 13:52:03 +02:00
Jonathan Jenne
8a6ca92939 merge 2021-04-06 13:28:08 +02:00
Jonathan Jenne
1caed3d720 ZooFLow: fix active column? 2021-04-06 13:21:19 +02:00
Jonathan Jenne
cefe07bf57 ZooFLow: Almost finish sourcesql window 2021-04-06 13:21:05 +02:00
Jonathan Jenne
cfbe2fd4b6 ZooFlow: Add about image 2021-04-06 13:20:41 +02:00
Jonathan Jenne
be4065208c TestGUI: Update Lookup GUI 2021-04-06 13:20:03 +02:00
Jonathan Jenne
41c3ded13c LookupGrid: Version 3.0.1 2021-04-06 13:19:51 +02:00
Jonathan Jenne
6508ff742a LookupControl: Fix empty popup when datasource is empty but allownewvalues is true 2021-04-06 13:19:02 +02:00
11 changed files with 245 additions and 130 deletions

View File

@@ -163,7 +163,19 @@ Public Class RepositoryItemLookupControl3
End Select End Select
Else Else
NullText = Values.FirstOrDefault() NullText = Values.FirstOrDefault()
'OwnerEdit.EditValue = Values.FirstOrDefault() End If
If DataSource Is Nothing Then
Dim oDataTable As New DataTable()
oDataTable.Columns.Add(New DataColumn("Data", GetType(String)))
For Each oValue In Values
Dim oRow = oDataTable.NewRow()
oRow.Item(0) = oValue
oDataTable.Rows.Add(oRow)
Next
DataSource = oDataTable
End If End If
_SelectedValues = Values _SelectedValues = Values

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.0.0.0")> <Assembly: AssemblyVersion("3.0.1.0")>
<Assembly: AssemblyFileVersion("3.0.0.0")> <Assembly: AssemblyFileVersion("3.0.1.0")>

View File

@@ -15,8 +15,12 @@ Public Class frmLookup
.Location = New Point(10, 60), .Location = New Point(10, 60),
.Size = New Drawing.Size(100, 27) .Size = New Drawing.Size(100, 27)
} }
Dim LookupControl33 As New LookupControl3 With {
.Location = New Point(10, 110),
.Size = New Drawing.Size(100, 27)
}
Controls.AddRange({LookupControl31, LookupControl32}) Controls.AddRange({LookupControl31, LookupControl32, LookupControl33})
LookupControl31.Properties.DataSource = oTable LookupControl31.Properties.DataSource = oTable
@@ -24,6 +28,9 @@ Public Class frmLookup
LookupControl32.Properties.DisplayMember = "Col1" LookupControl32.Properties.DisplayMember = "Col1"
LookupControl32.Properties.ValueMember = "Col1" LookupControl32.Properties.ValueMember = "Col1"
LookupControl32.Properties.DataSource = oTable LookupControl32.Properties.DataSource = oTable
LookupControl33.Properties.AllowAddNewValues = True
LookupControl33.Properties.MultiSelect = True
End Sub End Sub
Private Function GetDatatable(Limit As Integer) As DataTable Private Function GetDatatable(Limit As Integer) As DataTable

View File

@@ -24,19 +24,20 @@ Partial Class frmAdmin_SourceSQL
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
Me.labelStatus = New DevExpress.XtraBars.BarStaticItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit()
Me.TBZF_ADMIN_SOURCE_SQLBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten()
Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit()
Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit()
Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit()
Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit()
Me.MemoEdit1 = New DevExpress.XtraEditors.MemoEdit() Me.MemoEdit1 = New DevExpress.XtraEditors.MemoEdit()
Me.txtAddedWho = New DevExpress.XtraEditors.TextEdit() Me.txtAddedWho = New DevExpress.XtraEditors.TextEdit()
Me.TBZF_ADMIN_SOURCE_SQLBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten()
Me.TextEdit7 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit7 = New DevExpress.XtraEditors.TextEdit()
Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit()
Me.TextEdit9 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit9 = New DevExpress.XtraEditors.TextEdit()
@@ -58,14 +59,14 @@ Partial Class frmAdmin_SourceSQL
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.LayoutControl1.SuspendLayout() Me.LayoutControl1.SuspendLayout()
CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBZF_ADMIN_SOURCE_SQLBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBZF_ADMIN_SOURCE_SQLBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -87,15 +88,15 @@ Partial Class frmAdmin_SourceSQL
' '
Me.RibbonControl.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified
Me.RibbonControl.ExpandCollapseItem.Id = 0 Me.RibbonControl.ExpandCollapseItem.Id = 0
Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.labelStatus})
Me.RibbonControl.Location = New System.Drawing.Point(0, 0) Me.RibbonControl.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl.MaxItemId = 4 Me.RibbonControl.MaxItemId = 5
Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Name = "RibbonControl"
Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
Me.RibbonControl.ShowToolbarCustomizeItem = False Me.RibbonControl.ShowToolbarCustomizeItem = False
Me.RibbonControl.Size = New System.Drawing.Size(768, 63) Me.RibbonControl.Size = New System.Drawing.Size(768, 66)
Me.RibbonControl.StatusBar = Me.RibbonStatusBar Me.RibbonControl.StatusBar = Me.RibbonStatusBar
Me.RibbonControl.Toolbar.ShowCustomizeItem = False Me.RibbonControl.Toolbar.ShowCustomizeItem = False
' '
@@ -120,6 +121,14 @@ Partial Class frmAdmin_SourceSQL
Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.delete Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.delete
Me.BarButtonItem3.Name = "BarButtonItem3" Me.BarButtonItem3.Name = "BarButtonItem3"
' '
'labelStatus
'
Me.labelStatus.Caption = "labelStatus"
Me.labelStatus.Id = 4
Me.labelStatus.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.about4
Me.labelStatus.Name = "labelStatus"
Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
'
'RibbonPage1 'RibbonPage1
' '
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
@@ -136,10 +145,11 @@ Partial Class frmAdmin_SourceSQL
' '
'RibbonStatusBar 'RibbonStatusBar
' '
Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 583) Me.RibbonStatusBar.ItemLinks.Add(Me.labelStatus)
Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 585)
Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Name = "RibbonStatusBar"
Me.RibbonStatusBar.Ribbon = Me.RibbonControl Me.RibbonStatusBar.Ribbon = Me.RibbonControl
Me.RibbonStatusBar.Size = New System.Drawing.Size(768, 24) Me.RibbonStatusBar.Size = New System.Drawing.Size(768, 22)
' '
'LayoutControl1 'LayoutControl1
' '
@@ -154,85 +164,24 @@ Partial Class frmAdmin_SourceSQL
Me.LayoutControl1.Controls.Add(Me.txtChangedWho) Me.LayoutControl1.Controls.Add(Me.txtChangedWho)
Me.LayoutControl1.Controls.Add(Me.TextEdit9) Me.LayoutControl1.Controls.Add(Me.TextEdit9)
Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
Me.LayoutControl1.Location = New System.Drawing.Point(0, 63) Me.LayoutControl1.Location = New System.Drawing.Point(0, 66)
Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Name = "LayoutControl1"
Me.LayoutControl1.Root = Me.Root Me.LayoutControl1.Root = Me.Root
Me.LayoutControl1.Size = New System.Drawing.Size(768, 520) Me.LayoutControl1.Size = New System.Drawing.Size(768, 519)
Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.TabIndex = 2
Me.LayoutControl1.Text = "LayoutControl1" Me.LayoutControl1.Text = "LayoutControl1"
' '
'TextEdit1 'TextEdit1
' '
Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "GUID", True)) Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "GUID", True))
Me.TextEdit1.Location = New System.Drawing.Point(99, 20) Me.TextEdit1.Location = New System.Drawing.Point(105, 20)
Me.TextEdit1.MenuManager = Me.RibbonControl Me.TextEdit1.MenuManager = Me.RibbonControl
Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Name = "TextEdit1"
Me.TextEdit1.Properties.ReadOnly = True Me.TextEdit1.Properties.ReadOnly = True
Me.TextEdit1.Size = New System.Drawing.Size(649, 20) Me.TextEdit1.Size = New System.Drawing.Size(643, 20)
Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.StyleController = Me.LayoutControl1
Me.TextEdit1.TabIndex = 4 Me.TextEdit1.TabIndex = 4
' '
'TextEdit2
'
Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ENTITY_TITLE", True))
Me.TextEdit2.Location = New System.Drawing.Point(99, 60)
Me.TextEdit2.MenuManager = Me.RibbonControl
Me.TextEdit2.Name = "TextEdit2"
Me.TextEdit2.Size = New System.Drawing.Size(649, 20)
Me.TextEdit2.StyleController = Me.LayoutControl1
Me.TextEdit2.TabIndex = 5
'
'TextEdit3
'
Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "PK_COLUMN", True))
Me.TextEdit3.Location = New System.Drawing.Point(99, 100)
Me.TextEdit3.MenuManager = Me.RibbonControl
Me.TextEdit3.Name = "TextEdit3"
Me.TextEdit3.Size = New System.Drawing.Size(649, 20)
Me.TextEdit3.StyleController = Me.LayoutControl1
Me.TextEdit3.TabIndex = 6
'
'TextEdit4
'
Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "FK_COLUMN", True))
Me.TextEdit4.Location = New System.Drawing.Point(99, 140)
Me.TextEdit4.MenuManager = Me.RibbonControl
Me.TextEdit4.Name = "TextEdit4"
Me.TextEdit4.Size = New System.Drawing.Size(649, 20)
Me.TextEdit4.StyleController = Me.LayoutControl1
Me.TextEdit4.TabIndex = 7
'
'TextEdit5
'
Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SCOPE", True))
Me.TextEdit5.Location = New System.Drawing.Point(99, 180)
Me.TextEdit5.MenuManager = Me.RibbonControl
Me.TextEdit5.Name = "TextEdit5"
Me.TextEdit5.Size = New System.Drawing.Size(649, 20)
Me.TextEdit5.StyleController = Me.LayoutControl1
Me.TextEdit5.TabIndex = 8
'
'MemoEdit1
'
Me.MemoEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SQL_COMMAND", True))
Me.MemoEdit1.Location = New System.Drawing.Point(99, 220)
Me.MemoEdit1.MenuManager = Me.RibbonControl
Me.MemoEdit1.Name = "MemoEdit1"
Me.MemoEdit1.Size = New System.Drawing.Size(649, 128)
Me.MemoEdit1.StyleController = Me.LayoutControl1
Me.MemoEdit1.TabIndex = 9
'
'txtAddedWho
'
Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ADDED_WHO", True))
Me.txtAddedWho.Location = New System.Drawing.Point(99, 368)
Me.txtAddedWho.MenuManager = Me.RibbonControl
Me.txtAddedWho.Name = "txtAddedWho"
Me.txtAddedWho.Properties.ReadOnly = True
Me.txtAddedWho.Size = New System.Drawing.Size(275, 20)
Me.txtAddedWho.StyleController = Me.LayoutControl1
Me.txtAddedWho.TabIndex = 10
'
'TBZF_ADMIN_SOURCE_SQLBindingSource 'TBZF_ADMIN_SOURCE_SQLBindingSource
' '
Me.TBZF_ADMIN_SOURCE_SQLBindingSource.DataMember = "TBZF_ADMIN_SOURCE_SQL" Me.TBZF_ADMIN_SOURCE_SQLBindingSource.DataMember = "TBZF_ADMIN_SOURCE_SQL"
@@ -243,36 +192,97 @@ Partial Class frmAdmin_SourceSQL
Me.DSIDB_Stammdaten.DataSetName = "DSIDB_Stammdaten" Me.DSIDB_Stammdaten.DataSetName = "DSIDB_Stammdaten"
Me.DSIDB_Stammdaten.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema Me.DSIDB_Stammdaten.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
' '
'TextEdit2
'
Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ENTITY_TITLE", True))
Me.TextEdit2.Location = New System.Drawing.Point(105, 60)
Me.TextEdit2.MenuManager = Me.RibbonControl
Me.TextEdit2.Name = "TextEdit2"
Me.TextEdit2.Size = New System.Drawing.Size(643, 20)
Me.TextEdit2.StyleController = Me.LayoutControl1
Me.TextEdit2.TabIndex = 5
'
'TextEdit3
'
Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "PK_COLUMN", True))
Me.TextEdit3.Location = New System.Drawing.Point(105, 100)
Me.TextEdit3.MenuManager = Me.RibbonControl
Me.TextEdit3.Name = "TextEdit3"
Me.TextEdit3.Size = New System.Drawing.Size(643, 20)
Me.TextEdit3.StyleController = Me.LayoutControl1
Me.TextEdit3.TabIndex = 6
'
'TextEdit4
'
Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "FK_COLUMN", True))
Me.TextEdit4.Location = New System.Drawing.Point(105, 140)
Me.TextEdit4.MenuManager = Me.RibbonControl
Me.TextEdit4.Name = "TextEdit4"
Me.TextEdit4.Size = New System.Drawing.Size(643, 20)
Me.TextEdit4.StyleController = Me.LayoutControl1
Me.TextEdit4.TabIndex = 7
'
'TextEdit5
'
Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SCOPE", True))
Me.TextEdit5.Location = New System.Drawing.Point(105, 180)
Me.TextEdit5.MenuManager = Me.RibbonControl
Me.TextEdit5.Name = "TextEdit5"
Me.TextEdit5.Size = New System.Drawing.Size(643, 20)
Me.TextEdit5.StyleController = Me.LayoutControl1
Me.TextEdit5.TabIndex = 8
'
'MemoEdit1
'
Me.MemoEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SQL_COMMAND", True))
Me.MemoEdit1.Location = New System.Drawing.Point(105, 220)
Me.MemoEdit1.MenuManager = Me.RibbonControl
Me.MemoEdit1.Name = "MemoEdit1"
Me.MemoEdit1.Size = New System.Drawing.Size(643, 127)
Me.MemoEdit1.StyleController = Me.LayoutControl1
Me.MemoEdit1.TabIndex = 9
'
'txtAddedWho
'
Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ADDED_WHO", True))
Me.txtAddedWho.Location = New System.Drawing.Point(105, 367)
Me.txtAddedWho.MenuManager = Me.RibbonControl
Me.txtAddedWho.Name = "txtAddedWho"
Me.txtAddedWho.Properties.ReadOnly = True
Me.txtAddedWho.Size = New System.Drawing.Size(269, 20)
Me.txtAddedWho.StyleController = Me.LayoutControl1
Me.txtAddedWho.TabIndex = 10
'
'TextEdit7 'TextEdit7
' '
Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ADDED_WHEN", True)) Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ADDED_WHEN", True))
Me.TextEdit7.Location = New System.Drawing.Point(473, 368) Me.TextEdit7.Location = New System.Drawing.Point(479, 367)
Me.TextEdit7.MenuManager = Me.RibbonControl Me.TextEdit7.MenuManager = Me.RibbonControl
Me.TextEdit7.Name = "TextEdit7" Me.TextEdit7.Name = "TextEdit7"
Me.TextEdit7.Properties.ReadOnly = True Me.TextEdit7.Properties.ReadOnly = True
Me.TextEdit7.Size = New System.Drawing.Size(275, 20) Me.TextEdit7.Size = New System.Drawing.Size(269, 20)
Me.TextEdit7.StyleController = Me.LayoutControl1 Me.TextEdit7.StyleController = Me.LayoutControl1
Me.TextEdit7.TabIndex = 11 Me.TextEdit7.TabIndex = 11
' '
'txtChangedWho 'txtChangedWho
' '
Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "CHANGED_WHO", True)) Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "CHANGED_WHO", True))
Me.txtChangedWho.Location = New System.Drawing.Point(99, 408) Me.txtChangedWho.Location = New System.Drawing.Point(105, 407)
Me.txtChangedWho.MenuManager = Me.RibbonControl Me.txtChangedWho.MenuManager = Me.RibbonControl
Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Name = "txtChangedWho"
Me.txtChangedWho.Properties.ReadOnly = True Me.txtChangedWho.Properties.ReadOnly = True
Me.txtChangedWho.Size = New System.Drawing.Size(275, 20) Me.txtChangedWho.Size = New System.Drawing.Size(269, 20)
Me.txtChangedWho.StyleController = Me.LayoutControl1 Me.txtChangedWho.StyleController = Me.LayoutControl1
Me.txtChangedWho.TabIndex = 12 Me.txtChangedWho.TabIndex = 12
' '
'TextEdit9 'TextEdit9
' '
Me.TextEdit9.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "CHANGED_WHEN", True)) Me.TextEdit9.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "CHANGED_WHEN", True))
Me.TextEdit9.Location = New System.Drawing.Point(473, 408) Me.TextEdit9.Location = New System.Drawing.Point(479, 407)
Me.TextEdit9.MenuManager = Me.RibbonControl Me.TextEdit9.MenuManager = Me.RibbonControl
Me.TextEdit9.Name = "TextEdit9" Me.TextEdit9.Name = "TextEdit9"
Me.TextEdit9.Properties.ReadOnly = True Me.TextEdit9.Properties.ReadOnly = True
Me.TextEdit9.Size = New System.Drawing.Size(275, 20) Me.TextEdit9.Size = New System.Drawing.Size(269, 20)
Me.TextEdit9.StyleController = Me.LayoutControl1 Me.TextEdit9.StyleController = Me.LayoutControl1
Me.TextEdit9.TabIndex = 13 Me.TextEdit9.TabIndex = 13
' '
@@ -282,7 +292,7 @@ Partial Class frmAdmin_SourceSQL
Me.Root.GroupBordersVisible = False Me.Root.GroupBordersVisible = False
Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.EmptySpaceItem1, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem10}) Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.EmptySpaceItem1, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem10})
Me.Root.Name = "Root" Me.Root.Name = "Root"
Me.Root.Size = New System.Drawing.Size(768, 520) Me.Root.Size = New System.Drawing.Size(768, 519)
Me.Root.TextVisible = False Me.Root.TextVisible = False
' '
'LayoutControlItem1 'LayoutControlItem1
@@ -293,7 +303,7 @@ Partial Class frmAdmin_SourceSQL
Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem1.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem1.Size = New System.Drawing.Size(748, 40)
Me.LayoutControlItem1.Text = "GUID" Me.LayoutControlItem1.Text = "GUID"
Me.LayoutControlItem1.TextSize = New System.Drawing.Size(76, 13) Me.LayoutControlItem1.TextSize = New System.Drawing.Size(82, 13)
' '
'LayoutControlItem2 'LayoutControlItem2
' '
@@ -303,7 +313,7 @@ Partial Class frmAdmin_SourceSQL
Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem2.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem2.Size = New System.Drawing.Size(748, 40)
Me.LayoutControlItem2.Text = "Entity Title" Me.LayoutControlItem2.Text = "Entity Title"
Me.LayoutControlItem2.TextSize = New System.Drawing.Size(76, 13) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(82, 13)
' '
'LayoutControlItem3 'LayoutControlItem3
' '
@@ -313,7 +323,7 @@ Partial Class frmAdmin_SourceSQL
Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem3.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem3.Size = New System.Drawing.Size(748, 40)
Me.LayoutControlItem3.Text = "Primary Key" Me.LayoutControlItem3.Text = "Primary Key"
Me.LayoutControlItem3.TextSize = New System.Drawing.Size(76, 13) Me.LayoutControlItem3.TextSize = New System.Drawing.Size(82, 13)
' '
'LayoutControlItem4 'LayoutControlItem4
' '
@@ -323,7 +333,7 @@ Partial Class frmAdmin_SourceSQL
Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem4.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem4.Size = New System.Drawing.Size(748, 40)
Me.LayoutControlItem4.Text = "Foreign Key" Me.LayoutControlItem4.Text = "Foreign Key"
Me.LayoutControlItem4.TextSize = New System.Drawing.Size(76, 13) Me.LayoutControlItem4.TextSize = New System.Drawing.Size(82, 13)
' '
'LayoutControlItem5 'LayoutControlItem5
' '
@@ -333,7 +343,7 @@ Partial Class frmAdmin_SourceSQL
Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem5.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem5.Size = New System.Drawing.Size(748, 40)
Me.LayoutControlItem5.Text = "Scope" Me.LayoutControlItem5.Text = "Scope"
Me.LayoutControlItem5.TextSize = New System.Drawing.Size(76, 13) Me.LayoutControlItem5.TextSize = New System.Drawing.Size(82, 13)
' '
'LayoutControlItem6 'LayoutControlItem6
' '
@@ -341,14 +351,14 @@ Partial Class frmAdmin_SourceSQL
Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 200) Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 200)
Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Name = "LayoutControlItem6"
Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem6.Size = New System.Drawing.Size(748, 148) Me.LayoutControlItem6.Size = New System.Drawing.Size(748, 147)
Me.LayoutControlItem6.Text = "SQL Command" Me.LayoutControlItem6.Text = "SQL Command"
Me.LayoutControlItem6.TextSize = New System.Drawing.Size(76, 13) Me.LayoutControlItem6.TextSize = New System.Drawing.Size(82, 13)
' '
'EmptySpaceItem1 'EmptySpaceItem1
' '
Me.EmptySpaceItem1.AllowHotTrack = False Me.EmptySpaceItem1.AllowHotTrack = False
Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 428) Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 427)
Me.EmptySpaceItem1.Name = "EmptySpaceItem1" Me.EmptySpaceItem1.Name = "EmptySpaceItem1"
Me.EmptySpaceItem1.Size = New System.Drawing.Size(748, 72) Me.EmptySpaceItem1.Size = New System.Drawing.Size(748, 72)
Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
@@ -356,42 +366,42 @@ Partial Class frmAdmin_SourceSQL
'LayoutControlItem7 'LayoutControlItem7
' '
Me.LayoutControlItem7.Control = Me.txtAddedWho Me.LayoutControlItem7.Control = Me.txtAddedWho
Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 348) Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 347)
Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Name = "LayoutControlItem7"
Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem7.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem7.Size = New System.Drawing.Size(374, 40)
Me.LayoutControlItem7.Text = "Erstellt Wer" Me.LayoutControlItem7.Text = "Erstellt Wer"
Me.LayoutControlItem7.TextSize = New System.Drawing.Size(76, 13) Me.LayoutControlItem7.TextSize = New System.Drawing.Size(82, 13)
' '
'LayoutControlItem9 'LayoutControlItem9
' '
Me.LayoutControlItem9.Control = Me.txtChangedWho Me.LayoutControlItem9.Control = Me.txtChangedWho
Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 388) Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 387)
Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Name = "LayoutControlItem9"
Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem9.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem9.Size = New System.Drawing.Size(374, 40)
Me.LayoutControlItem9.Text = "Geändert Wer" Me.LayoutControlItem9.Text = "Geändert Wer"
Me.LayoutControlItem9.TextSize = New System.Drawing.Size(76, 13) Me.LayoutControlItem9.TextSize = New System.Drawing.Size(82, 13)
' '
'LayoutControlItem8 'LayoutControlItem8
' '
Me.LayoutControlItem8.Control = Me.TextEdit7 Me.LayoutControlItem8.Control = Me.TextEdit7
Me.LayoutControlItem8.Location = New System.Drawing.Point(374, 348) Me.LayoutControlItem8.Location = New System.Drawing.Point(374, 347)
Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Name = "LayoutControlItem8"
Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem8.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem8.Size = New System.Drawing.Size(374, 40)
Me.LayoutControlItem8.Text = "Erstellt Wann" Me.LayoutControlItem8.Text = "Erstellt Wann"
Me.LayoutControlItem8.TextSize = New System.Drawing.Size(76, 13) Me.LayoutControlItem8.TextSize = New System.Drawing.Size(82, 13)
' '
'LayoutControlItem10 'LayoutControlItem10
' '
Me.LayoutControlItem10.Control = Me.TextEdit9 Me.LayoutControlItem10.Control = Me.TextEdit9
Me.LayoutControlItem10.Location = New System.Drawing.Point(374, 388) Me.LayoutControlItem10.Location = New System.Drawing.Point(374, 387)
Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Name = "LayoutControlItem10"
Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem10.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem10.Size = New System.Drawing.Size(374, 40)
Me.LayoutControlItem10.Text = "Geändert Wann" Me.LayoutControlItem10.Text = "Geändert Wann"
Me.LayoutControlItem10.TextSize = New System.Drawing.Size(76, 13) Me.LayoutControlItem10.TextSize = New System.Drawing.Size(82, 13)
' '
'TBZF_ADMIN_SOURCE_SQLTableAdapter 'TBZF_ADMIN_SOURCE_SQLTableAdapter
' '
@@ -423,14 +433,14 @@ Partial Class frmAdmin_SourceSQL
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.LayoutControl1.ResumeLayout(False) Me.LayoutControl1.ResumeLayout(False)
CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBZF_ADMIN_SOURCE_SQLBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBZF_ADMIN_SOURCE_SQLBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).EndInit()
@@ -485,4 +495,5 @@ Partial Class frmAdmin_SourceSQL
Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem
Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem
Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem
Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem
End Class End Class

View File

@@ -123,6 +123,9 @@
<metadata name="DSIDB_Stammdaten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="DSIDB_Stammdaten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<metadata name="DSIDB_Stammdaten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="TBZF_ADMIN_SOURCE_SQLTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TBZF_ADMIN_SOURCE_SQLTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>457, 17</value> <value>457, 17</value>
</metadata> </metadata>

View File

@@ -19,7 +19,7 @@
Try Try
TBZF_ADMIN_SOURCE_SQLBindingSource.EndEdit() TBZF_ADMIN_SOURCE_SQLBindingSource.EndEdit()
If DSIDB_Stammdaten.TBIDB_BUSINESS_ENTITY.GetChanges() IsNot Nothing Then If DSIDB_Stammdaten.TBZF_ADMIN_SOURCE_SQL.GetChanges() IsNot Nothing Then
HasChanges = True HasChanges = True
If IsInsert Then If IsInsert Then
@@ -46,4 +46,29 @@
ShowError(ex) ShowError(ex)
End Try End Try
End Sub End Sub
Private Sub ResetMessages()
labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End Sub
Private Sub ShowStatus(Message As String)
labelStatus.Caption = Message
labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
End Sub
Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
ResetMessages()
If SaveData() And HasChanges Then
ShowStatus("Attribute gespeichert!")
End If
End Sub
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
ResetMessages()
If SaveData() Then
Close()
End If
End Sub
End Class End Class

View File

@@ -194,7 +194,7 @@ Public Class frmAdmin_Start
End Try End Try
End Sub End Sub
Private Function Get_ActiveColumn() As GridColumn Private Sub Style_ActiveColumn(ActiveColumn)
Dim oActiveEditor As New RepositoryItemImageComboBox With { Dim oActiveEditor As New RepositoryItemImageComboBox With {
.SmallImages = ActiveImages, .SmallImages = ActiveImages,
.GlyphAlignment = HorzAlignment.Center .GlyphAlignment = HorzAlignment.Center
@@ -204,35 +204,36 @@ Public Class frmAdmin_Start
New ImageComboBoxItem("Active", True, 0), New ImageComboBoxItem("Active", True, 0),
New ImageComboBoxItem("Inactive", False, 1) New ImageComboBoxItem("Inactive", False, 1)
}) })
Dim oActiveColumn = New GridColumn() With {
.Name = "columnActive",
.Caption = " ",
.FieldName = COLUMN_NAME_ACTIVE,
.Visible = True,
.VisibleIndex = 0,
.ColumnEdit = oActiveEditor,
.MaxWidth = 30,
.MinWidth = 30,
.Image = ActiveImages.GetImage(0)
}
oActiveColumn.OptionsColumn.AllowEdit = False
Return oActiveColumn With ActiveColumn
End Function .Caption = " "
.Name = "columnActive"
.Visible = True
.VisibleIndex = 0
.ColumnEdit = oActiveEditor
.MaxWidth = 30
.MinWidth = 30
.Image = ActiveImages.GetImage(0)
.OptionsColumn.AllowEdit = False
End With
End Sub
Private Sub Load_Tree(Source As AdminItem) Private Sub Load_Tree(Source As AdminItem)
If Source Is Nothing OrElse Source.SQLResult Is Nothing Then If Source Is Nothing OrElse Source.SQLResult Is Nothing Then
Exit Sub Exit Sub
End If End If
Dim oActiveColumn = Get_ActiveColumn()
GridControl1.DataSource = Source.SQLResult GridControl1.DataSource = Source.SQLResult
GridControl1.ForceInitialize() GridControl1.ForceInitialize()
GridView1.PopulateColumns() GridView1.PopulateColumns()
If GridView1.Columns.Item(COLUMN_NAME_ACTIVE) Is Nothing Then If GridView1.Columns.Item(COLUMN_NAME_ACTIVE) Is Nothing Then
Dim oActiveColumn = New GridColumn() With {.FieldName = COLUMN_NAME_ACTIVE}
GridView1.Columns.Add(oActiveColumn) GridView1.Columns.Add(oActiveColumn)
Style_ActiveColumn(oActiveColumn)
Else
Style_ActiveColumn(GridView1.Columns.Item(COLUMN_NAME_ACTIVE))
End If End If
With GridView1.Appearance.EvenRow With GridView1.Appearance.EvenRow

View File

@@ -220,6 +220,16 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
Friend ReadOnly Property about4() As DevExpress.Utils.Svg.SvgImage
Get
Dim obj As Object = ResourceManager.GetObject("about4", resourceCulture)
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
End Get
End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary> '''</summary>

View File

@@ -127,8 +127,8 @@
<data name="ZooflowTitle" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="ZooflowTitle" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooflowTitle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\ZooflowTitle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="renamedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\delete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="bo_appointment" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="bo_appointment" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bo_appointment.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\bo_appointment.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -151,6 +151,12 @@
<data name="definednameuseinformula" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="definednameuseinformula" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="DD_Icons_ICO_PMANAGER_128px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DD_Icons_ICO_PMANAGER_128px" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="about1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="about1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
@@ -181,6 +187,9 @@
<data name="markcomplete" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="markcomplete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="renamedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="actions_check3" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="actions_check3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
@@ -217,6 +226,12 @@
<data name="highimportance" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="highimportance" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="save3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="save7" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save7.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="actions_deletecircled2" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="actions_deletecircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
@@ -244,6 +259,9 @@
<data name="2_ZOO_FLOW_Abo" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="2_ZOO_FLOW_Abo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="managedatasource1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\managedatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="managedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="managedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
@@ -289,9 +307,6 @@
<data name="3_PERSON_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="3_PERSON_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="actions_edit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="bo_appearance" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="bo_appearance" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
@@ -301,8 +316,8 @@
<data name="crossdatasourcefiltering" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="crossdatasourcefiltering" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="save3" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="actions_edit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -331,7 +346,7 @@
<data name="GLOBIX_short" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="GLOBIX_short" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Datasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="about4" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Datasource_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
</root> </root>

View File

@@ -0,0 +1,19 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
<style type="text/css">
.Yellow{fill:#FFB115;}
.Red{fill:#D11C1C;}
.Blue{fill:#1177D7;}
.Green{fill:#039C23;}
.Black{fill:#727272;}
.White{fill:#FFFFFF;}
.st0{opacity:0.5;}
.st1{display:none;}
.st2{display:inline;fill:#039C23;}
.st3{display:inline;fill:#D11C1C;}
.st4{display:inline;fill:#727272;}
</style>
<g id="About">
<path d="M16,2C8.3,2,2,8.3,2,16s6.3,14,14,14s14-6.3,14-14S23.7,2,16,2z M16,6c1.1,0,2,0.9,2,2s-0.9,2-2,2s-2-0.9-2-2 S14.9,6,16,6z M20,24h-8v-2h2v-8h-2v-2h2h4v10h2V24z" class="Blue" />
</g>
</svg>

View File

@@ -148,6 +148,12 @@
<Compile Include="Administration\frmAdmin_Globix.vb"> <Compile Include="Administration\frmAdmin_Globix.vb">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Administration\frmAdmin_SourceSQL.Designer.vb">
<DependentUpon>frmAdmin_SourceSQL.vb</DependentUpon>
</Compile>
<Compile Include="Administration\frmAdmin_SourceSQL.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Administration\SourceBundle.vb" /> <Compile Include="Administration\SourceBundle.vb" />
<Compile Include="ApplicationEvents.vb" /> <Compile Include="ApplicationEvents.vb" />
<Compile Include="Base\BaseClass.vb" /> <Compile Include="Base\BaseClass.vb" />
@@ -323,6 +329,9 @@
<EmbeddedResource Include="Administration\frmAdmin_Globix.resx"> <EmbeddedResource Include="Administration\frmAdmin_Globix.resx">
<DependentUpon>frmAdmin_Globix.vb</DependentUpon> <DependentUpon>frmAdmin_Globix.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Administration\frmAdmin_SourceSQL.resx">
<DependentUpon>frmAdmin_SourceSQL.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmtest.resx"> <EmbeddedResource Include="frmtest.resx">
<DependentUpon>frmtest.vb</DependentUpon> <DependentUpon>frmtest.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
@@ -699,6 +708,9 @@
<ItemGroup> <ItemGroup>
<None Include="Resources\Datasource_16x16.png" /> <None Include="Resources\Datasource_16x16.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Resources\about4.svg" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.