diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 683d63e8..5c07cacf 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -127,7 +127,7 @@ Public Class DocumentViewer End Sub Private Sub FreeFile() Try - If Len(_FilePath) Then + If Len(_FilePath) OrElse _Fileinfo Is Nothing Then Exit Sub End If Dim oExtension As String = _Fileinfo.Extension.ToUpper diff --git a/Controls.DocumentViewer/My Project/AssemblyInfo.vb b/Controls.DocumentViewer/My Project/AssemblyInfo.vb index 78b029e0..18505ac9 100644 --- a/Controls.DocumentViewer/My Project/AssemblyInfo.vb +++ b/Controls.DocumentViewer/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Controls.LookupGrid/LookupControl.vbproj b/Controls.LookupGrid/LookupControl.vbproj index 66c4fa50..38f00b9a 100644 --- a/Controls.LookupGrid/LookupControl.vbproj +++ b/Controls.LookupGrid/LookupControl.vbproj @@ -136,8 +136,21 @@ Component + + Strings.en.resx + True + True + + + True + True + Strings.resx + + + frmLookupGrid.vb + frmLookupGrid.vb @@ -157,6 +170,16 @@ My.Resources Designer + + ResXFileCodeGenerator + Strings.en.Designer.vb + My.Resources + + + My.Resources + ResXFileCodeGenerator + Strings.Designer.vb + diff --git a/Controls.LookupGrid/LookupControl2.vb b/Controls.LookupGrid/LookupControl2.vb index e75802bd..c3662fa3 100644 --- a/Controls.LookupGrid/LookupControl2.vb +++ b/Controls.LookupGrid/LookupControl2.vb @@ -53,15 +53,15 @@ Public Class LookupControl2 Private Const TAG_DROPDOWN = "openDropdown" Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm" - Private Const TEXT_NO_RECORDS = "Keine Datensätze ausgewählt" - Private Const TEXT_ONE_RECORD = "Ein Datensatz ausgewählt" - Private Const TEXT_N_RECORDS = "{0} Datensätze ausgewählt" + Private _R As Resources.ResourceManager = My.Resources.Strings.ResourceManager Private _SelectedValues As New List(Of String) Private _MultiSelect As Boolean Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents fProperties As RepositoryItemGridLookUpEdit + Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView Private _ReadOnly As Boolean = False Shared Sub New() @@ -81,7 +81,7 @@ Public Class LookupControl2 Properties.Buttons.Item(0).Tag = TAG_DROPDOWN Properties.Buttons.AddRange({_LookupFormButton}) - Properties.NullText = TEXT_NO_RECORDS + Properties.NullText = _R.GetString("LookupControl_NoRecords") AddHandler ButtonClick, AddressOf HandleButtonClick AddHandler EditValueChanging, AddressOf HandleEditValueChanging @@ -155,11 +155,11 @@ Public Class LookupControl2 Select Case Values.Count Case 0 - Properties.NullText = TEXT_NO_RECORDS + Properties.NullText = _R.GetString("LookupControl_NoRecords") Case 1 - Properties.NullText = TEXT_ONE_RECORD + Properties.NullText = _R.GetString("LookupControl_OneRecord") Case Else - Properties.NullText = String.Format(TEXT_N_RECORDS, Values.Count) + Properties.NullText = String.Format(_R.GetString("LookupControl_NRecords"), Values.Count) End Select Else Properties.NullText = Values.FirstOrDefault() @@ -198,6 +198,31 @@ Public Class LookupControl2 Return RepositoryItemLookupControl2.CustomEditName End Get End Property + + Private Sub InitializeComponent() + Me.fProperties = New DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit() + Me.fPropertiesView = New DevExpress.XtraGrid.Views.Grid.GridView() + CType(Me.fProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'fProperties + ' + Me.fProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.fProperties.Name = "fProperties" + Me.fProperties.PopupView = Me.fPropertiesView + ' + 'fPropertiesView + ' + Me.fPropertiesView.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + Me.fPropertiesView.Name = "fPropertiesView" + Me.fPropertiesView.OptionsSelection.EnableAppearanceFocusedCell = False + Me.fPropertiesView.OptionsView.ShowGroupPanel = False + CType(Me.fProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub End Class diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb index 9fc080f0..bea6278d 100644 --- a/Controls.LookupGrid/LookupControl3.vb +++ b/Controls.LookupGrid/LookupControl3.vb @@ -13,13 +13,6 @@ Imports DevExpress.XtraEditors.Controls Public Class LookupControl3 Inherits GridLookUpEdit - Shared Sub New() - RepositoryItemLookupControl3.RegisterLookupControl() - End Sub - - Public Sub New() - End Sub - Public Shadows ReadOnly Property Properties As RepositoryItemLookupControl3 Get @@ -32,6 +25,41 @@ Public Class LookupControl3 Return RepositoryItemLookupControl3.CustomEditName End Get End Property + + Shared Sub New() + RepositoryItemLookupControl3.RegisterLookupControl() + End Sub + + Friend WithEvents fProperties As RepositoryItemGridLookUpEdit + Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView + + Public Sub New() + End Sub + + Private Sub InitializeComponent() + Me.fProperties = New DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit() + Me.fPropertiesView = New DevExpress.XtraGrid.Views.Grid.GridView() + CType(Me.fProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'fProperties + ' + Me.fProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.fProperties.Name = "fProperties" + Me.fProperties.PopupView = Me.fPropertiesView + ' + 'fPropertiesView + ' + Me.fPropertiesView.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + Me.fPropertiesView.Name = "fPropertiesView" + Me.fPropertiesView.OptionsSelection.EnableAppearanceFocusedCell = False + Me.fPropertiesView.OptionsView.ShowGroupPanel = False + CType(Me.fProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub End Class @@ -42,13 +70,15 @@ Public Class RepositoryItemLookupControl3 RegisterLookupControl() End Sub + Public Sub New() + SetDropdownButtonEnabled(_MultiSelect) + End Sub + Private Const TAG_DROPDOWN = "openDropdown" Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm" - Private Const TEXT_NO_RECORDS = "Keine Datensätze ausgewählt" - Private Const TEXT_ONE_RECORD = "Ein Datensatz ausgewählt" - Private Const TEXT_N_RECORDS = "{0} Datensätze ausgewählt" + Private _R As Resources.ResourceManager = My.Resources.Strings.ResourceManager Private _SelectedValues As New List(Of String) Private _MultiSelect As Boolean = False Private _ReadOnly As Boolean = False @@ -96,8 +126,8 @@ Public Class RepositoryItemLookupControl3 End Property Protected Overrides Sub RaiseQueryPopUp(e As CancelEventArgs) - If MultiSelect = True Then - MyBase.RaiseQueryPopUp(e) + If MultiSelect = False Then + e.Cancel = True End If End Sub @@ -155,11 +185,11 @@ Public Class RepositoryItemLookupControl3 If MultiSelect = True Then Select Case Values.Count Case 0 - NullText = TEXT_NO_RECORDS + NullText = _R.GetString("LookupControl_NoRecords") Case 1 - NullText = TEXT_ONE_RECORD + NullText = _R.GetString("LookupControl_OneRecord") Case Else - NullText = String.Format(TEXT_N_RECORDS, Values.Count) + NullText = String.Format(_R.GetString("LookupControl_NRecords"), Values.Count) End Select Else NullText = Values.FirstOrDefault() @@ -227,4 +257,10 @@ Public Class RepositoryItemLookupControl3 EndUpdate() End Try End Sub + + Public Sub HandleQueryPopup(sender As Object, e As CancelEventArgs) Handles Me.QueryPopUp + If MultiSelect = False Then + e.Cancel = True + End If + End Sub End Class diff --git a/Controls.LookupGrid/My Project/AssemblyInfo.vb b/Controls.LookupGrid/My Project/AssemblyInfo.vb index fe4ee67c..cb9e1f02 100644 --- a/Controls.LookupGrid/My Project/AssemblyInfo.vb +++ b/Controls.LookupGrid/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Controls.LookupGrid/Resources/Strings.Designer.vb b/Controls.LookupGrid/Resources/Strings.Designer.vb new file mode 100644 index 00000000..136f8d4b --- /dev/null +++ b/Controls.LookupGrid/Resources/Strings.Designer.vb @@ -0,0 +1,112 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + +Imports System + +Namespace My.Resources + + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + ''' + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + ''' + _ + Friend Class Strings + + Private Shared resourceMan As Global.System.Resources.ResourceManager + + Private Shared resourceCulture As Global.System.Globalization.CultureInfo + + _ + Friend Sub New() + MyBase.New + End Sub + + ''' + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + ''' + _ + Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Controls.LookupGrid.Strings", GetType(Strings).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + ''' + _ + Friend Shared Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Keine Datensätze ausgewählt ähnelt. + ''' + Friend Shared ReadOnly Property LookupControl_NoRecords() As String + Get + Return ResourceManager.GetString("LookupControl_NoRecords", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die {0} Datensätze ausgewählt ähnelt. + ''' + Friend Shared ReadOnly Property LookupControl_NRecords() As String + Get + Return ResourceManager.GetString("LookupControl_NRecords", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Ein Datensatz ausgewählt ähnelt. + ''' + Friend Shared ReadOnly Property LookupControl_OneRecord() As String + Get + Return ResourceManager.GetString("LookupControl_OneRecord", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen Wert aus: ähnelt. + ''' + Friend Shared ReadOnly Property PopupForm_Text() As String + Get + Return ResourceManager.GetString("PopupForm_Text", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen oder mehrere Werte aus: ähnelt. + ''' + Friend Shared ReadOnly Property PopupForm_TextMultiLine() As String + Get + Return ResourceManager.GetString("PopupForm_TextMultiLine", resourceCulture) + End Get + End Property + End Class +End Namespace diff --git a/Controls.LookupGrid/Resources/Strings.en.Designer.vb b/Controls.LookupGrid/Resources/Strings.en.Designer.vb new file mode 100644 index 00000000..e69de29b diff --git a/Controls.LookupGrid/Resources/Strings.en.resx b/Controls.LookupGrid/Resources/Strings.en.resx new file mode 100644 index 00000000..f9bd92ec --- /dev/null +++ b/Controls.LookupGrid/Resources/Strings.en.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 records selected + + + {0} records selected + + + One record selected + + + Please choose a value: + + + Please choose one or more values: + + \ No newline at end of file diff --git a/Controls.LookupGrid/Resources/Strings.resx b/Controls.LookupGrid/Resources/Strings.resx new file mode 100644 index 00000000..dd5e4f94 --- /dev/null +++ b/Controls.LookupGrid/Resources/Strings.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Keine Datensätze ausgewählt + + + {0} Datensätze ausgewählt + + + Ein Datensatz ausgewählt + + + Bitte wählen Sie einen Wert aus: + + + Bitte wählen Sie einen oder mehrere Werte aus: + + \ No newline at end of file diff --git a/Controls.LookupGrid/frmLookupGrid.Designer.vb b/Controls.LookupGrid/frmLookupGrid.Designer.vb index 8f8a802a..334a1455 100644 --- a/Controls.LookupGrid/frmLookupGrid.Designer.vb +++ b/Controls.LookupGrid/frmLookupGrid.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmLookupGrid 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLookupGrid)) Me.gridLookup = New DevExpress.XtraGrid.GridControl() Me.viewLookup = New DevExpress.XtraGrid.Views.Grid.GridView() Me.Panel1 = New System.Windows.Forms.Panel() @@ -34,61 +35,58 @@ Partial Class frmLookupGrid ' 'gridLookup ' - Me.gridLookup.Dock = System.Windows.Forms.DockStyle.Fill - Me.gridLookup.Location = New System.Drawing.Point(0, 0) + resources.ApplyResources(Me.gridLookup, "gridLookup") + Me.gridLookup.EmbeddedNavigator.AccessibleDescription = resources.GetString("gridLookup.EmbeddedNavigator.AccessibleDescription") + Me.gridLookup.EmbeddedNavigator.AccessibleName = resources.GetString("gridLookup.EmbeddedNavigator.AccessibleName") + Me.gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean) + Me.gridLookup.EmbeddedNavigator.Anchor = CType(resources.GetObject("gridLookup.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles) + Me.gridLookup.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("gridLookup.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image) + Me.gridLookup.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("gridLookup.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout) + Me.gridLookup.EmbeddedNavigator.ImeMode = CType(resources.GetObject("gridLookup.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode) + Me.gridLookup.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("gridLookup.EmbeddedNavigator.MaximumSize"), System.Drawing.Size) + Me.gridLookup.EmbeddedNavigator.TextLocation = CType(resources.GetObject("gridLookup.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation) + Me.gridLookup.EmbeddedNavigator.ToolTip = resources.GetString("gridLookup.EmbeddedNavigator.ToolTip") + Me.gridLookup.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("gridLookup.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType) + Me.gridLookup.EmbeddedNavigator.ToolTipTitle = resources.GetString("gridLookup.EmbeddedNavigator.ToolTipTitle") Me.gridLookup.MainView = Me.viewLookup Me.gridLookup.Name = "gridLookup" - Me.gridLookup.Size = New System.Drawing.Size(388, 221) - Me.gridLookup.TabIndex = 0 Me.gridLookup.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewLookup}) ' 'viewLookup ' + resources.ApplyResources(Me.viewLookup, "viewLookup") Me.viewLookup.GridControl = Me.gridLookup Me.viewLookup.Name = "viewLookup" Me.viewLookup.OptionsView.ShowGroupPanel = False ' 'Panel1 ' + resources.ApplyResources(Me.Panel1, "Panel1") Me.Panel1.Controls.Add(Me.btnOK) Me.Panel1.Controls.Add(Me.btnClear) - Me.Panel1.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel1.Location = New System.Drawing.Point(0, 221) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(388, 40) - Me.Panel1.TabIndex = 1 ' 'btnOK ' - Me.btnOK.Location = New System.Drawing.Point(12, 6) + resources.ApplyResources(Me.btnOK, "btnOK") Me.btnOK.Name = "btnOK" - Me.btnOK.Size = New System.Drawing.Size(117, 23) - Me.btnOK.TabIndex = 0 - Me.btnOK.Text = "OK (F2)" Me.btnOK.UseVisualStyleBackColor = True ' 'btnClear ' - Me.btnClear.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + resources.ApplyResources(Me.btnClear, "btnClear") Me.btnClear.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnClear.Location = New System.Drawing.Point(240, 6) Me.btnClear.Name = "btnClear" - Me.btnClear.Size = New System.Drawing.Size(136, 23) - Me.btnClear.TabIndex = 0 - Me.btnClear.Text = "Leeren" Me.btnClear.UseVisualStyleBackColor = True ' 'frmLookupGrid ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(388, 261) Me.Controls.Add(Me.gridLookup) Me.Controls.Add(Me.Panel1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow - Me.MinimumSize = New System.Drawing.Size(400, 300) Me.Name = "frmLookupGrid" - Me.Text = "Wählen Sie einen Wert:" Me.TopMost = True CType(Me.gridLookup, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.viewLookup, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/Controls.LookupGrid/frmLookupGrid.en.resx b/Controls.LookupGrid/frmLookupGrid.en.resx new file mode 100644 index 00000000..f00661ee --- /dev/null +++ b/Controls.LookupGrid/frmLookupGrid.en.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Clear + + + Choose a value: + + \ No newline at end of file diff --git a/Controls.LookupGrid/frmLookupGrid.resx b/Controls.LookupGrid/frmLookupGrid.resx index 1af7de15..4bef9e4c 100644 --- a/Controls.LookupGrid/frmLookupGrid.resx +++ b/Controls.LookupGrid/frmLookupGrid.resx @@ -117,4 +117,178 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + btnOK + + + OK (F2) + + + Panel1 + + + + 0, 0 + + + 0 + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 0, 0 + + + + 0 + + + gridLookup + + + 1 + + + $this + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + frmLookupGrid + + + + Bottom + + + 0 + + + Leeren + + + 400, 300 + + + 1 + + + + Center + + + 388, 261 + + + + + + $this + + + 0 + + + 117, 23 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 240, 6 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + Fill + + + 136, 23 + + + Tile + + + btnClear + + + + + + Top, Left + + + Wählen Sie einen oder mehrere Werte: + + + Panel1 + + + Inherit + + + Top, Right + + + + Default + + + 388, 40 + + + 388, 221 + + + 0, 221 + + + 6, 13 + + + Panel1 + + + + None + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + viewLookup + + + 12, 6 + + + Wählen Sie einen Wert: + + + 1 + + + True + + + en + \ No newline at end of file diff --git a/Controls.LookupGrid/frmLookupGrid.vb b/Controls.LookupGrid/frmLookupGrid.vb index 0b94b322..a34ed92f 100644 --- a/Controls.LookupGrid/frmLookupGrid.vb +++ b/Controls.LookupGrid/frmLookupGrid.vb @@ -14,6 +14,8 @@ Public Class frmLookupGrid Private _DataSourceTemp As DataTable Private _View As GridView Private _Grid As GridControl + Private _R As Resources.ResourceManager = My.Resources.Strings.ResourceManager + Private Sub frmLookupGrid_Load(sender As Object, e As EventArgs) Handles Me.Load _View = viewLookup @@ -53,10 +55,10 @@ Public Class frmLookupGrid oCheckboxColumn.Caption = " " oCheckboxColumn.MaxWidth = 10 - Text = "Wählen Sie einen oder mehrere Werte:" + Text = _R.GetString("PopupForm_Text") _DataColumn = 1 Else - Text = "Wählen Sie einen Wert:" + Text = _R.GetString("PopupForm_TextMultiLine") _DataColumn = 0 End If diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index 0f2ae57b..230330ad 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -104,6 +104,7 @@ + @@ -112,6 +113,7 @@ Form + diff --git a/GUIs.Common/DocumentResultList/DocumentResultCache.vb b/GUIs.Common/DocumentResultList/DocumentResultCache.vb new file mode 100644 index 00000000..0edd3291 --- /dev/null +++ b/GUIs.Common/DocumentResultList/DocumentResultCache.vb @@ -0,0 +1,117 @@ +Imports DigitalData.Modules.EDMI.API.Client + +Public Class DocumentResultCache + Implements ICollection(Of DocumentResultInfo) + + Private Const _DefaultCapacity As Long = 1000 + + Public Shared ReadOnly Property DefaultCapacity As Long + Get + Return _DefaultCapacity + End Get + End Property + + Friend ReadOnly List As New LinkedList(Of DocumentResultInfo) + Private ReadOnly Index As New Dictionary(Of String, LinkedListNode(Of DocumentResultInfo)) + Private ReadOnly Lock As New Object + + Public Sub New() + Me.New(_DefaultCapacity) + End Sub + + Public Sub New(capacity As Long) + If capacity < 0 Then + Throw New InvalidOperationException("DocumentResultCache capacity must be positive.") + End If + + Me.Capacity = capacity + End Sub + + Public Event DiscardingOldestItem As EventHandler + Public Property Capacity As Long + Public Property Count As Integer Implements ICollection(Of DocumentResultInfo).Count + + Public ReadOnly Property Oldest As DocumentResultInfo + Get + Return List.First.Value + End Get + End Property + + Public Sub Add(item As DocumentResultInfo) Implements ICollection(Of DocumentResultInfo).Add + SyncLock Lock + If Index.ContainsKey(item.FullPath) Then + List.Remove(Index(item.FullPath)) + Index(item.FullPath) = List.AddLast(item) + Return + End If + + If Count >= Capacity AndAlso Capacity <> 0 Then + RaiseEvent DiscardingOldestItem(Me, New EventArgs()) + Remove(Oldest) + End If + + Index.Add(item.FullPath, List.AddLast(item)) + + If item.Contents IsNot Nothing Then + Count = Count + item.Contents?.Length + End If + End SyncLock + End Sub + + Public Function Contains(item As DocumentResultInfo) As Boolean Implements ICollection(Of DocumentResultInfo).Contains + Return Index.ContainsKey(item.FullPath) + End Function + + Public Sub CopyTo(array As DocumentResultInfo(), ByVal arrayIndex As Integer) Implements ICollection(Of DocumentResultInfo).CopyTo + SyncLock Lock + + For Each item As DocumentResultInfo In Me + array(Math.Min(System.Threading.Interlocked.Increment(arrayIndex), arrayIndex - 1)) = item + Next + End SyncLock + End Sub + + Public Sub Clear() Implements ICollection(Of DocumentResultInfo).Clear + SyncLock Lock + List.Clear() + Index.Clear() + End SyncLock + End Sub + + Public ReadOnly Property IsReadOnly As Boolean Implements ICollection(Of DocumentResultInfo).IsReadOnly + Get + Return False + End Get + End Property + + Public Function Remove(item As DocumentResultInfo) As Boolean Implements ICollection(Of DocumentResultInfo).Remove + SyncLock Lock + + If Index.ContainsKey(item.FullPath) Then + List.Remove(Index(item.FullPath)) + Index.Remove(item.FullPath) + + If item.Contents IsNot Nothing Then + Count -= item.Contents.Length + End If + + Return True + End If + + Return False + End SyncLock + End Function + + Private Iterator Function GetEnumerator() As IEnumerator(Of DocumentResultInfo) Implements ICollection(Of DocumentResultInfo).GetEnumerator + Dim node As LinkedListNode(Of DocumentResultInfo) = List.First + + While node IsNot Nothing + Yield node.Value + node = node.[Next] + End While + End Function + + Private Function IEnumerable_GetEnumerator() As IEnumerator Implements IEnumerable.GetEnumerator + Return DirectCast(List, IEnumerable).GetEnumerator() + End Function +End Class diff --git a/GUIs.Common/DocumentResultList/DocumentResultInfo.vb b/GUIs.Common/DocumentResultList/DocumentResultInfo.vb new file mode 100644 index 00000000..d6e90ef8 --- /dev/null +++ b/GUIs.Common/DocumentResultList/DocumentResultInfo.vb @@ -0,0 +1,8 @@ +Imports DigitalData.Modules.EDMI.API.Client + +Public Class DocumentResultInfo + Inherits DocumentInfo + + Public Contents As Byte() + Public LastWriteTime As Date +End Class \ No newline at end of file diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 9dd8fb26..0871b086 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -45,14 +45,14 @@ Public Class frmDocumentResultList Private _IsLoading As Boolean = True Private _ActiveGrid As GridControl = Nothing Private _ActiveGridBand As GridBand = Nothing - Private _DocumentInfo As DocumentInfo = Nothing ' TODO: Hashes for checking if the opened file was modified externally Private _HashOriginalFile As String = Nothing Private _HashOpenedFile As String = Nothing Private WithEvents _FileOpenTimer As New Timer - Private _FileOpenList As New Dictionary(Of Integer, String) + Private _OpenDocuments As New DocumentResultCache(50000000) + Private _CurrentDocument As DocumentResultInfo = Nothing Private Property OperationMode As IResultForm.Mode Implements IResultForm.OperationMode @@ -79,8 +79,8 @@ Public Class frmDocumentResultList _Params = Params _ResultLists = Params.Results - _FileOpenTimer.Interval = FILE_OPEN_TIMER_INTERVAL - _FileOpenTimer.Start() + '_FileOpenTimer.Interval = FILE_OPEN_TIMER_INTERVAL + '_FileOpenTimer.Start() End Sub Private Sub frmDocumentResultList_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -145,40 +145,45 @@ Public Class frmDocumentResultList If e.FocusedRowHandle >= 0 Then Dim oRow = sender.GetDataRow(e.FocusedRowHandle) + Dim oDocumentInfo As DocumentResultInfo = Nothing + DocumentViewer1.CloseDocument() If OperationMode = IResultForm.Mode.NoAppServer Then - LoadFile_Legacy(oRow) + oDocumentInfo = LoadFile_Legacy(oRow) ElseIf OperationMode = IResultForm.Mode.WithAppServer Then - LoadFile_IDB(oRow) + oDocumentInfo = LoadFile_IDB(oRow) End If - If IsNothing(_DocumentInfo) Then + If IsNothing(oDocumentInfo) Then Show_Warning("File could not be loaded!") + Exit Sub End If - If Not IsNothing(_DocumentInfo) Then - If _FileOpenList.ContainsValue(_DocumentInfo.FullPath) Then - Show_Warning("Die ausgewählte Datei befindet sich im Zugriff!") - Else - DocumentViewer1.LoadFile(_DocumentInfo.FullPath) + If Not File.Exists(oDocumentInfo.FullPath) Then + Show_Warning("File does not exist!") + _HashOriginalFile = Nothing + Exit Sub + End If - If _DocumentInfo.AccessRight = Rights.AccessRight.VIEW_ONLY Then - DocumentViewer1.SetViewOnly(True) - RibbonPageGroup_Export.Visible = False - Else - DocumentViewer1.SetViewOnly(False) - RibbonPageGroup_Export.Visible = True - End If - End If + If oDocumentInfo.Contents IsNot Nothing Then + Dim oFileInfo As New FileInfo(oDocumentInfo.FullPath) + + DocumentViewer1.LoadFile(oFileInfo.Name, New MemoryStream(oDocumentInfo.Contents)) + Else + DocumentViewer1.LoadFile(oDocumentInfo.FullPath) + End If + + If oDocumentInfo.AccessRight = Rights.AccessRight.VIEW_ONLY Then + DocumentViewer1.SetViewOnly(True) + RibbonPageGroup_Export.Visible = False + Else + DocumentViewer1.SetViewOnly(False) + RibbonPageGroup_Export.Visible = True End If ' TODO: Create checksum after closing, compare and take action - If File.Exists(_DocumentInfo.FullPath) Then - _HashOriginalFile = _Filesystem.GetChecksum(_DocumentInfo.FullPath) - Else - _HashOriginalFile = Nothing - End If + _HashOriginalFile = _Filesystem.GetChecksum(oDocumentInfo.FullPath) End If Catch ex As Exception _Logger.Error(ex) @@ -203,31 +208,160 @@ Public Class frmDocumentResultList Return True End Function - Private Sub LoadFile_Legacy(GridRow As DataRow) + Private Function LoadFile_Legacy(GridRow As DataRow) As DocumentResultInfo Try Dim oFullPath = GridRow.Item(COLUMN_FILEPATH) - - _DocumentInfo = New DocumentInfo() With { + Dim oDocumentInfo = New DocumentResultInfo() With { .AccessRight = Rights.AccessRight.FULL, .FullPath = oFullPath } + + If File.Exists(oDocumentInfo.FullPath) Then + oDocumentInfo = LoadFile_AsByteArray(oDocumentInfo) + _OpenDocuments.Add(oDocumentInfo) + _CurrentDocument = oDocumentInfo + End If + + Return oDocumentInfo Catch ex As Exception _Logger.Error(ex) - MsgBox("Error while loading file", MsgBoxStyle.Critical, Text) + Return Nothing End Try - End Sub + End Function - Private Sub LoadFile_IDB(GridRow As DataRow) + Private Function LoadFile_IDB(GridRow As DataRow) As DocumentResultInfo Try Dim oObjectId = GridRow.Item(COLUMN_DOCID) - _Logger.Debug($"Gettin' Infor for oObjectId: {oObjectId}") + _Logger.Debug($"Getting Information for oObjectId: {oObjectId}") ' This needs to be Sync bc otherwise the PopupMenuShowing event will fire before this method loaded the Document Info - _DocumentInfo = _IDBClient.GetDocumentInfo(_Environment.User.UserId, oObjectId) + Dim oDocumentInfo As DocumentInfo = _IDBClient.GetDocumentInfo(_Environment.User.UserId, oObjectId) + Dim oResultDocumentInfo As New DocumentResultInfo() With { + .AccessRight = oDocumentInfo.AccessRight, + .FullPath = oDocumentInfo.FullPath + } + + If File.Exists(oResultDocumentInfo.FullPath) Then + oResultDocumentInfo = LoadFile_AsByteArray(oResultDocumentInfo) + _OpenDocuments.Add(oResultDocumentInfo) + _CurrentDocument = oResultDocumentInfo + End If + + Return oResultDocumentInfo Catch ex As Exception _Logger.Error(ex) + Return Nothing End Try - End Sub + End Function + + Private Function LoadFile_AsByteArray(DocumentInfo As DocumentResultInfo) As DocumentResultInfo + Try + Dim oFullPath As String = DocumentInfo.FullPath + Dim oPathExists = From oFile In _OpenDocuments + Where oFile.FullPath = oFullPath And oFile.Contents IsNot Nothing + Select oFile + Dim oExistsInCache = oPathExists.Count() > 0 + Dim oSizeChanged = False + Dim oWriteTimeChanged = False + + ' Get Information about the file on the filesystem + Dim oFileInfo As New FileInfo(oFullPath) + + If oExistsInCache Then + Dim oCachedItem = oPathExists.First() + + If oCachedItem.Contents Is Nothing Then + oSizeChanged = False + Else + oSizeChanged = Not (oFileInfo.Length = oCachedItem.Contents.Length) + End If + + If oCachedItem.LastWriteTime = Nothing Then + oWriteTimeChanged = False + Else + oWriteTimeChanged = Not oFileInfo.LastWriteTime.Equals(oCachedItem.LastWriteTime) + End If + + If oSizeChanged Or oWriteTimeChanged Then + Using oStream = File.OpenRead(DocumentInfo.FullPath) + Using oMemoryStream = New MemoryStream() + oStream.CopyTo(oMemoryStream) + DocumentInfo.Contents = oMemoryStream.ToArray() + DocumentInfo.LastWriteTime = oFileInfo.LastWriteTime + End Using + End Using + + Return DocumentInfo + Else + Return oCachedItem + End If + + Else + Using oStream = File.OpenRead(DocumentInfo.FullPath) + Using oMemoryStream = New MemoryStream() + oStream.CopyTo(oMemoryStream) + DocumentInfo.Contents = oMemoryStream.ToArray() + DocumentInfo.LastWriteTime = oFileInfo.LastWriteTime + End Using + End Using + + Return DocumentInfo + End If + + Catch ex As Exception + + End Try + End Function + + 'Private Function LoadFile_AsByteArray(DocumentInfo As DocumentResultInfo) + ' Try + ' Dim oLoadedInfo As DocumentResultInfo = Nothing + + ' Dim oFileContents As Byte() + ' Dim oFullPath As String = DocumentInfo.FullPath + ' Dim oPathExists = From oFile In _OpenDocuments + ' Where oFile.FullPath = oFullPath And oFile.Contents IsNot Nothing + ' Select oFile + + ' If oPathExists.Count > 0 Then + ' Dim oDocumentInfo = oPathExists.First() + ' Dim oFileInfo As New FileInfo(DocumentInfo.FullPath) + ' Dim oSizeChanged = False + ' Dim oWriteTimeChanged = False + + ' If DocumentInfo.Contents Is Nothing Then + ' oSizeChanged = False + ' Else + ' oSizeChanged = Not oFileInfo.Length.Equals(DocumentInfo.Contents?.Length) + ' End If + + ' If DocumentInfo.LastWriteTime = Nothing Then + ' oWriteTimeChanged = False + ' Else + ' oWriteTimeChanged = Not oFileInfo.LastWriteTime.Equals(DocumentInfo.LastWriteTime) + ' End If + + ' If oSizeChanged Or oWriteTimeChanged Then + + ' Else + ' Using oStream = File.OpenRead(oFullPath) + ' Using oMemoryStream = New MemoryStream() + ' oStream.CopyTo(oMemoryStream) + ' oFileContents = oMemoryStream.ToArray() + ' End Using + ' End Using + ' End If + ' End If + + ' DocumentInfo.Contents = oFileContents + ' DocumentInfo.LastWriteTime = oFileInfo.LastWriteTime + + ' Return DocumentInfo + ' Catch ex As Exception + ' _Logger.Error(ex) + ' Return Nothing + ' End Try + 'End Function Public Function RefreshResults(pResults As IEnumerable(Of BaseResult)) As Boolean Implements IResultForm.RefreshResults _IsLoading = True @@ -465,344 +599,343 @@ Public Class frmDocumentResultList _Config.Config.SplitContainer2Horizontal = SwitchDetailContainerHorizontal.Checked _Config.Save() End If - End Sub + End Sub - Private Sub BarButtonItemExportGrid1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemExportGrid1.ItemClick - Dim oActiveGrid = GetActiveGridControl() + Private Sub BarButtonItemExportGrid1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemExportGrid1.ItemClick + Dim oActiveGrid = GetActiveGridControl() - If oActiveGrid IsNot Nothing Then - Dim oGridBand = _ActiveGridBand + If oActiveGrid IsNot Nothing Then + Dim oGridBand = _ActiveGridBand - XtraSaveFileDialog.FileName = Utils.ConvertTextToSlug(oGridBand.Caption) & ".xlsx" - XtraSaveFileDialog.DefaultExt = ".xlsx" + XtraSaveFileDialog.FileName = Utils.ConvertTextToSlug(oGridBand.Caption) & ".xlsx" + XtraSaveFileDialog.DefaultExt = ".xlsx" - If XtraSaveFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then - Dim oOptions As New XlsxExportOptions() With { + If XtraSaveFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then + Dim oOptions As New XlsxExportOptions() With { .ExportMode = XlsxExportMode.SingleFile } - oActiveGrid.ExportToXlsx(XtraSaveFileDialog.FileName, oOptions) - End If - - Else - MessageBox.Show("Bitte wählen Sie eine Tabelle aus, die Sie exportieren möchten", Text, MessageBoxButtons.OK) - End If - End Sub - - Private Sub SplitContainerControl1_SplitterPositionChanged(sender As Object, e As EventArgs) Handles SplitContainerControl1.SplitterPositionChanged - If _IsLoading = False Then - _Config.Config.SplitContainer1Distance = SplitContainerControl1.SplitterPosition - _Config.Save() - End If - End Sub - - Private Sub SplitContainerControl2_SplitterPositionChanged(sender As Object, e As EventArgs) Handles SplitContainerControl2.SplitterPositionChanged - If _IsLoading = False Then - _Config.Config.SplitContainer2Distance = SplitContainerControl2.SplitterPosition - _Config.Save() - End If - End Sub - - Private Function GetActiveRow() As DataRow - Dim oActiveGrid = GetActiveGridControl() - Dim oActiveRowhandle = _Helpers.ActiveRowHandle - - If oActiveGrid IsNot Nothing And oActiveRowhandle <> Constants.NO_ROW_HANDLE Then - Dim oView = DirectCast(oActiveGrid.DefaultView, GridView) - Dim oRow = oView.GetDataRow(oActiveRowhandle) - Return oRow - Else - Return Nothing - End If - End Function - Private Function GetDevexpressGrid_LayoutName(pGridView As GridView) - Dim Filename As String = $"DevExpressGridViewDocResult_{pGridView.Name}UserLayout.xml" - Return Path.Combine(_Config.UserConfigPath.Replace("UserConfig.xml", ""), Filename) - End Function - Private Function GetActiveGridControl() As GridControl - If _ActiveGrid Is Nothing Then - Return Nothing - End If - - Return _ActiveGrid - End Function - - Private Sub GridViewSave_Layout(pGridView As GridView) - Try - Dim oXml As String = GetDevexpressGrid_LayoutName(pGridView) - pGridView.SaveLayoutToXml(oXml, OptionsLayoutBase.FullLayout) - Catch ex As Exception - _Logger.Error(ex) - _Logger.Info("Error while saving GridLayout: " & ex.Message) - End Try - End Sub - Private Sub RestoreLayout(pGridView As GridView) - Try - Dim oLayoutFile As String = GetDevexpressGrid_LayoutName(pGridView) - If File.Exists(oLayoutFile) Then - pGridView.RestoreLayoutFromXml(oLayoutFile, OptionsLayoutBase.FullLayout) - End If - Catch ex As Exception - _Logger.Error(ex) - _Logger.Info("Error while restoring layout: " & ex.Message) - End Try - End Sub - - Private Sub GridControl_Enter(sender As GridControl, e As EventArgs) Handles GridControl1.Enter, GridControl2.Enter, GridControl3.Enter - _ActiveGrid = sender - BarButtonItem5.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - BarButtonItemExportGrid1.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - SetActiveGridBand() - End Sub - - Private Sub GridView1_FocusedRowChanged(sender As GridView, e As FocusedRowChangedEventArgs) Handles GridView1.FocusedRowChanged, GridView2.FocusedRowChanged, GridView3.FocusedRowChanged - Dim oGrid As GridControl = sender.GridControl - _ActiveGrid = oGrid - End Sub - - Private Sub SetActiveGridBand() - If _ActiveGrid.Equals(GridControl1) Then - _ActiveGridBand = GridBand1 - ElseIf _ActiveGrid.Equals(GridControl2) Then - _ActiveGridBand = GridBand2 - ElseIf _ActiveGrid.Equals(GridControl3) Then - _ActiveGridBand = GridBand3 - Else - _ActiveGridBand = Nothing - End If - End Sub - - Private Sub OpenFolderPath() - Try - Dim oRow = GetActiveRow() - - If oRow IsNot Nothing Then - Dim oFilename = _DocumentInfo.FullPath - Dim oDirectory = IO.Path.GetDirectoryName(oFilename) - Process.Start(oDirectory) - End If - Catch ex As Exception - _Logger.Error(ex) - End Try - End Sub - - Private Sub OpenFile() - Try - If _DocumentInfo IsNot Nothing Then - Dim oFilename = _DocumentInfo.FullPath - DocumentPropertyMenu_FileOpened(Me, oFilename) - End If - Catch ex As Exception - _Logger.Error(ex) - End Try - End Sub - - - - Private Sub CopyFileName() - Try - Dim oRow = GetActiveRow() - - If oRow IsNot Nothing Then - Dim oFilename = _DocumentInfo.FullPath - Clipboard.SetText(oFilename) - End If - Catch ex As Exception - _Logger.Error(ex) - End Try - End Sub - - Private Sub OpenProperties() - Try - Dim oRow = GetActiveRow() - - If oRow IsNot Nothing Then - Dim oObjectId = oRow.Item(COLUMN_DOCID) - Dim oPropertyDialog As New frmObjectPropertyDialog(_LogConfig, _Environment, _IDBClient, oObjectId) - oPropertyDialog.Show() - End If - Catch ex As Exception - _Logger.Error(ex) - End Try - End Sub - - Private Sub GridView1_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView1.ColumnFilterChanged - Dim oRowCount = sender.RowCount - UpdateGridHeader(_ResultLists, 0, oRowCount) - End Sub - - Private Sub GridView2_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView2.ColumnFilterChanged - Dim oRowCount = sender.RowCount - UpdateGridHeader(_ResultLists, 1, oRowCount) - End Sub - - Private Sub GridView3_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView3.ColumnFilterChanged - Dim oRowCount = sender.RowCount - UpdateGridHeader(_ResultLists, 2, oRowCount) - End Sub - - Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonBack.ItemClick - ShouldReturnToPreviousForm = True - Close() - End Sub - - Private Sub frmDocumentResultList_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing - Try - _Config.Config.WindowLocation = Location - _Config.Config.WindowSize = Size - _Config.Save() - - DocumentViewer1.Done() - Catch ex As Exception - _Logger.Error(ex) - End Try - End Sub - - Private Sub GridControl_DoubleClick(sender As Object, e As EventArgs) Handles GridControl1.DoubleClick, GridControl2.DoubleClick, GridControl3.DoubleClick - If _DocumentInfo IsNot Nothing And _DocumentInfo.AccessRight > Rights.AccessRight.VIEW_ONLY Then - OpenFile() - End If - End Sub - - Private Sub GridView_PopupMenuShowing(sender As Object, e As PopupMenuShowingEventArgs) _ - Handles GridView2.PopupMenuShowing, GridView3.PopupMenuShowing, GridView1.PopupMenuShowing - Try - Dim oView As GridView = sender - - If e.MenuType = GridMenuType.Row Then - Dim oRowHandle = e.HitInfo.RowHandle - Dim oRow As DataRow = oView.GetDataRow(oRowHandle) - Dim oFilepath As String = _DocumentInfo.FullPath - Dim oObjectId As Long = oRow.Item(COLUMN_DOCID) - Dim oMenu As New DocumentPropertyMenu(_LogConfig, _Environment, _IDBClient, oFilepath, oObjectId) - - e.Menu.Items.Clear() - - For Each oItem In oMenu.GetMenuItems(OperationMode, _DocumentInfo.AccessRight) - e.Menu.Items.Add(oItem) - Next - - AddHandler oMenu.FileOpened, AddressOf DocumentPropertyMenu_FileOpened - ' AddHandler oMenu.FileClosed, AddressOf DocumentPropertyMenu_FileClosed - End If - Catch ex As Exception - _Logger.Error(ex) - MsgBox("Unexpected Error while preparing context menu", MsgBoxStyle.Critical, Text) - End Try - End Sub - - Public Sub DocumentPropertyMenu_FileOpened(sender As Object, FilePath As String) - DocumentViewer1.CloseDocument() - - Dim oProcess = Process.Start(New ProcessStartInfo With { - .FileName = FilePath - }) - _FileOpenList.Add(oProcess.Id, FilePath) - End Sub - - Public Sub FileOpenTimer_Elapsed() Handles _FileOpenTimer.Tick - Try - Dim oProcesses = Process.GetProcesses() - Dim oIds = (From oProc In oProcesses - Select oProc.Id). - ToList() - - Dim oNewFileOpenList As New Dictionary(Of Integer, String) - For Each oOpenFile In _FileOpenList - If oIds.Contains(oOpenFile.Key) Then - oNewFileOpenList.Add(oOpenFile.Key, oOpenFile.Value) - End If - Next - - If oNewFileOpenList.Count < _FileOpenList.Count Then - Dim oClosedFiles = _FileOpenList. - Except(oNewFileOpenList). - ToList() - - If oClosedFiles.Count = 1 Then - Dim oOpenFile = oClosedFiles.First() - DocumentViewer1.LoadFile(oOpenFile.Value) - Else - ClearGridData() - UpdateGridData() + oActiveGrid.ExportToXlsx(XtraSaveFileDialog.FileName, oOptions) End If - _FileOpenList = oNewFileOpenList + Else + MessageBox.Show("Bitte wählen Sie eine Tabelle aus, die Sie exportieren möchten", Text, MessageBoxButtons.OK) End If - Catch ex As Exception - _Logger.Error(ex) - End Try - End Sub + End Sub - Public Sub Show_CriticalError(Message As String) - labelCriticalError.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - labelCriticalError.Caption = Message - End Sub + Private Sub SplitContainerControl1_SplitterPositionChanged(sender As Object, e As EventArgs) Handles SplitContainerControl1.SplitterPositionChanged + If _IsLoading = False Then + _Config.Config.SplitContainer1Distance = SplitContainerControl1.SplitterPosition + _Config.Save() + End If + End Sub - Public Sub Show_Warning(Message As String) - labelWarning.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - labelWarning.Caption = Message - End Sub + Private Sub SplitContainerControl2_SplitterPositionChanged(sender As Object, e As EventArgs) Handles SplitContainerControl2.SplitterPositionChanged + If _IsLoading = False Then + _Config.Config.SplitContainer2Distance = SplitContainerControl2.SplitterPosition + _Config.Save() + End If + End Sub - Public Sub Reset_Errors() - labelCriticalError.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - labelWarning.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - End Sub + Private Function GetActiveRow() As DataRow + Dim oActiveGrid = GetActiveGridControl() + Dim oActiveRowhandle = _Helpers.ActiveRowHandle - Private Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem5.ItemClick - If Not IsNothing(_ActiveGrid) Then + If oActiveGrid IsNot Nothing And oActiveRowhandle <> Constants.NO_ROW_HANDLE Then + Dim oView = DirectCast(oActiveGrid.DefaultView, GridView) + Dim oRow = oView.GetDataRow(oActiveRowhandle) + Return oRow + Else + Return Nothing + End If + End Function + Private Function GetDevexpressGrid_LayoutName(pGridView As GridView) + Dim Filename As String = $"DevExpressGridViewDocResult_{pGridView.Name}UserLayout.xml" + Return Path.Combine(_Config.UserConfigPath.Replace("UserConfig.xml", ""), Filename) + End Function + Private Function GetActiveGridControl() As GridControl + If _ActiveGrid Is Nothing Then + Return Nothing + End If + + Return _ActiveGrid + End Function + + Private Sub GridViewSave_Layout(pGridView As GridView) Try - Dim oFile = GetDevexpressGrid_LayoutName(_ActiveGrid.MainView) - If File.Exists(oFile) Then - File.Delete(oFile) + Dim oXml As String = GetDevexpressGrid_LayoutName(pGridView) + pGridView.SaveLayoutToXml(oXml, OptionsLayoutBase.FullLayout) + Catch ex As Exception + _Logger.Error(ex) + _Logger.Info("Error while saving GridLayout: " & ex.Message) + End Try + End Sub + Private Sub RestoreLayout(pGridView As GridView) + Try + Dim oLayoutFile As String = GetDevexpressGrid_LayoutName(pGridView) + If File.Exists(oLayoutFile) Then + pGridView.RestoreLayoutFromXml(oLayoutFile, OptionsLayoutBase.FullLayout) + End If + Catch ex As Exception + _Logger.Error(ex) + _Logger.Info("Error while restoring layout: " & ex.Message) + End Try + End Sub + + Private Sub GridControl_Enter(sender As GridControl, e As EventArgs) Handles GridControl1.Enter, GridControl2.Enter, GridControl3.Enter + _ActiveGrid = sender + BarButtonItem5.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + BarButtonItemExportGrid1.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + SetActiveGridBand() + End Sub + + Private Sub GridView1_FocusedRowChanged(sender As GridView, e As FocusedRowChangedEventArgs) Handles GridView1.FocusedRowChanged, GridView2.FocusedRowChanged, GridView3.FocusedRowChanged + Dim oGrid As GridControl = sender.GridControl + _ActiveGrid = oGrid + End Sub + + Private Sub SetActiveGridBand() + If _ActiveGrid.Equals(GridControl1) Then + _ActiveGridBand = GridBand1 + ElseIf _ActiveGrid.Equals(GridControl2) Then + _ActiveGridBand = GridBand2 + ElseIf _ActiveGrid.Equals(GridControl3) Then + _ActiveGridBand = GridBand3 + Else + _ActiveGridBand = Nothing + End If + End Sub + + Private Sub OpenFolderPath() + Try + Dim oRow = GetActiveRow() + + If oRow IsNot Nothing Then + Dim oFilename = _CurrentDocument.FullPath + Dim oDirectory = IO.Path.GetDirectoryName(oFilename) + Process.Start(oDirectory) End If - UpdateGridData() Catch ex As Exception _Logger.Error(ex) End Try - End If - End Sub + End Sub - Private Sub frmDocumentResultList_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - GridViewSave_Layout(_ActiveGrid.MainView) - End Sub + Private Sub OpenFile() + Try + If _CurrentDocument IsNot Nothing Then + Dim oFilename = _CurrentDocument.FullPath + DocumentPropertyMenu_FileOpened(Me, oFilename) + End If + Catch ex As Exception + _Logger.Error(ex) + End Try + End Sub - Private _DragBoxFromMouseDown As Rectangle - Private _ScreenOffset As Point - Private Sub GridView1_MouseDown(sender As GridView, e As MouseEventArgs) Handles GridView1.MouseDown - If sender.FocusedRowHandle >= 0 Then - Dim oDragSize As Size = SystemInformation.DragSize - _DragBoxFromMouseDown = New Rectangle(New Point(e.X - (oDragSize.Width / 2), + Private Sub CopyFileName() + Try + Dim oRow = GetActiveRow() + + If oRow IsNot Nothing Then + Dim oFilename = _CurrentDocument.FullPath + Clipboard.SetText(oFilename) + End If + Catch ex As Exception + _Logger.Error(ex) + End Try + End Sub + + Private Sub OpenProperties() + Try + Dim oRow = GetActiveRow() + + If oRow IsNot Nothing Then + Dim oObjectId = oRow.Item(COLUMN_DOCID) + Dim oPropertyDialog As New frmObjectPropertyDialog(_LogConfig, _Environment, _IDBClient, oObjectId) + oPropertyDialog.Show() + End If + Catch ex As Exception + _Logger.Error(ex) + End Try + End Sub + + Private Sub GridView1_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView1.ColumnFilterChanged + Dim oRowCount = sender.RowCount + UpdateGridHeader(_ResultLists, 0, oRowCount) + End Sub + + Private Sub GridView2_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView2.ColumnFilterChanged + Dim oRowCount = sender.RowCount + UpdateGridHeader(_ResultLists, 1, oRowCount) + End Sub + + Private Sub GridView3_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView3.ColumnFilterChanged + Dim oRowCount = sender.RowCount + UpdateGridHeader(_ResultLists, 2, oRowCount) + End Sub + + Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonBack.ItemClick + ShouldReturnToPreviousForm = True + Close() + End Sub + + Private Sub frmDocumentResultList_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing + Try + _Config.Config.WindowLocation = Location + _Config.Config.WindowSize = Size + _Config.Save() + + DocumentViewer1.Done() + Catch ex As Exception + _Logger.Error(ex) + End Try + End Sub + + Private Sub GridControl_DoubleClick(sender As Object, e As EventArgs) Handles GridControl1.DoubleClick, GridControl2.DoubleClick, GridControl3.DoubleClick + If _CurrentDocument IsNot Nothing AndAlso _CurrentDocument.AccessRight > Rights.AccessRight.VIEW_ONLY Then + OpenFile() + End If + End Sub + + Private Sub GridView_PopupMenuShowing(sender As Object, e As PopupMenuShowingEventArgs) _ + Handles GridView2.PopupMenuShowing, GridView3.PopupMenuShowing, GridView1.PopupMenuShowing + Try + Dim oView As GridView = sender + + If e.MenuType = GridMenuType.Row Then + Dim oRowHandle = e.HitInfo.RowHandle + Dim oRow As DataRow = oView.GetDataRow(oRowHandle) + Dim oFilepath As String = _CurrentDocument.FullPath + Dim oObjectId As Long = oRow.Item(COLUMN_DOCID) + Dim oMenu As New DocumentPropertyMenu(_LogConfig, _Environment, _IDBClient, oFilepath, oObjectId) + + e.Menu.Items.Clear() + + For Each oItem In oMenu.GetMenuItems(OperationMode, _CurrentDocument.AccessRight) + e.Menu.Items.Add(oItem) + Next + + AddHandler oMenu.FileOpened, AddressOf DocumentPropertyMenu_FileOpened + ' AddHandler oMenu.FileClosed, AddressOf DocumentPropertyMenu_FileClosed + End If + Catch ex As Exception + _Logger.Error(ex) + MsgBox("Unexpected Error while preparing context menu", MsgBoxStyle.Critical, Text) + End Try + End Sub + + Public Sub DocumentPropertyMenu_FileOpened(sender As Object, FilePath As String) + 'DocumentViewer1.CloseDocument() + + Dim oProcess = Process.Start(New ProcessStartInfo With { + .FileName = FilePath + }) + End Sub + + Public Sub FileOpenTimer_Elapsed() Handles _FileOpenTimer.Tick + 'Try + ' Dim oProcesses = Process.GetProcesses() + ' Dim oIds = (From oProc In oProcesses + ' Select oProc.Id). + ' ToList() + + ' Dim oNewFileOpenList As New Dictionary(Of Integer, String) + ' For Each oOpenFile In _FileOpenList + ' If oIds.Contains(oOpenFile.Key) Then + ' oNewFileOpenList.Add(oOpenFile.Key, oOpenFile.Value) + ' End If + ' Next + + ' If oNewFileOpenList.Count < _FileOpenList.Count Then + ' Dim oClosedFiles = _FileOpenList. + ' Except(oNewFileOpenList). + ' ToList() + + ' If oClosedFiles.Count = 1 Then + ' Dim oOpenFile = oClosedFiles.First() + ' DocumentViewer1.LoadFile(oOpenFile.Value) + ' Else + ' ClearGridData() + ' UpdateGridData() + ' End If + + ' _FileOpenList = oNewFileOpenList + ' End If + 'Catch ex As Exception + ' _Logger.Error(ex) + 'End Try + End Sub + + Public Sub Show_CriticalError(Message As String) + labelCriticalError.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + labelCriticalError.Caption = Message + End Sub + + Public Sub Show_Warning(Message As String) + labelWarning.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + labelWarning.Caption = Message + End Sub + + Public Sub Reset_Errors() + labelCriticalError.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + labelWarning.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + End Sub + + Private Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem5.ItemClick + If Not IsNothing(_ActiveGrid) Then + Try + Dim oFile = GetDevexpressGrid_LayoutName(_ActiveGrid.MainView) + If File.Exists(oFile) Then + File.Delete(oFile) + End If + UpdateGridData() + Catch ex As Exception + _Logger.Error(ex) + End Try + End If + End Sub + + Private Sub frmDocumentResultList_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + GridViewSave_Layout(_ActiveGrid.MainView) + End Sub + + Private _DragBoxFromMouseDown As Rectangle + Private _ScreenOffset As Point + + Private Sub GridView1_MouseDown(sender As GridView, e As MouseEventArgs) Handles GridView1.MouseDown + If sender.FocusedRowHandle >= 0 Then + Dim oDragSize As Size = SystemInformation.DragSize + + _DragBoxFromMouseDown = New Rectangle(New Point(e.X - (oDragSize.Width / 2), e.Y - (oDragSize.Height / 2)), oDragSize) - Else + Else + _DragBoxFromMouseDown = Rectangle.Empty + End If + End Sub + + Private Sub GridView1_MouseUp(sender As GridView, e As MouseEventArgs) Handles GridView1.MouseUp _DragBoxFromMouseDown = Rectangle.Empty - End If - End Sub + End Sub - Private Sub GridView1_MouseUp(sender As GridView, e As MouseEventArgs) Handles GridView1.MouseUp - _DragBoxFromMouseDown = Rectangle.Empty - End Sub + Private Sub GridView1_MouseMove(sender As GridView, e As MouseEventArgs) Handles GridView1.MouseMove + If e.Button AndAlso e.Button = MouseButtons.Left Then + If _DragBoxFromMouseDown <> Rectangle.Empty And Not _DragBoxFromMouseDown.Contains(e.X, e.Y) Then - Private Sub GridView1_MouseMove(sender As GridView, e As MouseEventArgs) Handles GridView1.MouseMove - If e.Button AndAlso e.Button = MouseButtons.Left Then - If _DragBoxFromMouseDown <> Rectangle.Empty And Not _DragBoxFromMouseDown.Contains(e.X, e.Y) Then + Dim oHitInfo = sender.CalcHitInfo(e.Location) - Dim oHitInfo = sender.CalcHitInfo(e.Location) + If oHitInfo.InRow Then + If _CurrentDocument IsNot Nothing AndAlso _CurrentDocument.AccessRight >= Rights.AccessRight.VIEW_EXPORT Then + _ScreenOffset = SystemInformation.WorkingArea.Location - If oHitInfo.InRow Then - If _DocumentInfo IsNot Nothing AndAlso _DocumentInfo.AccessRight > Rights.AccessRight.VIEW_ONLY Then - _ScreenOffset = SystemInformation.WorkingArea.Location + Dim oFullPath As String = _CurrentDocument.FullPath + Dim oFiles As String() = {oFullPath} + Dim oData As New DataObject(DataFormats.FileDrop, oFiles) - Dim oFullPath As String = _DocumentInfo.FullPath - Dim oFiles As String() = {oFullPath} - Dim oData As New DataObject(DataFormats.FileDrop, oFiles) - - sender.GridControl.DoDragDrop(oData, DragDropEffects.All) + sender.GridControl.DoDragDrop(oData, DragDropEffects.All) + End If End If End If End If - End If - End Sub -End Class \ No newline at end of file + End Sub + End Class \ No newline at end of file diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb index c3b6fed2..08e51c5a 100644 --- a/GUIs.Common/My Project/AssemblyInfo.vb +++ b/GUIs.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/GUIs.Test.TestGUI/frmLookup.vb b/GUIs.Test.TestGUI/frmLookup.vb index 7a4b3736..1f245a2e 100644 --- a/GUIs.Test.TestGUI/frmLookup.vb +++ b/GUIs.Test.TestGUI/frmLookup.vb @@ -8,8 +8,10 @@ Public Class frmLookup _Datasource.Add($"item-{index}") Next - - LookupControl31.Properties.DataSource = GetDatatable(10) + Dim oTable = GetDatatable(10) + LookupControl31.Properties.DataSource = oTable + LookupControl31.Properties.ValueMember = oTable.Columns.Item(0).ColumnName + LookupControl31.Properties.DisplayMember = oTable.Columns.Item(0).ColumnName Dim oEditor As New LookupControl3 GridControl1.DataSource = New List(Of String) From {"foo", "var"} diff --git a/GUIs.ZooFlow/Administration/SourceBundle.vb b/GUIs.ZooFlow/Administration/SourceBundle.vb new file mode 100644 index 00000000..8d15f21a --- /dev/null +++ b/GUIs.ZooFlow/Administration/SourceBundle.vb @@ -0,0 +1,17 @@ +Public Class SourceBundle + Public Overview As SourceSql + Public Update As SourceSql + Public Insert As SourceSql + Public Load As SourceSql +End Class + + +Public Class SourceSql + Public Guid As Integer + Public ParentId As Integer + Public Title As String + Public SQL As String + Public PrimaryKey As String + Public Scope As String +End Class + diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Base.vb b/GUIs.ZooFlow/Administration/frmAdmin_Base.vb index e0e3da42..0499672f 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Base.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Base.vb @@ -25,10 +25,6 @@ Partial Public MustInherit Class BaseForm End Sub End Class -Public Class BaseFormImpl - Inherits BaseForm -End Class - Partial Public Class frmAdmin_Base - Inherits BaseFormImpl + Inherits BaseForm End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb index 72a883d4..8a8a2c2a 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmAdmin_CWProfile - Inherits DevExpress.XtraBars.Ribbon.RibbonForm + Inherits frmAdmin_Base '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 @@ -20,81 +20,111 @@ Partial Class frmAdmin_CWProfile 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAdmin_CWProfile)) - Dim GUIDLabel As System.Windows.Forms.Label Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = 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() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.DBCW_Stammdaten = New DigitalData.GUIs.ZooFlow.DBCW_Stammdaten() Me.TBCW_PROFILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBCW_PROFILESTableAdapter = New DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TBCW_PROFILESTableAdapter() Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TableAdapterManager() - Me.TBCW_PROFILESBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) - Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorSeparator = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorPositionItem = New System.Windows.Forms.ToolStripTextBox() - Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() - Me.BindingNavigatorSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() - Me.TBCW_PROFILESBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() - Me.FillToolStrip = New System.Windows.Forms.ToolStrip() - Me.GUIDToolStripLabel = New System.Windows.Forms.ToolStripLabel() - Me.GUIDToolStripTextBox = New System.Windows.Forms.ToolStripTextBox() - Me.FillToolStripButton = New System.Windows.Forms.ToolStripButton() - Me.GUIDTextBox = New System.Windows.Forms.TextBox() - GUIDLabel = New System.Windows.Forms.Label() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.txtAddedWho = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.txtAddedWhen = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() + Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() + Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() + Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() + Me.labelError = New DevExpress.XtraBars.BarStaticItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DBCW_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBCW_PROFILESBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() - Me.TBCW_PROFILESBindingNavigator.SuspendLayout() - Me.FillToolStrip.SuspendLayout() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtAddedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 ' + Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.labelError}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 1 + Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.Size = New System.Drawing.Size(800, 159) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide + Me.RibbonControl1.ShowToolbarCustomizeItem = False + Me.RibbonControl1.Size = New System.Drawing.Size(800, 63) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Speichern und Schließen" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_check2 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Speichern" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.save2 + Me.BarButtonItem2.Name = "BarButtonItem2" ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "RibbonPage1" ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" - ' 'RibbonStatusBar1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 428) + Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) + Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 426) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 24) ' 'RibbonPage2 ' @@ -121,184 +151,219 @@ Partial Class frmAdmin_CWProfile Me.TableAdapterManager.TBCW_PROFILESTableAdapter = Me.TBCW_PROFILESTableAdapter Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' - 'TBCW_PROFILESBindingNavigator + 'LayoutControl1 ' - Me.TBCW_PROFILESBindingNavigator.AddNewItem = Me.BindingNavigatorAddNewItem - Me.TBCW_PROFILESBindingNavigator.BindingSource = Me.TBCW_PROFILESBindingSource - Me.TBCW_PROFILESBindingNavigator.CountItem = Me.BindingNavigatorCountItem - Me.TBCW_PROFILESBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem - Me.TBCW_PROFILESBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBCW_PROFILESBindingNavigatorSaveItem}) - Me.TBCW_PROFILESBindingNavigator.Location = New System.Drawing.Point(0, 159) - Me.TBCW_PROFILESBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem - Me.TBCW_PROFILESBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem - Me.TBCW_PROFILESBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem - Me.TBCW_PROFILESBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem - Me.TBCW_PROFILESBindingNavigator.Name = "TBCW_PROFILESBindingNavigator" - Me.TBCW_PROFILESBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem - Me.TBCW_PROFILESBindingNavigator.Size = New System.Drawing.Size(800, 25) - Me.TBCW_PROFILESBindingNavigator.TabIndex = 2 - Me.TBCW_PROFILESBindingNavigator.Text = "BindingNavigator1" + Me.LayoutControl1.Controls.Add(Me.TextEdit1) + Me.LayoutControl1.Controls.Add(Me.TextEdit2) + Me.LayoutControl1.Controls.Add(Me.TextEdit3) + Me.LayoutControl1.Controls.Add(Me.txtAddedWho) + Me.LayoutControl1.Controls.Add(Me.txtAddedWhen) + Me.LayoutControl1.Controls.Add(Me.txtChangedWho) + Me.LayoutControl1.Controls.Add(Me.txtChangedWhen) + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl1.Location = New System.Drawing.Point(0, 63) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(848, 159, 650, 400) + Me.LayoutControl1.Root = Me.Root + Me.LayoutControl1.Size = New System.Drawing.Size(800, 363) + Me.LayoutControl1.TabIndex = 2 + Me.LayoutControl1.Text = "LayoutControl1" ' - 'BindingNavigatorMoveFirstItem + 'Root ' - Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorMoveFirstItem.Image = CType(resources.GetObject("BindingNavigatorMoveFirstItem.Image"), System.Drawing.Image) - Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem" - Me.BindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorMoveFirstItem.Size = New System.Drawing.Size(23, 22) - Me.BindingNavigatorMoveFirstItem.Text = "Erste verschieben" + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem7}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(800, 363) + Me.Root.TextVisible = False ' - 'BindingNavigatorMovePreviousItem + 'TextEdit1 ' - Me.BindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorMovePreviousItem.Image = CType(resources.GetObject("BindingNavigatorMovePreviousItem.Image"), System.Drawing.Image) - Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem" - Me.BindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorMovePreviousItem.Size = New System.Drawing.Size(23, 22) - Me.BindingNavigatorMovePreviousItem.Text = "Vorherige verschieben" + Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "GUID", True)) + Me.TextEdit1.Location = New System.Drawing.Point(108, 20) + Me.TextEdit1.MenuManager = Me.RibbonControl1 + Me.TextEdit1.Name = "TextEdit1" + Me.TextEdit1.Size = New System.Drawing.Size(672, 20) + Me.TextEdit1.StyleController = Me.LayoutControl1 + Me.TextEdit1.TabIndex = 4 ' - 'BindingNavigatorSeparator + 'LayoutControlItem1 ' - Me.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator" - Me.BindingNavigatorSeparator.Size = New System.Drawing.Size(6, 25) + Me.LayoutControlItem1.Control = Me.TextEdit1 + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem1.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem1.Text = "GUID" + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(76, 13) ' - 'BindingNavigatorPositionItem + 'TextEdit2 ' - Me.BindingNavigatorPositionItem.AccessibleName = "Position" - Me.BindingNavigatorPositionItem.AutoSize = False - Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" - Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23) - Me.BindingNavigatorPositionItem.Text = "0" - Me.BindingNavigatorPositionItem.ToolTipText = "Aktuelle Position" + Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "NAME", True)) + Me.TextEdit2.Location = New System.Drawing.Point(108, 60) + Me.TextEdit2.MenuManager = Me.RibbonControl1 + Me.TextEdit2.Name = "TextEdit2" + Me.TextEdit2.Size = New System.Drawing.Size(672, 20) + Me.TextEdit2.StyleController = Me.LayoutControl1 + Me.TextEdit2.TabIndex = 5 ' - 'BindingNavigatorCountItem + 'LayoutControlItem2 ' - Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem" - Me.BindingNavigatorCountItem.Size = New System.Drawing.Size(44, 15) - Me.BindingNavigatorCountItem.Text = "von {0}" - Me.BindingNavigatorCountItem.ToolTipText = "Die Gesamtanzahl der Elemente." + Me.LayoutControlItem2.Control = Me.TextEdit2 + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 40) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem2.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem2.Text = "Profil" + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(76, 13) ' - 'BindingNavigatorSeparator1 + 'TextEdit3 ' - Me.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator" - Me.BindingNavigatorSeparator1.Size = New System.Drawing.Size(6, 6) + Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "COMMENT", True)) + Me.TextEdit3.Location = New System.Drawing.Point(108, 100) + Me.TextEdit3.MenuManager = Me.RibbonControl1 + Me.TextEdit3.Name = "TextEdit3" + Me.TextEdit3.Size = New System.Drawing.Size(672, 20) + Me.TextEdit3.StyleController = Me.LayoutControl1 + Me.TextEdit3.TabIndex = 6 ' - 'BindingNavigatorMoveNextItem + 'LayoutControlItem3 ' - Me.BindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorMoveNextItem.Image = CType(resources.GetObject("BindingNavigatorMoveNextItem.Image"), System.Drawing.Image) - Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem" - Me.BindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorMoveNextItem.Size = New System.Drawing.Size(23, 20) - Me.BindingNavigatorMoveNextItem.Text = "Nächste verschieben" + Me.LayoutControlItem3.Control = Me.TextEdit3 + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 80) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem3.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem3.Text = "Kommentar" + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(76, 13) ' - 'BindingNavigatorMoveLastItem + 'txtAddedWho ' - Me.BindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorMoveLastItem.Image = CType(resources.GetObject("BindingNavigatorMoveLastItem.Image"), System.Drawing.Image) - Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem" - Me.BindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorMoveLastItem.Size = New System.Drawing.Size(23, 20) - Me.BindingNavigatorMoveLastItem.Text = "Letzte verschieben" + Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHO", True)) + Me.txtAddedWho.Location = New System.Drawing.Point(108, 140) + Me.txtAddedWho.MenuManager = Me.RibbonControl1 + Me.txtAddedWho.Name = "txtAddedWho" + Me.txtAddedWho.Size = New System.Drawing.Size(282, 20) + Me.txtAddedWho.StyleController = Me.LayoutControl1 + Me.txtAddedWho.TabIndex = 7 ' - 'BindingNavigatorSeparator2 + 'LayoutControlItem4 ' - Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator" - Me.BindingNavigatorSeparator2.Size = New System.Drawing.Size(6, 6) + Me.LayoutControlItem4.Control = Me.txtAddedWho + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 120) + Me.LayoutControlItem4.Name = "LayoutControlItem4" + Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem4.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem4.Text = "Erstellt Wer" + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(76, 13) ' - 'BindingNavigatorAddNewItem + 'txtAddedWhen ' - Me.BindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorAddNewItem.Image = CType(resources.GetObject("BindingNavigatorAddNewItem.Image"), System.Drawing.Image) - Me.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem" - Me.BindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorAddNewItem.Size = New System.Drawing.Size(23, 22) - Me.BindingNavigatorAddNewItem.Text = "Neu hinzufügen" + Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True)) + Me.txtAddedWhen.Location = New System.Drawing.Point(498, 140) + Me.txtAddedWhen.MenuManager = Me.RibbonControl1 + Me.txtAddedWhen.Name = "txtAddedWhen" + Me.txtAddedWhen.Size = New System.Drawing.Size(282, 20) + Me.txtAddedWhen.StyleController = Me.LayoutControl1 + Me.txtAddedWhen.TabIndex = 8 ' - 'BindingNavigatorDeleteItem + 'LayoutControlItem5 ' - Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorDeleteItem.Image = CType(resources.GetObject("BindingNavigatorDeleteItem.Image"), System.Drawing.Image) - Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem" - Me.BindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorDeleteItem.Size = New System.Drawing.Size(23, 20) - Me.BindingNavigatorDeleteItem.Text = "Löschen" + Me.LayoutControlItem5.Control = Me.txtAddedWhen + Me.LayoutControlItem5.Location = New System.Drawing.Point(390, 120) + Me.LayoutControlItem5.Name = "LayoutControlItem5" + Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem5.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem5.Text = "Erstellt Wann" + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(76, 13) ' - 'TBCW_PROFILESBindingNavigatorSaveItem + 'txtChangedWho ' - Me.TBCW_PROFILESBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.TBCW_PROFILESBindingNavigatorSaveItem.Image = CType(resources.GetObject("TBCW_PROFILESBindingNavigatorSaveItem.Image"), System.Drawing.Image) - Me.TBCW_PROFILESBindingNavigatorSaveItem.Name = "TBCW_PROFILESBindingNavigatorSaveItem" - Me.TBCW_PROFILESBindingNavigatorSaveItem.Size = New System.Drawing.Size(23, 20) - Me.TBCW_PROFILESBindingNavigatorSaveItem.Text = "Daten speichern" + Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True)) + Me.txtChangedWho.Location = New System.Drawing.Point(108, 180) + Me.txtChangedWho.MenuManager = Me.RibbonControl1 + Me.txtChangedWho.Name = "txtChangedWho" + Me.txtChangedWho.Size = New System.Drawing.Size(282, 20) + Me.txtChangedWho.StyleController = Me.LayoutControl1 + Me.txtChangedWho.TabIndex = 9 ' - 'FillToolStrip + 'LayoutControlItem6 ' - Me.FillToolStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GUIDToolStripLabel, Me.GUIDToolStripTextBox, Me.FillToolStripButton}) - Me.FillToolStrip.Location = New System.Drawing.Point(0, 184) - Me.FillToolStrip.Name = "FillToolStrip" - Me.FillToolStrip.Size = New System.Drawing.Size(800, 25) - Me.FillToolStrip.TabIndex = 3 - Me.FillToolStrip.Text = "FillToolStrip" + Me.LayoutControlItem6.Control = Me.txtChangedWho + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 160) + Me.LayoutControlItem6.Name = "LayoutControlItem6" + Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem6.Size = New System.Drawing.Size(390, 183) + Me.LayoutControlItem6.Text = "Geändert Wer" + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(76, 13) ' - 'GUIDToolStripLabel + 'txtChangedWhen ' - Me.GUIDToolStripLabel.Name = "GUIDToolStripLabel" - Me.GUIDToolStripLabel.Size = New System.Drawing.Size(37, 22) - Me.GUIDToolStripLabel.Text = "GUID:" + Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True)) + Me.txtChangedWhen.Location = New System.Drawing.Point(498, 180) + Me.txtChangedWhen.MenuManager = Me.RibbonControl1 + Me.txtChangedWhen.Name = "txtChangedWhen" + Me.txtChangedWhen.Size = New System.Drawing.Size(282, 20) + Me.txtChangedWhen.StyleController = Me.LayoutControl1 + Me.txtChangedWhen.TabIndex = 10 ' - 'GUIDToolStripTextBox + 'LayoutControlItem7 ' - Me.GUIDToolStripTextBox.Name = "GUIDToolStripTextBox" - Me.GUIDToolStripTextBox.Size = New System.Drawing.Size(100, 23) + Me.LayoutControlItem7.Control = Me.txtChangedWhen + Me.LayoutControlItem7.Location = New System.Drawing.Point(390, 160) + Me.LayoutControlItem7.Name = "LayoutControlItem7" + Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem7.Size = New System.Drawing.Size(390, 183) + Me.LayoutControlItem7.Text = "Geändert Wann" + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(76, 13) ' - 'FillToolStripButton + 'labelStatus ' - Me.FillToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text - Me.FillToolStripButton.Name = "FillToolStripButton" - Me.FillToolStripButton.Size = New System.Drawing.Size(26, 19) - Me.FillToolStripButton.Text = "Fill" + Me.labelStatus.Caption = "BarStaticItem1" + Me.labelStatus.Id = 3 + Me.labelStatus.Name = "labelStatus" + Me.labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' - 'GUIDLabel + 'labelError ' - GUIDLabel.AutoSize = True - GUIDLabel.Location = New System.Drawing.Point(548, 312) - GUIDLabel.Name = "GUIDLabel" - GUIDLabel.Size = New System.Drawing.Size(37, 13) - GUIDLabel.TabIndex = 4 - GUIDLabel.Text = "GUID:" - ' - 'GUIDTextBox - ' - Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "GUID", True)) - Me.GUIDTextBox.Location = New System.Drawing.Point(591, 309) - Me.GUIDTextBox.Name = "GUIDTextBox" - Me.GUIDTextBox.Size = New System.Drawing.Size(100, 22) - Me.GUIDTextBox.TabIndex = 5 + Me.labelError.Caption = "BarStaticItem2" + Me.labelError.Id = 4 + Me.labelError.Name = "labelError" + Me.labelError.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' 'frmAdmin_CWProfile ' 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(GUIDLabel) - Me.Controls.Add(Me.GUIDTextBox) - Me.Controls.Add(Me.FillToolStrip) - Me.Controls.Add(Me.TBCW_PROFILESBindingNavigator) + Me.Controls.Add(Me.LayoutControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.Name = "frmAdmin_CWProfile" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "frmAdmin_CWProfiles" + Me.Text = "Clipboard Watcher - Profile" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DBCW_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBCW_PROFILESBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit() - Me.TBCW_PROFILESBindingNavigator.ResumeLayout(False) - Me.TBCW_PROFILESBindingNavigator.PerformLayout() - Me.FillToolStrip.ResumeLayout(False) - Me.FillToolStrip.PerformLayout() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtAddedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -307,29 +372,30 @@ Partial Class frmAdmin_CWProfile Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents DBCW_Stammdaten As DBCW_Stammdaten Friend WithEvents TBCW_PROFILESBindingSource As BindingSource Friend WithEvents TBCW_PROFILESTableAdapter As DBCW_StammdatenTableAdapters.TBCW_PROFILESTableAdapter Friend WithEvents TableAdapterManager As DBCW_StammdatenTableAdapters.TableAdapterManager - Friend WithEvents TBCW_PROFILESBindingNavigator As BindingNavigator - Friend WithEvents BindingNavigatorAddNewItem As ToolStripButton - Friend WithEvents BindingNavigatorCountItem As ToolStripLabel - Friend WithEvents BindingNavigatorDeleteItem As ToolStripButton - Friend WithEvents BindingNavigatorMoveFirstItem As ToolStripButton - Friend WithEvents BindingNavigatorMovePreviousItem As ToolStripButton - Friend WithEvents BindingNavigatorSeparator As ToolStripSeparator - Friend WithEvents BindingNavigatorPositionItem As ToolStripTextBox - Friend WithEvents BindingNavigatorSeparator1 As ToolStripSeparator - Friend WithEvents BindingNavigatorMoveNextItem As ToolStripButton - Friend WithEvents BindingNavigatorMoveLastItem As ToolStripButton - Friend WithEvents BindingNavigatorSeparator2 As ToolStripSeparator - Friend WithEvents TBCW_PROFILESBindingNavigatorSaveItem As ToolStripButton - Friend WithEvents FillToolStrip As ToolStrip - Friend WithEvents GUIDToolStripLabel As ToolStripLabel - Friend WithEvents GUIDToolStripTextBox As ToolStripTextBox - Friend WithEvents FillToolStripButton As ToolStripButton - Friend WithEvents GUIDTextBox As TextBox + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit + Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents TextEdit2 As DevExpress.XtraEditors.TextEdit + Friend WithEvents TextEdit3 As DevExpress.XtraEditors.TextEdit + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents txtAddedWho As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtAddedWhen As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtChangedWho As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtChangedWhen As DevExpress.XtraEditors.TextEdit + Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem + Friend WithEvents labelError As DevExpress.XtraBars.BarStaticItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.resx b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.resx index e729b8d0..a7629c4a 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.resx @@ -129,86 +129,4 @@ 612, 17 - - 785, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFKSURBVDhPYxi84O4C9v+35nH+vzqH6//FGbz/ocLEg+tA - jX8eNf7/87Dh/8nJAqQbcH46L9yAgz0ipBtwfJIgUHPd/z8Pqv7vaBcnbMClmTz/z07l+38SqPFIv9D/ - fd0iQM3l///eK/q/vkHm/6oauf9LKxX/zy9V/j+rSBXTwFNAf/55WA/UVAvElf//3CsB4rz/f+9m/v97 - J/n/39tx///djADikP+TcjQxDTjUKwx27t/7pUCNBUCN2UCNqUCNCf//3YoGagz7/+9G0P9/1/3+d6Xp - Yhqws13i/5Zmqf/rwM6V/7+kQvH/31sxQI3h/6fmafyfkKX1vztD9397qv7/5kRDwmEyG+hPkHP/3Qj4 - 35OhQ1gDOgD5898NfyD2+9+arE+6Ad3pumD/gnB9nBHpBrQkGfxviDf8XxNr/L8y2oR0A+gEGBgAJCPY - nnX8iGkAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFvSURBVDhPtZBNKMNhHMd3Vd5K7eKCWjkgk7yEZDKksciE - yMwkBw6LhHZxcCDlQg64SA4kJeVE4jRv89qaWn8tUtoF/7g8H2Ootb+x4nt56nm+38/v+/xUfyJcJ9Bt - BMcOH1eRiZV5RGcVwqyHrfWwELweWJoJ9rC2AL0mRLse0VEBcxOKkLeGwlwGIz2h75w6ApC6bERjAdia - gkxiyIow5cKkPWxDFYvTiMrUdxDDVnCfwVh/AOo/P2zhhccFzcWBLxmzEPV50Nfyu/Cn2N/1V85DGNKh - Rhth+EaCxkLISUDWxvOgjYXa7F/Wv7kGUz4UJeKzGODi6H25d2l+yPLsDwu8v4NWHY8lSbhL0/HtbX8F - GLXh1MQgnxwoQ3h5hkEL6JI5TlPj21gNMd6WZyC1VSN7r0Mh7G4i56pxpkQhdTWA/KQ4aUcTh+x0KACm - RpBSo3HrM0G6Uq7pl2zvhvNDBcClE8YH4HDv2/A/SKV6BYojAxyEJtLJAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEqSURBVDhPYxg8oHDW8/9NC57/z5z4+D9UCAOEtz/AKceQ - O/PZ/1VH3v/HpSi++8H/4IZruA3ImPL0/8J9H7Aqiu95+H/p/v///asv4DYgoefJ/2lb3mMoimi/D9ac - Oev/f6/SE7gNiOx69L939QcURaGt98CaW9cBbe/8+98l/wBuAwKbH/6vm/8Orii45e7/RXv//+8Aas6Y - 8/O/Xd3P//YZ23Eb4FF1/3/+tDcoiuyKb/9Pn/P7v3/Xt/86he/+WySsx22Afend/9mTX2Mo0k85/9+k - 6MV/laxP/40jl+E2wCLvzv/U/tdYFRkknfgvm/b1v27wPNwGGGbd/h/W8hKnIv3Uy/81fKfhNkAn7cZ/ - v+qHeBWpeEzAbYBT7pX/IAV4FQ1CwMAAAPB2wKul5ZpwAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC2SURBVDhPYxg6ILz9wX8ok3QQ3/3gf3DDNfIMiO95+H/p - /v///asvkG5ARPt9sObMWf//e5WeIM2A0NZ7YM2t64C2d/7975J/gHgDglvu/l+09///DqDmjDk//9vV - /fxvn7GdNBfYFd/+nz7n93//rm//dQrf/bdIWE96GOinnP9vUvTiv0rWp//GkctINwAEDJJO/JdN+/pf - N3geeQaAgH7q5f8avtPINwAEVDwmUGbAYAUMDADQFGCYBLpQVQAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACjSURBVDhPYxh8oHDW8/9QJnkgd+az/wnd98g3JGPK0//z - 9v/+n9B1hzxDEnqe/J+979f/zq1//7uVXibdkMiuR/+nbPv1v2Tp3/8J0//+t8k9S5ohgc0P/7eufQ/W - bFzy5b909LX/xpHLiDfEo+r+/5K57+CaFV16SHOBfend/4Etz8jTDAIWeXf+2xRcIU8zCBhm3SZfMwjo - pN0gX/NQBAwMAKB+X6AHNEI4AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEsSURBVDhPYxhcoHDW8/9QJgYAyTUteP4/c+JjnGoYcmc+ - +5/QfQ+rApDcqiPv/4e3P8BtQMaUp//n7f/9P6HrDoYikNzCfR/+Bzdcw21AQs+T/7P3/frfufXvf7fS - yygKQXLTtrz/7199AbcBkV2P/k/Z9ut/ydK//xOm//1vk3sWrhgk17v6w3+v0hO4DQhsfvi/de17sGbj - ki//paOv/TeOXAbWAJKrm//uv0v+AdwGeFTd/18y9x1cs6JLD1wxSC5/2pv/9hnbcRtgX3r3f2DLMwzN - IACSy578+r9FwnrcBljk3flvU3AFQzMIgORS+1/DvYQVGGbdxqoZBEByYS0v/+sGz8NtgE7aDZySIDm/ - 6of/NXyn4TYAH3DKvfJfxWMCGEOFBgVgYAAAvtG/s7kMTpwAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABMSURBVDhPY6AK+Pbt239SMVQrBIAFgufA8Yf3H+EYWQxE - x0zYh2kIKQaAMMwQqHbSDQBhog1AxshqaGsAMXjUgEFpADkYqp0SwMAAAPRDDFPA2mtzAAAAAElFTkSu - QmCC - - - - 1021, 17 - - - False - \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb index 536fb035..7346c63f 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb @@ -1,7 +1,6 @@ Imports DigitalData.Modules.Logging Public Class frmAdmin_CWProfile - 'Inherits frmAdmin_Base Implements frmAdmin_Interface Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey @@ -12,27 +11,70 @@ Public Class frmAdmin_CWProfile Private Property Logger As Logger Implements frmAdmin_Interface.Logger - Private Sub frmAdmin_CWProfile_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Public Sub New(PrimaryKey As Integer) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Logger = My.LogConfig.GetLogger() + Me.PrimaryKey = PrimaryKey + Me.IsInsert = IsInsert + End Sub + + Private Sub frmAdmin_CWProfile_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + TBCW_PROFILESTableAdapter.Fill(DBCW_Stammdaten.TBCW_PROFILES, PrimaryKey) + Catch ex As Exception + ShowError(ex) + End Try + 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 Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Try + TBCW_PROFILESBindingSource.EndEdit() + If DBCW_Stammdaten.TBCW_PROFILES.GetChanges() IsNot Nothing Then + HasChanges = True + + If IsInsert Then + txtAddedWho.EditValue = My.Application.User.UserName + Else + txtChangedWho.EditValue = My.Application.User.UserName + End If + + TBCW_PROFILESBindingSource.EndEdit() + TBCW_PROFILESTableAdapter.Update(DBCW_Stammdaten.TBCW_PROFILES) + End If + + Return True + Catch ex As Exception + ShowError(ex) + Return False + End Try End Function - Private Sub TBCW_PROFILESBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBCW_PROFILESBindingNavigatorSaveItem.Click - Me.Validate() - Me.TBCW_PROFILESBindingSource.EndEdit() - Me.TableAdapterManager.UpdateAll(Me.DBCW_Stammdaten) + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + ResetMessages() + If SaveData() Then + Close() + End If End Sub - Private Sub FillToolStripButton_Click(sender As Object, e As EventArgs) Handles FillToolStripButton.Click - Try - Me.TBCW_PROFILESTableAdapter.Fill(Me.DBCW_Stammdaten.TBCW_PROFILES, CType(GUIDToolStripTextBox.Text, Integer)) - Catch ex As System.Exception - System.Windows.Forms.MessageBox.Show(ex.Message) - End Try + 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 End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb index 36b1873d..fb9a2a84 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb @@ -100,7 +100,7 @@ Partial Class frmAdmin_IDBAttribute Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide - Me.RibbonControl1.Size = New System.Drawing.Size(800, 66) + Me.RibbonControl1.Size = New System.Drawing.Size(800, 63) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -142,10 +142,10 @@ Partial Class frmAdmin_IDBAttribute 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 428) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 426) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 24) ' 'RibbonPage2 ' @@ -166,21 +166,21 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControl1.Controls.Add(Me.txtChangedWhen) Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit1) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 66) + Me.LayoutControl1.Location = New System.Drawing.Point(0, 63) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(800, 362) + Me.LayoutControl1.Size = New System.Drawing.Size(800, 363) Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "GUID", True)) - Me.TextEdit1.Location = New System.Drawing.Point(168, 20) + Me.TextEdit1.Location = New System.Drawing.Point(154, 20) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(612, 20) + Me.TextEdit1.Size = New System.Drawing.Size(626, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 4 ' @@ -197,10 +197,10 @@ Partial Class frmAdmin_IDBAttribute 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "TITLE", True)) - Me.TextEdit2.Location = New System.Drawing.Point(168, 60) + Me.TextEdit2.Location = New System.Drawing.Point(154, 60) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(612, 20) + Me.TextEdit2.Size = New System.Drawing.Size(626, 20) Me.TextEdit2.StyleController = Me.LayoutControl1 Me.TextEdit2.TabIndex = 5 ' @@ -208,11 +208,11 @@ Partial Class frmAdmin_IDBAttribute ' Me.SpinEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "VIEW_SEQUENCE", True)) Me.SpinEdit1.EditValue = New Decimal(New Integer() {0, 0, 0, 0}) - Me.SpinEdit1.Location = New System.Drawing.Point(558, 180) + Me.SpinEdit1.Location = New System.Drawing.Point(544, 180) Me.SpinEdit1.MenuManager = Me.RibbonControl1 Me.SpinEdit1.Name = "SpinEdit1" Me.SpinEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.SpinEdit1.Size = New System.Drawing.Size(222, 20) + Me.SpinEdit1.Size = New System.Drawing.Size(236, 20) Me.SpinEdit1.StyleController = Me.LayoutControl1 Me.SpinEdit1.TabIndex = 6 ' @@ -223,7 +223,7 @@ Partial Class frmAdmin_IDBAttribute Me.CheckEdit1.MenuManager = Me.RibbonControl1 Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.Caption = "Attribut mehrzeilig" - Me.CheckEdit1.Size = New System.Drawing.Size(760, 18) + Me.CheckEdit1.Size = New System.Drawing.Size(760, 20) Me.CheckEdit1.StyleController = Me.LayoutControl1 Me.CheckEdit1.TabIndex = 7 ' @@ -234,72 +234,72 @@ Partial Class frmAdmin_IDBAttribute Me.CheckEdit2.MenuManager = Me.RibbonControl1 Me.CheckEdit2.Name = "CheckEdit2" Me.CheckEdit2.Properties.Caption = "Standard in Ergebnisliste" - Me.CheckEdit2.Size = New System.Drawing.Size(370, 18) + Me.CheckEdit2.Size = New System.Drawing.Size(370, 20) Me.CheckEdit2.StyleController = Me.LayoutControl1 Me.CheckEdit2.TabIndex = 8 ' 'TextEdit3 ' Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "COMMENT", True)) - Me.TextEdit3.Location = New System.Drawing.Point(168, 140) + Me.TextEdit3.Location = New System.Drawing.Point(154, 140) Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.Size = New System.Drawing.Size(612, 20) + Me.TextEdit3.Size = New System.Drawing.Size(626, 20) Me.TextEdit3.StyleController = Me.LayoutControl1 Me.TextEdit3.TabIndex = 9 ' 'txtAddedWho ' Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(168, 258) + Me.txtAddedWho.Location = New System.Drawing.Point(154, 260) Me.txtAddedWho.MenuManager = Me.RibbonControl1 Me.txtAddedWho.Name = "txtAddedWho" Me.txtAddedWho.Properties.ReadOnly = True - Me.txtAddedWho.Size = New System.Drawing.Size(222, 20) + Me.txtAddedWho.Size = New System.Drawing.Size(236, 20) Me.txtAddedWho.StyleController = Me.LayoutControl1 Me.txtAddedWho.TabIndex = 10 ' 'txtAddedWhen ' Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "ADDED_WHEN", True)) - Me.txtAddedWhen.Location = New System.Drawing.Point(558, 258) + Me.txtAddedWhen.Location = New System.Drawing.Point(544, 260) Me.txtAddedWhen.MenuManager = Me.RibbonControl1 Me.txtAddedWhen.Name = "txtAddedWhen" Me.txtAddedWhen.Properties.ReadOnly = True - Me.txtAddedWhen.Size = New System.Drawing.Size(222, 20) + Me.txtAddedWhen.Size = New System.Drawing.Size(236, 20) Me.txtAddedWhen.StyleController = Me.LayoutControl1 Me.txtAddedWhen.TabIndex = 11 ' 'txtChangedWho ' Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "CHANGED_WHO", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(168, 298) + Me.txtChangedWho.Location = New System.Drawing.Point(154, 300) Me.txtChangedWho.MenuManager = Me.RibbonControl1 Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(222, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(236, 20) Me.txtChangedWho.StyleController = Me.LayoutControl1 Me.txtChangedWho.TabIndex = 12 ' 'txtChangedWhen ' Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen.Location = New System.Drawing.Point(558, 298) + Me.txtChangedWhen.Location = New System.Drawing.Point(544, 300) Me.txtChangedWhen.MenuManager = Me.RibbonControl1 Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(222, 20) + Me.txtChangedWhen.Size = New System.Drawing.Size(236, 20) Me.txtChangedWhen.StyleController = Me.LayoutControl1 Me.txtChangedWhen.TabIndex = 13 ' 'ComboBoxEdit1 ' Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "TYP_ID", True)) - Me.ComboBoxEdit1.Location = New System.Drawing.Point(168, 100) + Me.ComboBoxEdit1.Location = New System.Drawing.Point(154, 100) Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 Me.ComboBoxEdit1.Name = "ComboBoxEdit1" Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit1.Size = New System.Drawing.Size(612, 20) + Me.ComboBoxEdit1.Size = New System.Drawing.Size(626, 20) Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 Me.ComboBoxEdit1.TabIndex = 14 ' @@ -309,7 +309,7 @@ Partial Class frmAdmin_IDBAttribute Me.Root.GroupBordersVisible = False Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem3, Me.LayoutControlItem11, Me.LayoutControlItem9, Me.LayoutControlItem5, Me.LayoutControlItem8, Me.LayoutControlItem10}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(800, 362) + Me.Root.Size = New System.Drawing.Size(800, 363) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -321,7 +321,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem1.Size = New System.Drawing.Size(780, 40) Me.LayoutControlItem1.Text = "GUID" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem2 ' @@ -331,7 +331,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem2.Size = New System.Drawing.Size(780, 40) Me.LayoutControlItem2.Text = "Bezeichnung" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem4 ' @@ -339,7 +339,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 200) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem4.Size = New System.Drawing.Size(780, 38) + Me.LayoutControlItem4.Size = New System.Drawing.Size(780, 40) Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem4.TextVisible = False ' @@ -351,17 +351,17 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem6.Size = New System.Drawing.Size(780, 40) Me.LayoutControlItem6.Text = "Kommentar" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.txtAddedWho - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 238) + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 240) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem7.Size = New System.Drawing.Size(390, 40) Me.LayoutControlItem7.Text = "Erstellt Wer" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem3 ' @@ -372,7 +372,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem3.Size = New System.Drawing.Size(390, 40) Me.LayoutControlItem3.Text = "Reihenfolge in Ergebnisliste" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem11 ' @@ -382,17 +382,17 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem11.Size = New System.Drawing.Size(780, 40) Me.LayoutControlItem11.Text = "Attribut-Typ" - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.txtChangedWho - Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 278) + Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 280) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem9.Size = New System.Drawing.Size(390, 64) + Me.LayoutControlItem9.Size = New System.Drawing.Size(390, 63) Me.LayoutControlItem9.Text = "Geändert Wer" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem5 ' @@ -407,22 +407,22 @@ Partial Class frmAdmin_IDBAttribute 'LayoutControlItem8 ' Me.LayoutControlItem8.Control = Me.txtAddedWhen - Me.LayoutControlItem8.Location = New System.Drawing.Point(390, 238) + Me.LayoutControlItem8.Location = New System.Drawing.Point(390, 240) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem8.Size = New System.Drawing.Size(390, 40) Me.LayoutControlItem8.Text = "Erstellt Wann" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.txtChangedWhen - Me.LayoutControlItem10.Location = New System.Drawing.Point(390, 278) + Me.LayoutControlItem10.Location = New System.Drawing.Point(390, 280) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(390, 64) + Me.LayoutControlItem10.Size = New System.Drawing.Size(390, 63) Me.LayoutControlItem10.Text = "Geändert Wann" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(131, 13) ' 'TBIDB_ATTRIBUTETableAdapter ' @@ -446,10 +446,11 @@ Partial Class frmAdmin_IDBAttribute Me.Controls.Add(Me.LayoutControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.bo_appearance Me.Name = "frmAdmin_IDBAttribute" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "frmAdmin_Attribute" + Me.Text = "IDB - Attribut" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx index 4a7dd104..32b787d0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx @@ -123,6 +123,9 @@ 74, 22 + + 74, 22 + 649, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb index 443014c9..f645ccb5 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb @@ -116,6 +116,7 @@ Partial Class frmAdmin_SourceSQL Me.labelStatus.Id = 3 Me.labelStatus.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.about1 Me.labelStatus.Name = "labelStatus" + Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' 'labelError @@ -394,10 +395,11 @@ Partial Class frmAdmin_SourceSQL Me.Controls.Add(Me.LayoutControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.managedatasource Me.Name = "frmAdmin_SourceSQL" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "Source SQL" + Me.Text = "IDB - Source SQL" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx index 1b31b11c..1d55924c 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx @@ -123,9 +123,6 @@ 314, 17 - - 314, 17 - 754, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 290b6b2c..36bd1acd 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -34,7 +34,13 @@ Partial Class frmAdmin_Start Dim VIEW_SEQUENCELabel As System.Windows.Forms.Label Dim TITLELabel As System.Windows.Forms.Label Dim GUIDLabel As System.Windows.Forms.Label + Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAdmin_Start)) + Me.ViewCWProcesses = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridCWProfiles = New DevExpress.XtraGrid.GridControl() + Me.WinExplorerView1 = New DevExpress.XtraGrid.Views.WinExplorer.WinExplorerView() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() @@ -63,10 +69,12 @@ Partial Class frmAdmin_Start Me.RibbonPage_IDB = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroupAttributes = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.ViewCWWindows = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.ViewCWControls = New DevExpress.XtraGrid.Views.Grid.GridView() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.TreeListMenu = New DevExpress.XtraTreeList.TreeList() Me.TreeListColumn1 = New DevExpress.XtraTreeList.Columns.TreeListColumn() - Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) + Me.MainTreeImages = New DevExpress.Utils.SvgImageCollection(Me.components) Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components) Me.DockPanel1 = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() @@ -81,6 +89,7 @@ Partial Class frmAdmin_Start Me.XtraTabPageIDB_Attributes_New = New DevExpress.XtraTab.XtraTabPage() Me.GridAttributes = New DevExpress.XtraGrid.GridControl() Me.ViewAttributes = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.XtraTabPageIDB_Attributes = New DevExpress.XtraTab.XtraTabPage() Me.ComboBox1 = New System.Windows.Forms.ComboBox() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() @@ -103,11 +112,18 @@ Partial Class frmAdmin_Start Me.GridSourceSQL = New DevExpress.XtraGrid.GridControl() Me.ViewSourceSQL = New DevExpress.XtraGrid.Views.Grid.GridView() Me.XtraTabPage_GlobalIndexer = New DevExpress.XtraTab.XtraTabPage() + Me.TreeList2 = New DevExpress.XtraTreeList.TreeList() + Me.GLOBIXImages = New DevExpress.Utils.SvgImageCollection(Me.components) Me.XtraTabPage_ClipboardWatcher = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageCWProfiles = New DevExpress.XtraTab.XtraTabPage() - Me.GridControl2 = New DevExpress.XtraGrid.GridControl() - Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.TreeList1 = New DevExpress.XtraTreeList.TreeList() + Me.COL_ENTITY = New DevExpress.XtraTreeList.Columns.TreeListColumn() + Me.COL_ENITY_SCOPE = New DevExpress.XtraTreeList.Columns.TreeListColumn() + Me.COL_PARENT = New DevExpress.XtraTreeList.Columns.TreeListColumn() + Me.COL_GUID = New DevExpress.XtraTreeList.Columns.TreeListColumn() + Me.COL_NODE_TITLE = New DevExpress.XtraTreeList.Columns.TreeListColumn() + Me.CWImages = New DevExpress.Utils.SvgImageCollection(Me.components) Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabControl = New DevExpress.XtraTab.XtraTabControl() CHANGED_WHENLabel = New System.Windows.Forms.Label() @@ -118,9 +134,14 @@ Partial Class frmAdmin_Start VIEW_SEQUENCELabel = New System.Windows.Forms.Label() TITLELabel = New System.Windows.Forms.Label() GUIDLabel = New System.Windows.Forms.Label() + CType(Me.ViewCWProcesses, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridCWProfiles, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.WinExplorerView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ViewCWWindows, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ViewCWControls, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TreeListMenu, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.MainTreeImages, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanel1.SuspendLayout() Me.DockPanel1_Container.SuspendLayout() @@ -133,18 +154,22 @@ Partial Class frmAdmin_Start Me.XtraTabPageIDB_Attributes_New.SuspendLayout() CType(Me.GridAttributes, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewAttributes, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageIDB_Attributes.SuspendLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageIDB_SourceSQL.SuspendLayout() CType(Me.GridSourceSQL, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewSourceSQL, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabPage_GlobalIndexer.SuspendLayout() + CType(Me.TreeList2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GLOBIXImages, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPage_ClipboardWatcher.SuspendLayout() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.XtraTabPageCWProfiles.SuspendLayout() - CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CWImages, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl.SuspendLayout() Me.SuspendLayout() @@ -221,6 +246,36 @@ Partial Class frmAdmin_Start GUIDLabel.TabIndex = 0 GUIDLabel.Text = "GUID:" ' + 'ViewCWProcesses + ' + Me.ViewCWProcesses.GridControl = Me.GridCWProfiles + Me.ViewCWProcesses.Name = "ViewCWProcesses" + Me.ViewCWProcesses.VertScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Never + ' + 'GridCWProfiles + ' + GridLevelNode1.LevelTemplate = Me.ViewCWProcesses + GridLevelNode2.LevelTemplate = Me.ViewCWWindows + GridLevelNode3.LevelTemplate = Me.ViewCWControls + GridLevelNode3.RelationName = "Level3" + GridLevelNode2.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3}) + GridLevelNode2.RelationName = "Level2" + GridLevelNode1.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) + GridLevelNode1.RelationName = "Level1" + Me.GridCWProfiles.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) + Me.GridCWProfiles.Location = New System.Drawing.Point(819, 41) + Me.GridCWProfiles.MainView = Me.WinExplorerView1 + Me.GridCWProfiles.MenuManager = Me.RibbonControl1 + Me.GridCWProfiles.Name = "GridCWProfiles" + Me.GridCWProfiles.Size = New System.Drawing.Size(319, 266) + Me.GridCWProfiles.TabIndex = 0 + Me.GridCWProfiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.WinExplorerView1, Me.ViewCWWindows, Me.ViewCWControls, Me.ViewCWProcesses}) + ' + 'WinExplorerView1 + ' + Me.WinExplorerView1.GridControl = Me.GridCWProfiles + Me.WinExplorerView1.Name = "WinExplorerView1" + ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 @@ -279,6 +334,7 @@ Partial Class frmAdmin_Start Me.labelStatus.Id = 6 Me.labelStatus.ImageOptions.SvgImage = CType(resources.GetObject("labelStatus.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.labelStatus.Name = "labelStatus" + Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' 'labelError @@ -424,6 +480,16 @@ Partial Class frmAdmin_Start Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 Me.RibbonStatusBar1.Size = New System.Drawing.Size(1328, 22) ' + 'ViewCWWindows + ' + Me.ViewCWWindows.GridControl = Me.GridCWProfiles + Me.ViewCWWindows.Name = "ViewCWWindows" + ' + 'ViewCWControls + ' + Me.ViewCWControls.GridControl = Me.GridCWProfiles + Me.ViewCWControls.Name = "ViewCWControls" + ' 'RibbonPage2 ' Me.RibbonPage2.Name = "RibbonPage2" @@ -453,7 +519,7 @@ Partial Class frmAdmin_Start Me.TreeListMenu.OptionsView.ShowHorzLines = False Me.TreeListMenu.OptionsView.ShowIndicator = False Me.TreeListMenu.OptionsView.ShowVertLines = False - Me.TreeListMenu.SelectImageList = Me.SvgImageCollection1 + Me.TreeListMenu.SelectImageList = Me.MainTreeImages Me.TreeListMenu.Size = New System.Drawing.Size(193, 521) Me.TreeListMenu.TabIndex = 8 ' @@ -465,14 +531,14 @@ Partial Class frmAdmin_Start Me.TreeListColumn1.Visible = True Me.TreeListColumn1.VisibleIndex = 0 ' - 'SvgImageCollection1 + 'MainTreeImages ' - Me.SvgImageCollection1.Add("shopping_box", "image://svgimages/icon builder/shopping_box.svg") - Me.SvgImageCollection1.Add("bo_organization", "image://svgimages/business objects/bo_organization.svg") - Me.SvgImageCollection1.Add("bo_appearance", "image://svgimages/business objects/bo_appearance.svg") - Me.SvgImageCollection1.Add("managedatasource", "image://svgimages/spreadsheet/managedatasource.svg") - Me.SvgImageCollection1.Add("grandtotals", "image://svgimages/dashboards/grandtotals.svg") - Me.SvgImageCollection1.Add("allowuserstoeditranges", "image://svgimages/spreadsheet/allowuserstoeditranges.svg") + Me.MainTreeImages.Add("shopping_box", "image://svgimages/icon builder/shopping_box.svg") + Me.MainTreeImages.Add("bo_organization", "image://svgimages/business objects/bo_organization.svg") + Me.MainTreeImages.Add("bo_appearance", "image://svgimages/business objects/bo_appearance.svg") + Me.MainTreeImages.Add("managedatasource", "image://svgimages/spreadsheet/managedatasource.svg") + Me.MainTreeImages.Add("grandtotals", "image://svgimages/dashboards/grandtotals.svg") + Me.MainTreeImages.Add("allowuserstoeditranges", "image://svgimages/spreadsheet/allowuserstoeditranges.svg") ' 'DockManager1 ' @@ -565,13 +631,18 @@ Partial Class frmAdmin_Start Me.GridAttributes.Name = "GridAttributes" Me.GridAttributes.Size = New System.Drawing.Size(1124, 524) Me.GridAttributes.TabIndex = 0 - Me.GridAttributes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewAttributes}) + Me.GridAttributes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewAttributes, Me.GridView2}) ' 'ViewAttributes ' Me.ViewAttributes.GridControl = Me.GridAttributes Me.ViewAttributes.Name = "ViewAttributes" ' + 'GridView2 + ' + Me.GridView2.GridControl = Me.GridAttributes + Me.GridView2.Name = "GridView2" + ' 'XtraTabPageIDB_Attributes ' Me.XtraTabPageIDB_Attributes.AutoScroll = True @@ -778,11 +849,29 @@ Partial Class frmAdmin_Start ' 'XtraTabPage_GlobalIndexer ' + Me.XtraTabPage_GlobalIndexer.Controls.Add(Me.TreeList2) Me.XtraTabPage_GlobalIndexer.Name = "XtraTabPage_GlobalIndexer" Me.XtraTabPage_GlobalIndexer.PageVisible = False Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(1126, 547) Me.XtraTabPage_GlobalIndexer.Text = "Global Indexer" ' + 'TreeList2 + ' + Me.TreeList2.Dock = System.Windows.Forms.DockStyle.Fill + Me.TreeList2.Location = New System.Drawing.Point(0, 0) + Me.TreeList2.MenuManager = Me.RibbonControl1 + Me.TreeList2.Name = "TreeList2" + Me.TreeList2.PreviewFieldName = "Title" + Me.TreeList2.Size = New System.Drawing.Size(1126, 547) + Me.TreeList2.StateImageList = Me.GLOBIXImages + Me.TreeList2.TabIndex = 0 + ' + 'GLOBIXImages + ' + Me.GLOBIXImages.Add("bo_document", "image://svgimages/business objects/bo_document.svg") + Me.GLOBIXImages.Add("calculatenow", "image://svgimages/spreadsheet/calculatenow.svg") + Me.GLOBIXImages.Add("calculationoptions", "image://svgimages/spreadsheet/calculationoptions.svg") + ' 'XtraTabPage_ClipboardWatcher ' Me.XtraTabPage_ClipboardWatcher.Controls.Add(Me.XtraTabControl1) @@ -793,7 +882,6 @@ Partial Class frmAdmin_Start ' 'XtraTabControl1 ' - Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageCWProfiles @@ -803,26 +891,70 @@ Partial Class frmAdmin_Start ' 'XtraTabPageCWProfiles ' - Me.XtraTabPageCWProfiles.Controls.Add(Me.GridControl2) + Me.XtraTabPageCWProfiles.Controls.Add(Me.TreeList1) + Me.XtraTabPageCWProfiles.Controls.Add(Me.GridCWProfiles) Me.XtraTabPageCWProfiles.Name = "XtraTabPageCWProfiles" Me.XtraTabPageCWProfiles.Size = New System.Drawing.Size(1124, 524) Me.XtraTabPageCWProfiles.Text = "Profile" ' - 'GridControl2 + 'TreeList1 ' - Me.GridControl2.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl2.Location = New System.Drawing.Point(0, 0) - Me.GridControl2.MainView = Me.GridView2 - Me.GridControl2.MenuManager = Me.RibbonControl1 - Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(1124, 524) - Me.GridControl2.TabIndex = 0 - Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) + Me.TreeList1.Columns.AddRange(New DevExpress.XtraTreeList.Columns.TreeListColumn() {Me.COL_ENTITY, Me.COL_ENITY_SCOPE, Me.COL_PARENT, Me.COL_GUID, Me.COL_NODE_TITLE}) + Me.TreeList1.KeyFieldName = "" + Me.TreeList1.Location = New System.Drawing.Point(4, 3) + Me.TreeList1.MenuManager = Me.RibbonControl1 + Me.TreeList1.Name = "TreeList1" + Me.TreeList1.OptionsView.ShowIndentAsRowStyle = True + Me.TreeList1.ParentFieldName = "" + Me.TreeList1.Size = New System.Drawing.Size(809, 504) + Me.TreeList1.StateImageList = Me.CWImages + Me.TreeList1.TabIndex = 2 ' - 'GridView2 + 'COL_ENTITY ' - Me.GridView2.GridControl = Me.GridControl2 - Me.GridView2.Name = "GridView2" + Me.COL_ENTITY.Caption = "Entität" + Me.COL_ENTITY.FieldName = "Entity" + Me.COL_ENTITY.Name = "COL_ENTITY" + Me.COL_ENTITY.Visible = True + Me.COL_ENTITY.VisibleIndex = 1 + ' + 'COL_ENITY_SCOPE + ' + Me.COL_ENITY_SCOPE.Caption = "Scope" + Me.COL_ENITY_SCOPE.FieldName = "Scope" + Me.COL_ENITY_SCOPE.Name = "COL_ENITY_SCOPE" + Me.COL_ENITY_SCOPE.Visible = True + Me.COL_ENITY_SCOPE.VisibleIndex = 2 + ' + 'COL_PARENT + ' + Me.COL_PARENT.Caption = "ParentId" + Me.COL_PARENT.FieldName = "ParentId" + Me.COL_PARENT.Name = "COL_PARENT" + Me.COL_PARENT.Visible = True + Me.COL_PARENT.VisibleIndex = 3 + ' + 'COL_GUID + ' + Me.COL_GUID.Caption = "Guid" + Me.COL_GUID.FieldName = "Guid" + Me.COL_GUID.Name = "COL_GUID" + Me.COL_GUID.Visible = True + Me.COL_GUID.VisibleIndex = 4 + ' + 'COL_NODE_TITLE + ' + Me.COL_NODE_TITLE.Caption = "Titel" + Me.COL_NODE_TITLE.FieldName = "Title" + Me.COL_NODE_TITLE.Name = "COL_NODE_TITLE" + Me.COL_NODE_TITLE.Visible = True + Me.COL_NODE_TITLE.VisibleIndex = 0 + ' + 'CWImages + ' + Me.CWImages.Add("detailed", "image://svgimages/outlook inspired/detailed.svg") + Me.CWImages.Add("newtablestyle", "image://svgimages/actions/newtablestyle.svg") + Me.CWImages.Add("bo_appointment", "image://svgimages/business objects/bo_appointment.svg") ' 'XtraTabPage2 ' @@ -855,9 +987,14 @@ Partial Class frmAdmin_Start Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Administration" + CType(Me.ViewCWProcesses, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridCWProfiles, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.WinExplorerView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ViewCWWindows, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ViewCWControls, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TreeListMenu, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.MainTreeImages, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit() Me.DockPanel1.ResumeLayout(False) Me.DockPanel1_Container.ResumeLayout(False) @@ -870,6 +1007,7 @@ Partial Class frmAdmin_Start Me.XtraTabPageIDB_Attributes_New.ResumeLayout(False) CType(Me.GridAttributes, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewAttributes, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageIDB_Attributes.ResumeLayout(False) Me.XtraTabPageIDB_Attributes.PerformLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() @@ -877,12 +1015,15 @@ Partial Class frmAdmin_Start Me.XtraTabPageIDB_SourceSQL.ResumeLayout(False) CType(Me.GridSourceSQL, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewSourceSQL, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabPage_GlobalIndexer.ResumeLayout(False) + CType(Me.TreeList2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GLOBIXImages, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPage_ClipboardWatcher.ResumeLayout(False) CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabPageCWProfiles.ResumeLayout(False) - CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CWImages, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl.ResumeLayout(False) Me.ResumeLayout(False) @@ -898,7 +1039,7 @@ Partial Class frmAdmin_Start Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents TreeListMenu As DevExpress.XtraTreeList.TreeList Friend WithEvents TreeListColumn1 As DevExpress.XtraTreeList.Columns.TreeListColumn - Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection + Friend WithEvents MainTreeImages As DevExpress.Utils.SvgImageCollection Friend WithEvents RibbonGroup_ClipboardWatcher_DataSearch As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonGroup_ClipboardWatcher_Process As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonGroup_ClipboardWatcher_Window As DevExpress.XtraBars.Ribbon.RibbonPageGroup @@ -966,6 +1107,19 @@ Partial Class frmAdmin_Start Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl Friend WithEvents XtraTabPageCWProfiles As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage - Friend WithEvents GridControl2 As GridControl + Friend WithEvents GridCWProfiles As GridControl Friend WithEvents GridView2 As GridView + Friend WithEvents ViewCWProcesses As GridView + Friend WithEvents ViewCWWindows As GridView + Friend WithEvents ViewCWControls As GridView + Friend WithEvents TreeList1 As DevExpress.XtraTreeList.TreeList + Friend WithEvents WinExplorerView1 As Views.WinExplorer.WinExplorerView + Friend WithEvents COL_ENTITY As DevExpress.XtraTreeList.Columns.TreeListColumn + Friend WithEvents COL_ENITY_SCOPE As DevExpress.XtraTreeList.Columns.TreeListColumn + Friend WithEvents COL_PARENT As DevExpress.XtraTreeList.Columns.TreeListColumn + Friend WithEvents COL_GUID As DevExpress.XtraTreeList.Columns.TreeListColumn + Friend WithEvents COL_NODE_TITLE As DevExpress.XtraTreeList.Columns.TreeListColumn + Friend WithEvents CWImages As DevExpress.Utils.SvgImageCollection + Friend WithEvents TreeList2 As DevExpress.XtraTreeList.TreeList + Friend WithEvents GLOBIXImages As DevExpress.Utils.SvgImageCollection End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx index 32a2254f..ce7d4407 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx @@ -291,17 +291,23 @@ bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - 22, 21 + + 122, 17 - 188, 21 + 396, 17 - 483, 21 + 691, 17 - 323, 21 + 531, 17 + + + 17, 17 + + + 264, 17 @@ -326,19 +332,16 @@ LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - 323, 21 - - 711, 21 + 919, 17 - 933, 21 + 1141, 17 - 1106, 21 + 17, 56 - 1366, 21 + 277, 56 \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index fdc57137..2627a2cc 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -1,10 +1,11 @@ Imports DevExpress.Utils -Imports DevExpress.XtraBars.Docking2010.Views Imports DevExpress.XtraBars.Ribbon Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraGrid.Views.Grid.ViewInfo Imports DevExpress.XtraTab +Imports DevExpress.XtraTreeList +Imports DevExpress.XtraTreeList.Nodes Imports DigitalData.Modules.Logging Public Class frmAdmin_Start @@ -18,14 +19,17 @@ Public Class frmAdmin_Start Private Const CW_PROFILES = "CW_PROFILES" Private PrimaryKey As String = Nothing - Private SourceCommands As New Dictionary(Of String, SourceSql) + Private AdminItems As New List(Of AdminItem) Private CurrentPage As String - Private Class SourceSql - Public Title As String - Public SQL As String - Public PrimaryKey As String + Private Class AdminItem + Public Property Guid As Integer + Public Property ParentId As Integer + Public Property Title As String + Public Property Entity As String + Public Property Scope As String + Public Property Summary As String End Class Private Sub frmAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -39,17 +43,20 @@ Public Class frmAdmin_Start Private Function Load_SQLData() As Boolean Try - Dim oTable As DataTable = My.Database.GetDatatable("SELECT * FROM TBZF_ADMIN_SOURCE_SQL") - SourceCommands.Clear() + Dim oTable As DataTable = My.Database.GetDatatable("SELECT * FROM VWIDB_ADMINISTRATION_TREEVIEW") + AdminItems.Clear() For Each oRow As DataRow In oTable.Rows - Dim oSource As New SourceSql With { - .PrimaryKey = oRow.Item("PK_COLUMN"), - .SQL = oRow.Item("SQL_COMMAND"), - .Title = oRow.Item("ENTITY_TITLE") + Dim oItem As New AdminItem With { + .Guid = oRow.Item("GUID"), + .ParentId = oRow.Item("PARENT"), + .Entity = oRow.Item("ENTITY").ToString, + .Scope = oRow.Item("ENTITY_SCOPE").ToString, + .Title = oRow.Item("NODE_TITLE").ToString, + .Summary = oRow.Item("SUMMARY").ToString } - SourceCommands.Add(oRow.Item("ENTITY_TITLE"), oSource) + AdminItems.Add(oItem) Next Return True Catch ex As Exception @@ -96,11 +103,6 @@ Public Class frmAdmin_Start CurrentPage = e.Node.Tag.ToString - Dim oSource As SourceSql - If SourceCommands.ContainsKey(CurrentPage) Then - oSource = SourceCommands.Item(CurrentPage) - End If - Select Case e.Node.Tag.ToString Case IDB_START Display_Tab(XtraTabPage_IDB) @@ -109,8 +111,8 @@ Public Class frmAdmin_Start Display_Tab(XtraTabPage_IDB) Display_Tab(XtraTabPageIDB_Attributes_New) - Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL) - Load_Grid(oTable, oSource.PrimaryKey, GridAttributes) + 'Dim oTable As DataTable = My.Database.GetDatatable(oSource.Title) + 'Load_Grid(oTable, oSource, GridAttributes) Case IDB_BUSINESS_ENTITY 'DisplayTab(XtraTabPage_Entities) @@ -119,20 +121,27 @@ Public Class frmAdmin_Start Display_Tab(XtraTabPage_GlobalIndexer) Display_RibbonPage(RibbonPage_GlobalIndexer) + Dim oCWItems As List(Of AdminItem) = (From Item As AdminItem In AdminItems + Where Item.Entity = "GLOBIX" + Select Item).ToList() + Load_Tree(oCWItems, TreeList2) + Case CW_PROFILES Display_Tab(XtraTabPage_ClipboardWatcher) Display_Tab(XtraTabPageCWProfiles) Display_RibbonPage(RibbonPage_ClipboardWatcher) - Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL) - Load_Grid(oTable, oSource.PrimaryKey, GridControl2) + Dim oCWItems As List(Of AdminItem) = (From Item As AdminItem In AdminItems + Where Item.Entity = "CW" + Select Item).ToList() + Load_Tree(oCWItems, TreeList1) Case IDB_SOURCE_SQL Display_Tab(XtraTabPage_IDB) Display_Tab(XtraTabPageIDB_SourceSQL) - Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL) - Load_Grid(oTable, oSource.PrimaryKey, GridSourceSQL) + 'Dim oTable As DataTable = My.Database.GetDatatable(oSource.Title) + 'Load_Grid(oTable, oSource, GridSourceSQL) End Select Catch ex As Exception @@ -141,68 +150,106 @@ Public Class frmAdmin_Start End Sub - Private Sub Load_Grid(DataSource As DataTable, PrimaryKey As String, GridControl As GridControl) + 'Private Sub Load_Children(Source As AdminItem, DataSet As DataSet, DataTable As DataTable) + ' Dim oChildren = AdminItems.Where(Function(cmd) cmd.Value.ParentId = Source.Guid).ToList() + + ' If oChildren.Count > 0 Then + ' For Each oChild In oChildren + ' Dim oChildSource As AdminItem = oChild.Value + ' Dim oChildTable As DataTable = My.Database.GetDatatable(oChildSource.Title) + ' oChildTable.TableName = oChildSource.Title + ' Dim oRelationName As String = $"{Source.Title}__{oChildSource.Title}" + + ' DataSet.Tables.Add(oChildTable) + ' DataSet.Relations.Add(New DataRelation(oRelationName, + ' DataTable.Columns.Item(Source.Entity), + ' oChildTable.Columns.Item(oChildSource.Scope))) + + ' Load_Children(oChildSource, DataSet, oChildTable) + ' Next + ' End If + 'End Sub + + Private Sub Load_Tree(Source As List(Of AdminItem), TreeList As TreeList) + TreeList.HierarchyFieldName = "Title" + TreeList.KeyFieldName = "Guid" + TreeList.ParentFieldName = "ParentId" + 'TreeList.PreviewFieldName = "Summary" + 'TreeList.PreviewLineCount = 3 + 'TreeList.OptionsView.ShowPreview = True + TreeList.DataSource = Source + TreeList.ForceInitialize() + End Sub + + Private Sub Load_Grid(DataSource As DataTable, Source As AdminItem, GridControl As GridControl) Try - Me.PrimaryKey = PrimaryKey + PrimaryKey = Source.Entity - GridControl.DataSource = DataSource - GridControl.ForceInitialize() + Dim oDataSet As New DataSet() + DataSource.TableName = Source.Title + oDataSet.Tables.Add(DataSource) - Dim oGridView = DirectCast(GridControl.DefaultView, GridView) + 'Load_Children(Source, oDataSet, DataSource) - With oGridView.Appearance.EvenRow - .BackColor = Color.Gainsboro - .Options.UseBackColor = True - End With + 'GridControl.DataSource = oDataSet.Tables.Item(Source.Title) + 'GridControl.ForceInitialize() - With oGridView.Appearance.FocusedCell - .BackColor = Color.Gold - .Options.UseBackColor = True - End With + 'Dim oGridView = DirectCast(GridControl.DefaultView, GridView) - With oGridView.Appearance.FocusedRow - .BackColor = Color.Gold - .Options.UseBackColor = True - End With + 'With oGridView.Appearance.EvenRow + ' .BackColor = Color.Gainsboro + ' .Options.UseBackColor = True + 'End With - With oGridView.OptionsBehavior - .Editable = False - .ReadOnly = True - End With + 'With oGridView.Appearance.FocusedCell + ' .BackColor = Color.Gold + ' .Options.UseBackColor = True + 'End With - With oGridView.OptionsClipboard - .CopyColumnHeaders = DefaultBoolean.False - End With + 'With oGridView.Appearance.FocusedRow + ' .BackColor = Color.Gold + ' .Options.UseBackColor = True + 'End With - With oGridView.OptionsFind - .AlwaysVisible = True - End With + 'With oGridView.OptionsBehavior + ' .Editable = False + ' .ReadOnly = True + 'End With - With oGridView.OptionsView - .ShowAutoFilterRow = True - .EnableAppearanceEvenRow = True - .ShowIndicator = False - End With + 'With oGridView.OptionsClipboard + ' .CopyColumnHeaders = DefaultBoolean.False + 'End With - AddHandler oGridView.KeyDown, Sub(sender As Object, e As KeyEventArgs) - Dim oView As GridView = DirectCast(sender, GridView) - If e.Control AndAlso e.KeyCode = Keys.C And e.Modifiers = Keys.Control Then - Dim oCellValue = oView.GetRowCellValue(oView.FocusedRowHandle, oView.FocusedColumn) - If oCellValue IsNot Nothing AndAlso oCellValue.ToString() <> String.Empty Then - Clipboard.SetText(oCellValue.ToString) - End If - e.Handled = True - End If - End Sub + 'With oGridView.OptionsFind + ' .AlwaysVisible = True + 'End With - oGridView.BestFitColumns() + 'With oGridView.OptionsView + ' .ShowAutoFilterRow = True + ' .EnableAppearanceEvenRow = True + ' .ShowIndicator = False + 'End With + + 'AddHandler oGridView.KeyDown, Sub(sender As Object, e As KeyEventArgs) + ' Dim oView As GridView = DirectCast(sender, GridView) + ' If e.Control AndAlso e.KeyCode = Keys.C And e.Modifiers = Keys.Control Then + ' Dim oCellValue = oView.GetRowCellValue(oView.FocusedRowHandle, oView.FocusedColumn) + ' If oCellValue IsNot Nothing AndAlso oCellValue.ToString() <> String.Empty Then + ' Clipboard.SetText(oCellValue.ToString) + ' End If + ' e.Handled = True + ' End If + ' End Sub + + 'oGridView.BestFitColumns() Catch ex As Exception ShowError(ex) End Try End Sub - Private Sub View_DoubleClick(sender As Object, e As EventArgs) Handles ViewAttributes.DoubleClick, ViewSourceSQL.DoubleClick + Private Sub View_DoubleClick(sender As Object, e As EventArgs) Handles _ + ViewAttributes.DoubleClick, ViewSourceSQL.DoubleClick Dim oView As GridView = TryCast(sender, GridView) Dim hitInfo As GridHitInfo = oView.CalcHitInfo(TryCast(e, DXMouseEventArgs).Location) If hitInfo.InDataRow Then @@ -213,11 +260,14 @@ Public Class frmAdmin_Start Select Case oView.Name Case ViewAttributes.Name - Load_Attributes(oPrimaryKey) + Load_Attribute(oPrimaryKey) Case ViewSourceSQL.Name Load_SourceSql(oPrimaryKey) + Case WinExplorerView1.Name + Load_CWProfile(oPrimaryKey) + End Select End If @@ -227,15 +277,15 @@ Public Class frmAdmin_Start End If End Sub - Private Sub Load_Attributes(PrimaryKey As Integer) + Private Sub Load_Attribute(PrimaryKey As Integer) Try Dim oForm As New frmAdmin_IDBAttribute(PrimaryKey) oForm.ShowDialog() If oForm.HasChanges Then - Dim oSource As SourceSql = SourceCommands.Item(CurrentPage) - Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL) - Load_Grid(oTable, oSource.PrimaryKey, GridAttributes) + Dim oSource As AdminItem = AdminItems.Item(CurrentPage) + Dim oTable As DataTable = My.Database.GetDatatable(oSource.Title) + Load_Grid(oTable, oSource, GridAttributes) End If Catch ex As Exception ShowError(ex) @@ -248,9 +298,24 @@ Public Class frmAdmin_Start oForm.ShowDialog() If oForm.HasChanges Then - Dim oSource As SourceSql = SourceCommands.Item(CurrentPage) - Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL) - Load_Grid(oTable, oSource.PrimaryKey, GridSourceSQL) + Dim oSource As AdminItem = AdminItems.Item(CurrentPage) + Dim oTable As DataTable = My.Database.GetDatatable(oSource.Title) + Load_Grid(oTable, oSource, GridSourceSQL) + End If + Catch ex As Exception + ShowError(ex) + End Try + End Sub + + Private Sub Load_CWProfile(PrimaryKey As Integer) + Try + Dim oForm As New frmAdmin_CWProfile(PrimaryKey) + oForm.ShowDialog() + + If oForm.HasChanges Then + Dim oSource As AdminItem = AdminItems.Item(CurrentPage) + Dim oTable As DataTable = My.Database.GetDatatable(oSource.Title) + 'Load_Tree(oTable, oSource, TreeList1) End If Catch ex As Exception ShowError(ex) @@ -262,7 +327,7 @@ Public Class frmAdmin_Start Dim oRow As DataRow = ViewAttributes.GetFocusedDataRow If oRow IsNot Nothing Then Dim oPrimaryKey As Integer = oRow.Item(PrimaryKey) - Load_Attributes(oPrimaryKey) + Load_Attribute(oPrimaryKey) End If Catch ex As Exception ShowError(ex) @@ -282,4 +347,42 @@ Public Class frmAdmin_Start Private Sub ResetStatus() labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End Sub + + Private Sub TreeList1_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeList1.GetStateImage + Dim oTreeList As TreeList = DirectCast(sender, TreeList) + Dim oItem As AdminItem = oTreeList.GetRow(e.Node.Id) + + Select Case oItem.Scope + Case "PROFILE" + e.NodeImageIndex = 0 + + Case "PROCESS" + e.NodeImageIndex = 1 + + Case "WINDOW" + e.NodeImageIndex = 2 + + Case "CONTROL" + e.NodeImageIndex = 3 + End Select + + End Sub + + Private Sub TreeList2_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeList2.GetStateImage + Dim oTreeList As TreeList = DirectCast(sender, TreeList) + Dim oItem As AdminItem = oTreeList.GetRow(e.Node.Id) + + Select Case oItem.Scope + Case "PROFILE" + e.NodeImageIndex = 0 + + Case "INDEX_MAN" + e.NodeImageIndex = 1 + + Case "INDEX_AUTO" + e.NodeImageIndex = 2 + + End Select + + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/ClassConstants.vb b/GUIs.ZooFlow/ClassConstants.vb index 8a67f2c3..539de7b7 100644 --- a/GUIs.ZooFlow/ClassConstants.vb +++ b/GUIs.ZooFlow/ClassConstants.vb @@ -22,8 +22,8 @@ Public Const VECTORSEPARATOR = "╚" Public Const SERVICE_ADDRESS_SEPARATOR = ":" - Public Const HOTKEY_TOGGLE_WATCHER = 354522017 - Public Const HOTKEY_TRIGGER_WATCHER = 354523017 + Public Const HOTKEY_TOGGLE_WATCHER As Integer = 354522017 + Public Const HOTKEY_TRIGGER_WATCHER As Integer = 354523017 Public Const NOTIFICATION_DELAY = 2500 diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 9e033105..1fa78487 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -166,7 +166,7 @@ Public Class ClassInit Try MyApplication.Service.Address = My.SystemConfig.AppServerConfig - Dim oSplit() As String = MyApplication.Service.Address.Split(":") + Dim oSplit() As String = MyApplication.Service.Address.Split(":"c) Dim oAppServerAddress As String = oSplit(0) Dim oAppServerPort As Integer = 9000 If oSplit.Length = 2 Then diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index e8539f81..5af157c3 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -250,6 +250,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_check2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_check2", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -290,6 +300,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property bo_appearance() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("bo_appearance", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -410,6 +430,16 @@ Namespace My.Resources 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. ''' @@ -440,6 +470,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property save2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("save2", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 6b69ee0c..eddd59f7 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -151,6 +151,9 @@ ..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -214,6 +217,9 @@ ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -235,6 +241,12 @@ ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -247,7 +259,7 @@ ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_check2.svg b/GUIs.ZooFlow/Resources/actions_check2.svg new file mode 100644 index 00000000..35c68028 --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_check2.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/bo_appearance.svg b/GUIs.ZooFlow/Resources/bo_appearance.svg new file mode 100644 index 00000000..76c4cb8f --- /dev/null +++ b/GUIs.ZooFlow/Resources/bo_appearance.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/managedatasource.svg b/GUIs.ZooFlow/Resources/managedatasource.svg new file mode 100644 index 00000000..d08be544 --- /dev/null +++ b/GUIs.ZooFlow/Resources/managedatasource.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/save2.svg b/GUIs.ZooFlow/Resources/save2.svg new file mode 100644 index 00000000..fb4f9a13 --- /dev/null +++ b/GUIs.ZooFlow/Resources/save2.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 4f086c7e..6ef7e9ac 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -56,15 +56,6 @@ - - ..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll - - - ..\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll - - - ..\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll - P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll @@ -396,10 +387,22 @@ + + {0958cddf-4a16-41f6-8837-8335f71d599c} + DocumentViewer + + + {3dcd6d1a-c830-4241-b7e4-27430e7ea483} + LookupControl + {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E} ClipboardWatcher + + {d20a6bf2-c7c6-4a7a-b34d-fa27d775a049} + Common + {44982F9B-6116-44E2-85D0-F39650B1EF99} Config @@ -565,6 +568,18 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Windows/Animator/frmPopup.vb b/Windows/Animator/frmPopup.vb new file mode 100644 index 00000000..5a5f2724 --- /dev/null +++ b/Windows/Animator/frmPopup.vb @@ -0,0 +1,3 @@ +Public Class frmPopup + +End Class \ No newline at end of file diff --git a/Windows/Hotkey.vb b/Windows/Hotkey.vb index 970dba1d..d0d654ee 100644 --- a/Windows/Hotkey.vb +++ b/Windows/Hotkey.vb @@ -1,4 +1,6 @@ -Imports System.Windows.Forms +Option Explicit On + +Imports System.Windows.Forms Public Class Hotkey Implements IMessageFilter @@ -10,7 +12,7 @@ Public Class Hotkey ''' ''' Diesem Event wird immer die zugewiesene HotKeyID übergeben, wenn eine HotKey Kombination gedrückt wurde. ''' - Public Event HotKeyPressed(ByVal HotKeyID As String) + Public Event HotKeyPressed(HotKeyID As String) ''' ''' Definiert verfügbare Modfier Keys @@ -22,7 +24,7 @@ Public Class Hotkey MOD_WIN = 8 End Enum - Sub New(ByVal pOwnerForm As Form) + Sub New(pOwnerForm As Form) _OwnerForm = pOwnerForm Application.AddMessageFilter(Me) End Sub @@ -33,13 +35,12 @@ Public Class Hotkey ''' Den KeyCode für die Taste ''' Die Zusatztasten wie z.B. Strg oder Alt, diese können auch mit OR kombiniert werden ''' Die ID die der Hotkey bekommen soll um diesen zu identifizieren - Public Sub AddHotKey(ByVal pKeyCode As Keys, ByVal pModifiers As ModfierKey, ByVal pHotKeyID As Integer) + Public Sub AddHotKey(pKeyCode As Keys, pModifiers As ModfierKey, pHotKeyID As Integer) If _HotkeyIDList.ContainsKey(pHotKeyID) = True Then Exit Sub End If - Dim oHotkeyId As Short = NativeMethods.GlobalAddAtom(pHotKeyID) - _HotkeyIDList.Add(pHotKeyID, oHotkeyId) + Dim oHotkeyId As Short = NativeMethods.GlobalAddAtom(pHotKeyID.ToString()) _HotkeyList.Add(oHotkeyId, New HotKeyObject(pKeyCode, pModifiers, pHotKeyID)) NativeMethods.RegisterHotKey(_OwnerForm.Handle, oHotkeyId, _HotkeyList(oHotkeyId).Modifier, _HotkeyList(oHotkeyId).HotKey) @@ -67,15 +68,16 @@ Public Class Hotkey RaiseEvent HotKeyPressed(_HotkeyList(CShort(m.WParam)).HotKeyID) End If End If + Return False End Function Public Class HotKeyObject - Public Property HotKey() As Keys - Public Property Modifier() As ModfierKey - Public Property HotKeyID() As String - Public Property AtomID() As Short + Public Property HotKey As Keys + Public Property Modifier As ModfierKey + Public Property HotKeyID As Integer + Public Property AtomID As Short - Sub New(ByVal NewHotKey As Keys, ByVal NewModifier As ModfierKey, ByVal NewHotKeyID As String) + Sub New(NewHotKey As Keys, NewModifier As ModfierKey, NewHotKeyID As Integer) HotKey = NewHotKey Modifier = NewModifier HotKeyID = NewHotKeyID diff --git a/Windows/My Project/AssemblyInfo.vb b/Windows/My Project/AssemblyInfo.vb index 97a103ef..b0869ff4 100644 --- a/Windows/My Project/AssemblyInfo.vb +++ b/Windows/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Windows/My Project/Resources.Designer.vb b/Windows/My Project/Resources.Designer.vb index 2fde54bd..82955370 100644 --- a/Windows/My Project/Resources.Designer.vb +++ b/Windows/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/Windows/My Project/Resources.resx b/Windows/My Project/Resources.resx index af7dbebb..1af7de15 100644 --- a/Windows/My Project/Resources.resx +++ b/Windows/My Project/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,9 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/Windows/Windows.vbproj b/Windows/Windows.vbproj index 851b21ec..51646f4e 100644 --- a/Windows/Windows.vbproj +++ b/Windows/Windows.vbproj @@ -74,6 +74,13 @@ + + + frmPopup.vb + + + Form + @@ -97,6 +104,9 @@ + + frmPopup.vb + VbMyResourcesResXFileCodeGenerator Resources.Designer.vb