From 61e3c21c1637832cea3fbaa450198699db6e91a2 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 19 Feb 2021 11:40:18 +0100 Subject: [PATCH 01/23] Common: clean up --- GUIs.Common/DocumentResultList/frmDocumentResultList.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 9dd8fb26..edc23abb 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -792,7 +792,7 @@ Public Class frmDocumentResultList Dim oHitInfo = sender.CalcHitInfo(e.Location) If oHitInfo.InRow Then - If _DocumentInfo IsNot Nothing AndAlso _DocumentInfo.AccessRight > Rights.AccessRight.VIEW_ONLY Then + If _DocumentInfo IsNot Nothing AndAlso _DocumentInfo.AccessRight >= Rights.AccessRight.VIEW_EXPORT Then _ScreenOffset = SystemInformation.WorkingArea.Location Dim oFullPath As String = _DocumentInfo.FullPath From b0c64badb00034223cfa8b4601a0a7af87eea823 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 19 Feb 2021 11:40:51 +0100 Subject: [PATCH 02/23] LookupGrid: Fix LookupGrid 3 --- Controls.LookupGrid/LookupControl3.vb | 28 ++++++++++++++++++--------- GUIs.Test.TestGUI/frmLookup.vb | 6 ++++-- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb index 9fc080f0..b53b5278 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,13 @@ Public Class LookupControl3 Return RepositoryItemLookupControl3.CustomEditName End Get End Property + + Shared Sub New() + RepositoryItemLookupControl3.RegisterLookupControl() + End Sub + + Public Sub New() + End Sub End Class @@ -42,6 +42,10 @@ 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" @@ -96,8 +100,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 @@ -227,4 +231,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/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"} From d63d90f0d21fd1a729f897ccb54b67ee32c53df2 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 19 Feb 2021 16:13:03 +0100 Subject: [PATCH 03/23] ZooFlow: Admin --- GUIs.ZooFlow/Administration/SourceBundle.vb | 17 + GUIs.ZooFlow/Administration/frmAdmin_Base.vb | 6 +- .../frmAdmin_CWProfile.Designer.vb | 512 ++++++++++-------- .../Administration/frmAdmin_CWProfile.resx | 82 --- .../Administration/frmAdmin_CWProfile.vb | 66 ++- .../frmAdmin_IDBAttribute.Designer.vb | 87 +-- .../Administration/frmAdmin_IDBAttribute.resx | 3 + .../frmAdmin_SourceSQL.Designer.vb | 4 +- .../Administration/frmAdmin_SourceSQL.resx | 3 - .../Administration/frmAdmin_Start.Designer.vb | 123 ++--- .../Administration/frmAdmin_Start.resx | 3 - GUIs.ZooFlow/Administration/frmAdmin_Start.vb | 37 +- GUIs.ZooFlow/ClassInit.vb | 2 +- GUIs.ZooFlow/My Project/Resources.Designer.vb | 40 ++ GUIs.ZooFlow/My Project/Resources.resx | 16 +- GUIs.ZooFlow/Resources/actions_check2.svg | 15 + GUIs.ZooFlow/Resources/bo_appearance.svg | 30 + GUIs.ZooFlow/Resources/managedatasource.svg | 9 + GUIs.ZooFlow/Resources/save2.svg | 7 + GUIs.ZooFlow/ZooFlow.vbproj | 12 + GUIs.ZooFlow/frmFlowForm.vb | 2 - 21 files changed, 629 insertions(+), 447 deletions(-) create mode 100644 GUIs.ZooFlow/Administration/SourceBundle.vb create mode 100644 GUIs.ZooFlow/Resources/actions_check2.svg create mode 100644 GUIs.ZooFlow/Resources/bo_appearance.svg create mode 100644 GUIs.ZooFlow/Resources/managedatasource.svg create mode 100644 GUIs.ZooFlow/Resources/save2.svg 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 - ' - 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" - ' - 'BindingNavigatorMoveFirstItem - ' - 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" - ' - 'BindingNavigatorMovePreviousItem - ' - 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" - ' - 'BindingNavigatorSeparator - ' - Me.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator" - Me.BindingNavigatorSeparator.Size = New System.Drawing.Size(6, 25) - ' - 'BindingNavigatorPositionItem - ' - 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" - ' - 'BindingNavigatorCountItem - ' - 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." - ' - 'BindingNavigatorSeparator1 - ' - Me.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator" - Me.BindingNavigatorSeparator1.Size = New System.Drawing.Size(6, 6) - ' - 'BindingNavigatorMoveNextItem - ' - 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" - ' - 'BindingNavigatorMoveLastItem - ' - 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" - ' - 'BindingNavigatorSeparator2 - ' - Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator" - Me.BindingNavigatorSeparator2.Size = New System.Drawing.Size(6, 6) - ' - 'BindingNavigatorAddNewItem - ' - 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" - ' - 'BindingNavigatorDeleteItem - ' - 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" - ' - 'TBCW_PROFILESBindingNavigatorSaveItem - ' - 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" - ' - 'FillToolStrip - ' - 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" - ' - 'GUIDToolStripLabel - ' - Me.GUIDToolStripLabel.Name = "GUIDToolStripLabel" - Me.GUIDToolStripLabel.Size = New System.Drawing.Size(37, 22) - Me.GUIDToolStripLabel.Text = "GUID:" - ' - 'GUIDToolStripTextBox - ' - Me.GUIDToolStripTextBox.Name = "GUIDToolStripTextBox" - Me.GUIDToolStripTextBox.Size = New System.Drawing.Size(100, 23) - ' - 'FillToolStripButton - ' - 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" - ' - 'GUIDLabel - ' - 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 + 'LayoutControl1 + ' + 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" + ' + 'Root + ' + 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 + ' + 'TextEdit1 + ' + 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 + ' + 'LayoutControlItem1 + ' + 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) + ' + 'TextEdit2 + ' + 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 + ' + 'LayoutControlItem2 + ' + 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) + ' + 'TextEdit3 + ' + 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 + ' + 'LayoutControlItem3 + ' + 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) + ' + 'txtAddedWho + ' + 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 + ' + 'LayoutControlItem4 + ' + 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) + ' + 'txtAddedWhen + ' + 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 + ' + 'LayoutControlItem5 + ' + 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) + ' + 'txtChangedWho + ' + 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 + ' + 'LayoutControlItem6 + ' + 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) + ' + 'txtChangedWhen + ' + 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 + ' + 'LayoutControlItem7 + ' + 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) + ' + 'labelStatus + ' + Me.labelStatus.Caption = "BarStaticItem1" + Me.labelStatus.Id = 3 + Me.labelStatus.Name = "labelStatus" + Me.labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing + ' + 'labelError + ' + 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 f44eb2ab..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..4816f490 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -106,8 +106,8 @@ Partial Class frmAdmin_Start 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.GridCWProfiles = New DevExpress.XtraGrid.GridControl() + Me.ViewCWProfiles = New DevExpress.XtraGrid.Views.Grid.GridView() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabControl = New DevExpress.XtraTab.XtraTabControl() CHANGED_WHENLabel = New System.Windows.Forms.Label() @@ -143,8 +143,8 @@ Partial Class frmAdmin_Start 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.GridCWProfiles, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ViewCWProfiles, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl.SuspendLayout() Me.SuspendLayout() @@ -154,7 +154,7 @@ Partial Class frmAdmin_Start CHANGED_WHENLabel.AutoSize = True CHANGED_WHENLabel.Location = New System.Drawing.Point(472, 188) CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" - CHANGED_WHENLabel.Size = New System.Drawing.Size(90, 13) + CHANGED_WHENLabel.Size = New System.Drawing.Size(85, 13) CHANGED_WHENLabel.TabIndex = 20 CHANGED_WHENLabel.Text = "Geändert wann:" ' @@ -163,7 +163,7 @@ Partial Class frmAdmin_Start CHANGED_WHOLabel.AutoSize = True CHANGED_WHOLabel.Location = New System.Drawing.Point(351, 188) CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" - CHANGED_WHOLabel.Size = New System.Drawing.Size(80, 13) + CHANGED_WHOLabel.Size = New System.Drawing.Size(77, 13) CHANGED_WHOLabel.TabIndex = 18 CHANGED_WHOLabel.Text = "Geändert wer:" ' @@ -172,7 +172,7 @@ Partial Class frmAdmin_Start ADDED_WHENLabel.AutoSize = True ADDED_WHENLabel.Location = New System.Drawing.Point(472, 146) ADDED_WHENLabel.Name = "ADDED_WHENLabel" - ADDED_WHENLabel.Size = New System.Drawing.Size(77, 13) + ADDED_WHENLabel.Size = New System.Drawing.Size(73, 13) ADDED_WHENLabel.TabIndex = 16 ADDED_WHENLabel.Text = "Erstellt wann:" ' @@ -181,7 +181,7 @@ Partial Class frmAdmin_Start ADDED_WHOLabel.AutoSize = True ADDED_WHOLabel.Location = New System.Drawing.Point(351, 146) ADDED_WHOLabel.Name = "ADDED_WHOLabel" - ADDED_WHOLabel.Size = New System.Drawing.Size(67, 13) + ADDED_WHOLabel.Size = New System.Drawing.Size(65, 13) ADDED_WHOLabel.TabIndex = 14 ADDED_WHOLabel.Text = "Erstellt wer:" ' @@ -190,7 +190,7 @@ Partial Class frmAdmin_Start COMMENTLabel.AutoSize = True COMMENTLabel.Location = New System.Drawing.Point(351, 106) COMMENTLabel.Name = "COMMENTLabel" - COMMENTLabel.Size = New System.Drawing.Size(68, 13) + COMMENTLabel.Size = New System.Drawing.Size(65, 13) COMMENTLabel.TabIndex = 12 COMMENTLabel.Text = "Kommentar:" ' @@ -199,7 +199,7 @@ Partial Class frmAdmin_Start VIEW_SEQUENCELabel.AutoSize = True VIEW_SEQUENCELabel.Location = New System.Drawing.Point(351, 82) VIEW_SEQUENCELabel.Name = "VIEW_SEQUENCELabel" - VIEW_SEQUENCELabel.Size = New System.Drawing.Size(101, 13) + VIEW_SEQUENCELabel.Size = New System.Drawing.Size(93, 13) VIEW_SEQUENCELabel.TabIndex = 8 VIEW_SEQUENCELabel.Text = "View Reihenfolge:" ' @@ -208,7 +208,7 @@ Partial Class frmAdmin_Start TITLELabel.AutoSize = True TITLELabel.Location = New System.Drawing.Point(351, 12) TITLELabel.Name = "TITLELabel" - TITLELabel.Size = New System.Drawing.Size(76, 13) + TITLELabel.Size = New System.Drawing.Size(71, 13) TITLELabel.TabIndex = 2 TITLELabel.Text = "Bezeichnung:" ' @@ -217,7 +217,7 @@ Partial Class frmAdmin_Start GUIDLabel.AutoSize = True GUIDLabel.Location = New System.Drawing.Point(297, 12) GUIDLabel.Name = "GUIDLabel" - GUIDLabel.Size = New System.Drawing.Size(37, 13) + GUIDLabel.Size = New System.Drawing.Size(36, 13) GUIDLabel.TabIndex = 0 GUIDLabel.Text = "GUID:" ' @@ -231,7 +231,7 @@ Partial Class frmAdmin_Start Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage_ClipboardWatcher, Me.RibbonPage_GlobalIndexer, Me.RibbonPage_IDB}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1328, 159) + Me.RibbonControl1.Size = New System.Drawing.Size(1328, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -279,6 +279,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 @@ -419,10 +420,10 @@ Partial Class frmAdmin_Start ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 729) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 727) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1328, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1328, 24) ' 'RibbonPage2 ' @@ -454,7 +455,7 @@ Partial Class frmAdmin_Start Me.TreeListMenu.OptionsView.ShowIndicator = False Me.TreeListMenu.OptionsView.ShowVertLines = False Me.TreeListMenu.SelectImageList = Me.SvgImageCollection1 - Me.TreeListMenu.Size = New System.Drawing.Size(193, 521) + Me.TreeListMenu.Size = New System.Drawing.Size(193, 540) Me.TreeListMenu.TabIndex = 8 ' 'TreeListColumn1 @@ -485,18 +486,18 @@ Partial Class frmAdmin_Start Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("ce81b5b5-eff5-4006-8018-548aa8413799") - Me.DockPanel1.Location = New System.Drawing.Point(0, 159) + Me.DockPanel1.Location = New System.Drawing.Point(0, 158) Me.DockPanel1.Name = "DockPanel1" Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.Size = New System.Drawing.Size(200, 570) + Me.DockPanel1.Size = New System.Drawing.Size(200, 569) Me.DockPanel1.Text = "Übersicht" ' 'DockPanel1_Container ' Me.DockPanel1_Container.Controls.Add(Me.TreeListMenu) - Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46) + Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 26) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 521) + Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 540) Me.DockPanel1_Container.TabIndex = 0 ' 'TBIDB_ATTRIBUTEBindingSource @@ -536,7 +537,7 @@ Partial Class frmAdmin_Start ' Me.XtraTabPage_IDB.Controls.Add(Me.XtraTabControlIDB) Me.XtraTabPage_IDB.Name = "XtraTabPage_IDB" - Me.XtraTabPage_IDB.Size = New System.Drawing.Size(1126, 547) + Me.XtraTabPage_IDB.Size = New System.Drawing.Size(1126, 544) Me.XtraTabPage_IDB.Text = "IDB" ' 'XtraTabControlIDB @@ -545,7 +546,7 @@ Partial Class frmAdmin_Start Me.XtraTabControlIDB.Location = New System.Drawing.Point(0, 0) Me.XtraTabControlIDB.Name = "XtraTabControlIDB" Me.XtraTabControlIDB.SelectedTabPage = Me.XtraTabPageIDB_Attributes_New - Me.XtraTabControlIDB.Size = New System.Drawing.Size(1126, 547) + Me.XtraTabControlIDB.Size = New System.Drawing.Size(1126, 544) Me.XtraTabControlIDB.TabIndex = 0 Me.XtraTabControlIDB.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageIDB_Attributes_New, Me.XtraTabPageIDB_Attributes, Me.XtraTabPageIDB_SourceSQL}) ' @@ -553,7 +554,7 @@ Partial Class frmAdmin_Start ' Me.XtraTabPageIDB_Attributes_New.Controls.Add(Me.GridAttributes) Me.XtraTabPageIDB_Attributes_New.Name = "XtraTabPageIDB_Attributes_New" - Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(1124, 524) + Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(1124, 519) Me.XtraTabPageIDB_Attributes_New.Text = "Attribute" ' 'GridAttributes @@ -563,7 +564,7 @@ Partial Class frmAdmin_Start Me.GridAttributes.MainView = Me.ViewAttributes Me.GridAttributes.MenuManager = Me.RibbonControl1 Me.GridAttributes.Name = "GridAttributes" - Me.GridAttributes.Size = New System.Drawing.Size(1124, 524) + Me.GridAttributes.Size = New System.Drawing.Size(1124, 519) Me.GridAttributes.TabIndex = 0 Me.GridAttributes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewAttributes}) ' @@ -597,7 +598,7 @@ Partial Class frmAdmin_Start Me.XtraTabPageIDB_Attributes.Controls.Add(CHANGED_WHENLabel) Me.XtraTabPageIDB_Attributes.Controls.Add(Me.CHANGED_WHENTextBox) Me.XtraTabPageIDB_Attributes.Name = "XtraTabPageIDB_Attributes" - Me.XtraTabPageIDB_Attributes.Size = New System.Drawing.Size(1124, 524) + Me.XtraTabPageIDB_Attributes.Size = New System.Drawing.Size(1124, 519) Me.XtraTabPageIDB_Attributes.Text = "Attributverwaltung" ' 'ComboBox1 @@ -616,7 +617,7 @@ Partial Class frmAdmin_Start Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(282, 524) + Me.GridControl1.Size = New System.Drawing.Size(282, 519) Me.GridControl1.TabIndex = 28 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -662,7 +663,7 @@ Partial Class frmAdmin_Start Me.GUIDTextBox.Location = New System.Drawing.Point(300, 28) Me.GUIDTextBox.Name = "GUIDTextBox" Me.GUIDTextBox.ReadOnly = True - Me.GUIDTextBox.Size = New System.Drawing.Size(33, 22) + Me.GUIDTextBox.Size = New System.Drawing.Size(33, 21) Me.GUIDTextBox.TabIndex = 1 ' 'TITLETextBox @@ -670,7 +671,7 @@ Partial Class frmAdmin_Start Me.TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "TITLE", True)) Me.TITLETextBox.Location = New System.Drawing.Point(354, 28) Me.TITLETextBox.Name = "TITLETextBox" - Me.TITLETextBox.Size = New System.Drawing.Size(290, 22) + Me.TITLETextBox.Size = New System.Drawing.Size(290, 21) Me.TITLETextBox.TabIndex = 3 ' 'TYP_IDTextBox @@ -678,7 +679,7 @@ Partial Class frmAdmin_Start Me.TYP_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "TYP_ID", True)) Me.TYP_IDTextBox.Location = New System.Drawing.Point(777, 28) Me.TYP_IDTextBox.Name = "TYP_IDTextBox" - Me.TYP_IDTextBox.Size = New System.Drawing.Size(104, 22) + Me.TYP_IDTextBox.Size = New System.Drawing.Size(104, 21) Me.TYP_IDTextBox.TabIndex = 5 ' 'MULTI_CONTEXTCheckBox @@ -696,7 +697,7 @@ Partial Class frmAdmin_Start Me.VIEW_SEQUENCETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "VIEW_SEQUENCE", True)) Me.VIEW_SEQUENCETextBox.Location = New System.Drawing.Point(450, 79) Me.VIEW_SEQUENCETextBox.Name = "VIEW_SEQUENCETextBox" - Me.VIEW_SEQUENCETextBox.Size = New System.Drawing.Size(33, 22) + Me.VIEW_SEQUENCETextBox.Size = New System.Drawing.Size(33, 21) Me.VIEW_SEQUENCETextBox.TabIndex = 9 ' 'VIEW_VISIBLECheckBox @@ -714,7 +715,7 @@ Partial Class frmAdmin_Start Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "COMMENT", True)) Me.COMMENTTextBox.Location = New System.Drawing.Point(354, 122) Me.COMMENTTextBox.Name = "COMMENTTextBox" - Me.COMMENTTextBox.Size = New System.Drawing.Size(417, 22) + Me.COMMENTTextBox.Size = New System.Drawing.Size(417, 21) Me.COMMENTTextBox.TabIndex = 13 ' 'ADDED_WHOTextBox @@ -723,7 +724,7 @@ Partial Class frmAdmin_Start Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(354, 164) Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" Me.ADDED_WHOTextBox.ReadOnly = True - Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(104, 22) + Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(104, 21) Me.ADDED_WHOTextBox.TabIndex = 15 ' 'ADDED_WHENTextBox @@ -732,7 +733,7 @@ Partial Class frmAdmin_Start Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(475, 164) Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" Me.ADDED_WHENTextBox.ReadOnly = True - Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(131, 22) + Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(131, 21) Me.ADDED_WHENTextBox.TabIndex = 17 ' 'CHANGED_WHOTextBox @@ -741,7 +742,7 @@ Partial Class frmAdmin_Start Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(354, 204) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.ReadOnly = True - Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(104, 22) + Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(104, 21) Me.CHANGED_WHOTextBox.TabIndex = 19 ' 'CHANGED_WHENTextBox @@ -750,14 +751,14 @@ Partial Class frmAdmin_Start Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(475, 204) Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.ReadOnly = True - Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(131, 22) + Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(131, 21) Me.CHANGED_WHENTextBox.TabIndex = 21 ' 'XtraTabPageIDB_SourceSQL ' Me.XtraTabPageIDB_SourceSQL.Controls.Add(Me.GridSourceSQL) Me.XtraTabPageIDB_SourceSQL.Name = "XtraTabPageIDB_SourceSQL" - Me.XtraTabPageIDB_SourceSQL.Size = New System.Drawing.Size(1124, 524) + Me.XtraTabPageIDB_SourceSQL.Size = New System.Drawing.Size(1124, 519) Me.XtraTabPageIDB_SourceSQL.Text = "Source SQL" ' 'GridSourceSQL @@ -767,7 +768,7 @@ Partial Class frmAdmin_Start Me.GridSourceSQL.MainView = Me.ViewSourceSQL Me.GridSourceSQL.MenuManager = Me.RibbonControl1 Me.GridSourceSQL.Name = "GridSourceSQL" - Me.GridSourceSQL.Size = New System.Drawing.Size(1124, 524) + Me.GridSourceSQL.Size = New System.Drawing.Size(1124, 519) Me.GridSourceSQL.TabIndex = 0 Me.GridSourceSQL.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewSourceSQL}) ' @@ -780,7 +781,7 @@ Partial Class frmAdmin_Start ' Me.XtraTabPage_GlobalIndexer.Name = "XtraTabPage_GlobalIndexer" Me.XtraTabPage_GlobalIndexer.PageVisible = False - Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(1126, 547) + Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(1126, 544) Me.XtraTabPage_GlobalIndexer.Text = "Global Indexer" ' 'XtraTabPage_ClipboardWatcher @@ -788,7 +789,7 @@ Partial Class frmAdmin_Start Me.XtraTabPage_ClipboardWatcher.Controls.Add(Me.XtraTabControl1) Me.XtraTabPage_ClipboardWatcher.Name = "XtraTabPage_ClipboardWatcher" Me.XtraTabPage_ClipboardWatcher.PageVisible = False - Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(1126, 547) + Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(1126, 544) Me.XtraTabPage_ClipboardWatcher.Text = "Clipboard Watcher" ' 'XtraTabControl1 @@ -797,47 +798,47 @@ Partial Class frmAdmin_Start Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageCWProfiles - Me.XtraTabControl1.Size = New System.Drawing.Size(1126, 547) + Me.XtraTabControl1.Size = New System.Drawing.Size(1126, 544) Me.XtraTabControl1.TabIndex = 0 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageCWProfiles, Me.XtraTabPage2}) ' 'XtraTabPageCWProfiles ' - Me.XtraTabPageCWProfiles.Controls.Add(Me.GridControl2) + Me.XtraTabPageCWProfiles.Controls.Add(Me.GridCWProfiles) Me.XtraTabPageCWProfiles.Name = "XtraTabPageCWProfiles" - Me.XtraTabPageCWProfiles.Size = New System.Drawing.Size(1124, 524) + Me.XtraTabPageCWProfiles.Size = New System.Drawing.Size(1124, 519) Me.XtraTabPageCWProfiles.Text = "Profile" ' - 'GridControl2 + 'GridCWProfiles ' - 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.GridCWProfiles.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridCWProfiles.Location = New System.Drawing.Point(0, 0) + Me.GridCWProfiles.MainView = Me.ViewCWProfiles + Me.GridCWProfiles.MenuManager = Me.RibbonControl1 + Me.GridCWProfiles.Name = "GridCWProfiles" + Me.GridCWProfiles.Size = New System.Drawing.Size(1124, 519) + Me.GridCWProfiles.TabIndex = 0 + Me.GridCWProfiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewCWProfiles}) ' - 'GridView2 + 'ViewCWProfiles ' - Me.GridView2.GridControl = Me.GridControl2 - Me.GridView2.Name = "GridView2" + Me.ViewCWProfiles.GridControl = Me.GridCWProfiles + Me.ViewCWProfiles.Name = "ViewCWProfiles" ' 'XtraTabPage2 ' Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1124, 524) + Me.XtraTabPage2.Size = New System.Drawing.Size(1124, 519) Me.XtraTabPage2.Text = "XtraTabPage2" ' 'XtraTabControl ' Me.XtraTabControl.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl.Location = New System.Drawing.Point(200, 159) + Me.XtraTabControl.Location = New System.Drawing.Point(200, 158) Me.XtraTabControl.Name = "XtraTabControl" Me.XtraTabControl.SelectedTabPage = Me.XtraTabPage_IDB Me.XtraTabControl.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] - Me.XtraTabControl.Size = New System.Drawing.Size(1128, 570) + Me.XtraTabControl.Size = New System.Drawing.Size(1128, 569) Me.XtraTabControl.TabIndex = 4 Me.XtraTabControl.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage_ClipboardWatcher, Me.XtraTabPage_GlobalIndexer, Me.XtraTabPage_IDB}) ' @@ -881,8 +882,8 @@ Partial Class frmAdmin_Start 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.GridCWProfiles, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ViewCWProfiles, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl.ResumeLayout(False) Me.ResumeLayout(False) @@ -966,6 +967,6 @@ 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 GridView2 As GridView + Friend WithEvents GridCWProfiles As GridControl + Friend WithEvents ViewCWProfiles As GridView End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx index 32a2254f..d72b3efc 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx @@ -326,9 +326,6 @@ LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - 323, 21 - 711, 21 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index fdc57137..f09cfc15 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -44,12 +44,12 @@ Public Class frmAdmin_Start 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") + .PrimaryKey = oRow.Item("PK_COLUMN").ToString, + .SQL = oRow.Item("SQL_COMMAND").ToString, + .Title = oRow.Item("ENTITY_TITLE").ToString } - SourceCommands.Add(oRow.Item("ENTITY_TITLE"), oSource) + SourceCommands.Add(oRow.Item("ENTITY_TITLE").ToString, oSource) Next Return True Catch ex As Exception @@ -125,7 +125,7 @@ Public Class frmAdmin_Start Display_RibbonPage(RibbonPage_ClipboardWatcher) Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL) - Load_Grid(oTable, oSource.PrimaryKey, GridControl2) + Load_Grid(oTable, oSource.PrimaryKey, GridCWProfiles) Case IDB_SOURCE_SQL Display_Tab(XtraTabPage_IDB) @@ -202,7 +202,8 @@ Public Class frmAdmin_Start 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, ViewCWProfiles.DoubleClick Dim oView As GridView = TryCast(sender, GridView) Dim hitInfo As GridHitInfo = oView.CalcHitInfo(TryCast(e, DXMouseEventArgs).Location) If hitInfo.InDataRow Then @@ -213,11 +214,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 ViewCWProfiles.Name + Load_CWProfile(oPrimaryKey) + End Select End If @@ -227,7 +231,7 @@ 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() @@ -257,12 +261,27 @@ Public Class frmAdmin_Start 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 SourceSql = SourceCommands.Item(CurrentPage) + Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL) + Load_Grid(oTable, oSource.PrimaryKey, GridCWProfiles) + End If + Catch ex As Exception + ShowError(ex) + End Try + End Sub + Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick Try 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) 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..1509f99b 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -565,6 +565,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 + + + 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..67c89192 --- /dev/null +++ b/Controls.LookupGrid/Resources/Strings.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 + + + 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..9a480d5e 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 @@ -52,11 +54,13 @@ Public Class frmLookupGrid Dim oCheckboxColumn = _View.Columns.Item(0) oCheckboxColumn.Caption = " " oCheckboxColumn.MaxWidth = 10 + My.Resources.ResourceManager.GetString("FormText") + - Text = "Wählen Sie einen oder mehrere Werte:" + Text = _R.GetString("FormText") _DataColumn = 1 Else - Text = "Wählen Sie einen Wert:" + Text = _R.GetString("FormText") _DataColumn = 0 End If From 28747f2344f991b28d39a22493139ff75d09a48c Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 1 Mar 2021 16:37:04 +0100 Subject: [PATCH 10/23] Windows: Add Animator Class --- Windows/Animator.vb | 72 ++++++++++++++++ Windows/Animator/frmPopup.Designer.vb | 41 +++++++++ Windows/Animator/frmPopup.resx | 120 ++++++++++++++++++++++++++ Windows/Animator/frmPopup.vb | 3 + Windows/Windows.vbproj | 10 +++ 5 files changed, 246 insertions(+) create mode 100644 Windows/Animator.vb create mode 100644 Windows/Animator/frmPopup.Designer.vb create mode 100644 Windows/Animator/frmPopup.resx create mode 100644 Windows/Animator/frmPopup.vb diff --git a/Windows/Animator.vb b/Windows/Animator.vb new file mode 100644 index 00000000..7f5d50d2 --- /dev/null +++ b/Windows/Animator.vb @@ -0,0 +1,72 @@ +Imports System.Drawing +Imports System.Windows.Forms + +Public Class Animator + Public Const DEFAULT_FONT_OPACITY = 0.5 + Public Const DEFAULT_FORM_SIZE = 30 + Public Const DEFAULT_FORM_FADE_SPEED = 10 + Public Const DEFAULT_FORM_FADE_INTERVAL = 250 + + Public Property FormSize As Integer + Public Property FadeInterval As Integer + Public Property FadeSpeed As Integer + Public Property FormOpacity As Double + Public Property FormColor As Color + + Public Sub New() + _FormSize = DEFAULT_FORM_SIZE + _FadeSpeed = DEFAULT_FORM_FADE_SPEED + _FadeInterval = DEFAULT_FORM_FADE_INTERVAL + _FormOpacity = DEFAULT_FONT_OPACITY + _FormColor = Color.FromArgb(255, 214, 49) + End Sub + + Public Sub Highlight(Position As Point) + Dim oForm = GetPopup(Position) + oForm.Show() + FadeIn(oForm, _FormOpacity, _FadeSpeed / 2) + Dim oTimer As New Timer With {.Interval = _FadeInterval} + AddHandler oTimer.Tick, Sub() + FadeOut(oForm, _FadeSpeed * 2) + oTimer.Stop() + End Sub + oTimer.Start() + End Sub + + Private Function GetPopup(CursorPosition As Point) As frmPopup + Dim oFormLocation = New Point(CursorPosition.X - (_FormSize / 2), CursorPosition.Y - (_FormSize / 2)) + Dim oFormSize = New Size(_FormSize, _FormSize) + + Return New frmPopup() With { + .Location = oFormLocation, + .StartPosition = FormStartPosition.Manual, + .Size = oFormSize, + .MaximumSize = oFormSize, + .MinimumSize = oFormSize, + .Opacity = 0, + .ShowInTaskbar = False, + .BackColor = _FormColor + } + End Function + + Private Async Sub FadeIn(ByVal o As Form, finalOpacity As Double, ByVal Optional interval As Integer = 80) + While o.Opacity < finalOpacity + Await Task.Delay(interval) + o.Opacity += 0.05 + Debug.WriteLine("Fading in, Opacity: " & o.Opacity) + End While + + o.Opacity = finalOpacity + End Sub + + Private Async Sub FadeOut(ByVal o As Form, ByVal Optional interval As Integer = 80) + While o.Opacity > 0.0 + Await Task.Delay(interval) + o.Opacity -= 0.05 + Debug.WriteLine("Fading out, Opacity: " & o.Opacity) + End While + + o.Opacity = 0 + End Sub + +End Class diff --git a/Windows/Animator/frmPopup.Designer.vb b/Windows/Animator/frmPopup.Designer.vb new file mode 100644 index 00000000..c4b94623 --- /dev/null +++ b/Windows/Animator/frmPopup.Designer.vb @@ -0,0 +1,41 @@ + _ +Partial Class frmPopup + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.SuspendLayout() + ' + 'frmPopup + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.Yellow + Me.ClientSize = New System.Drawing.Size(30, 30) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.MaximumSize = New System.Drawing.Size(30, 30) + Me.MinimumSize = New System.Drawing.Size(30, 30) + Me.Name = "frmPopup" + Me.Text = "frmPopup" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/Windows/Animator/frmPopup.resx b/Windows/Animator/frmPopup.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/Windows/Animator/frmPopup.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/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/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 From a164ab3286b6c4c55700d93a0721a3f777d3edad Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 1 Mar 2021 16:37:32 +0100 Subject: [PATCH 11/23] Windows: Version 1.2.0.0 --- Windows/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Windows/My Project/AssemblyInfo.vb b/Windows/My Project/AssemblyInfo.vb index 97a103ef..c7b09627 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: ' - - + + From d79ffe4aa80dfb1641b1d276599ab0320d09cd15 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 1 Mar 2021 16:38:14 +0100 Subject: [PATCH 12/23] LookupControl: 2.1.0.0 --- Controls.LookupGrid/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Controls.LookupGrid/My Project/AssemblyInfo.vb b/Controls.LookupGrid/My Project/AssemblyInfo.vb index fe4ee67c..37b760d6 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: ' - - + + From deb10b895827aaa3f8ab030d3c4bb2e51ada3d47 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 2 Mar 2021 09:30:47 +0100 Subject: [PATCH 13/23] LookupGrid: Translate last string in LookupGrid --- Controls.LookupGrid/LookupControl3.vb | 10 +++--- .../Resources/Strings.Designer.vb | 35 ++++++++++++++++--- Controls.LookupGrid/Resources/Strings.en.resx | 13 +++++-- Controls.LookupGrid/Resources/Strings.resx | 13 +++++-- Controls.LookupGrid/frmLookupGrid.vb | 6 ++-- 5 files changed, 59 insertions(+), 18 deletions(-) diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb index b53b5278..a65b28aa 100644 --- a/Controls.LookupGrid/LookupControl3.vb +++ b/Controls.LookupGrid/LookupControl3.vb @@ -49,10 +49,8 @@ Public Class RepositoryItemLookupControl3 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 @@ -159,11 +157,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() diff --git a/Controls.LookupGrid/Resources/Strings.Designer.vb b/Controls.LookupGrid/Resources/Strings.Designer.vb index edba7805..136f8d4b 100644 --- a/Controls.LookupGrid/Resources/Strings.Designer.vb +++ b/Controls.LookupGrid/Resources/Strings.Designer.vb @@ -64,21 +64,48 @@ Namespace My.Resources 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 FormText() As String + Friend Shared ReadOnly Property PopupForm_Text() As String Get - Return ResourceManager.GetString("FormText", resourceCulture) + 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 FormTextMultiLine() As String + Friend Shared ReadOnly Property PopupForm_TextMultiLine() As String Get - Return ResourceManager.GetString("FormTextMultiLine", resourceCulture) + Return ResourceManager.GetString("PopupForm_TextMultiLine", resourceCulture) End Get End Property End Class diff --git a/Controls.LookupGrid/Resources/Strings.en.resx b/Controls.LookupGrid/Resources/Strings.en.resx index a2357574..f9bd92ec 100644 --- a/Controls.LookupGrid/Resources/Strings.en.resx +++ b/Controls.LookupGrid/Resources/Strings.en.resx @@ -117,10 +117,19 @@ 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 index 67c89192..dd5e4f94 100644 --- a/Controls.LookupGrid/Resources/Strings.resx +++ b/Controls.LookupGrid/Resources/Strings.resx @@ -117,10 +117,19 @@ 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.vb b/Controls.LookupGrid/frmLookupGrid.vb index 9a480d5e..a34ed92f 100644 --- a/Controls.LookupGrid/frmLookupGrid.vb +++ b/Controls.LookupGrid/frmLookupGrid.vb @@ -54,13 +54,11 @@ Public Class frmLookupGrid Dim oCheckboxColumn = _View.Columns.Item(0) oCheckboxColumn.Caption = " " oCheckboxColumn.MaxWidth = 10 - My.Resources.ResourceManager.GetString("FormText") - - Text = _R.GetString("FormText") + Text = _R.GetString("PopupForm_Text") _DataColumn = 1 Else - Text = _R.GetString("FormText") + Text = _R.GetString("PopupForm_TextMultiLine") _DataColumn = 0 End If From 0a37e7b140404e0492817f4385419a618527c157 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 2 Mar 2021 09:31:15 +0100 Subject: [PATCH 14/23] LookupGrid: Version 2.1.1 --- Controls.LookupGrid/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Controls.LookupGrid/My Project/AssemblyInfo.vb b/Controls.LookupGrid/My Project/AssemblyInfo.vb index 37b760d6..b26617cc 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: ' - - + + From 4540778c5adf0a201050a38980e60d64e2b77ce2 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 2 Mar 2021 10:18:30 +0100 Subject: [PATCH 15/23] LookupControl: Translate Strings for LookupControl2 --- Controls.LookupGrid/LookupControl2.vb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Controls.LookupGrid/LookupControl2.vb b/Controls.LookupGrid/LookupControl2.vb index e75802bd..d46a34b6 100644 --- a/Controls.LookupGrid/LookupControl2.vb +++ b/Controls.LookupGrid/LookupControl2.vb @@ -53,10 +53,8 @@ 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 @@ -81,7 +79,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 +153,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() From cd75459a27d7dc86a93854c06a2cb6a6dba1a4a0 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 2 Mar 2021 10:18:59 +0100 Subject: [PATCH 16/23] LookupGrid: Version 2.1.2 --- Controls.LookupGrid/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Controls.LookupGrid/My Project/AssemblyInfo.vb b/Controls.LookupGrid/My Project/AssemblyInfo.vb index b26617cc..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: ' - - + + From b759d18b6b6ac67bda5e5735f64a9418821ddc8b Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 3 Mar 2021 09:18:39 +0100 Subject: [PATCH 17/23] Windows: Improve Animator --- Windows/Animator.vb | 75 +++++++++++++----------- Windows/Animator/frmPopup.Designer.vb | 6 +- Windows/My Project/Resources.Designer.vb | 2 +- Windows/My Project/Resources.resx | 13 ++-- 4 files changed, 55 insertions(+), 41 deletions(-) diff --git a/Windows/Animator.vb b/Windows/Animator.vb index 7f5d50d2..48bb442c 100644 --- a/Windows/Animator.vb +++ b/Windows/Animator.vb @@ -1,51 +1,63 @@ Imports System.Drawing Imports System.Windows.Forms - Public Class Animator - Public Const DEFAULT_FONT_OPACITY = 0.5 - Public Const DEFAULT_FORM_SIZE = 30 - Public Const DEFAULT_FORM_FADE_SPEED = 10 - Public Const DEFAULT_FORM_FADE_INTERVAL = 250 + Private Const DEFAULT_POPUP_OPACITY = 0.5 + Private Const DEFAULT_POPUP_SIZE = 30 + Private Const DEFAULT_POPUP_FADE_SPEED = 10 + Private Const DEFAULT_POPUP_FADE_INTERVAL = 250 - Public Property FormSize As Integer - Public Property FadeInterval As Integer - Public Property FadeSpeed As Integer - Public Property FormOpacity As Double - Public Property FormColor As Color + ''' + ''' Time the popup stays visible between the animations + ''' + Public Property AnimationInterval As Integer + ''' + ''' Basevalue for calculating the time the popup takes to animate + ''' + Public Property AnimationSpeed As Integer + ''' + ''' Opacity the popup animates to (From 0.0 to .., back to 0.0) + ''' + Public Property PopupOpacity As Double + ''' + ''' Color of the popup + ''' + ''' + Public Property PopupColor As Color + ''' + ''' Size of the popup in width and height + ''' + Public Property PopupSize As Size Public Sub New() - _FormSize = DEFAULT_FORM_SIZE - _FadeSpeed = DEFAULT_FORM_FADE_SPEED - _FadeInterval = DEFAULT_FORM_FADE_INTERVAL - _FormOpacity = DEFAULT_FONT_OPACITY - _FormColor = Color.FromArgb(255, 214, 49) + _PopupSize = New Size(DEFAULT_POPUP_SIZE, DEFAULT_POPUP_SIZE) + _AnimationSpeed = DEFAULT_POPUP_FADE_SPEED + _AnimationInterval = DEFAULT_POPUP_FADE_INTERVAL + _PopupOpacity = DEFAULT_POPUP_OPACITY + _PopupColor = Color.FromArgb(255, 214, 49) End Sub Public Sub Highlight(Position As Point) - Dim oForm = GetPopup(Position) + Dim oForm = GetPopup(Position, PopupSize) oForm.Show() - FadeIn(oForm, _FormOpacity, _FadeSpeed / 2) - Dim oTimer As New Timer With {.Interval = _FadeInterval} - AddHandler oTimer.Tick, Sub() - FadeOut(oForm, _FadeSpeed * 2) - oTimer.Stop() - End Sub - oTimer.Start() + FadeIn(oForm, _PopupOpacity, _AnimationSpeed / 2) + Task.Delay(_AnimationInterval) + FadeOut(oForm, _AnimationSpeed * 2) End Sub - Private Function GetPopup(CursorPosition As Point) As frmPopup - Dim oFormLocation = New Point(CursorPosition.X - (_FormSize / 2), CursorPosition.Y - (_FormSize / 2)) - Dim oFormSize = New Size(_FormSize, _FormSize) + Private Function GetPopup(CursorPosition As Point, PopupSize As Size) As frmPopup + Dim oFormLocation = New Point( + CursorPosition.X - (PopupSize.Width / 2), + CursorPosition.Y - (PopupSize.Height / 2)) Return New frmPopup() With { .Location = oFormLocation, .StartPosition = FormStartPosition.Manual, - .Size = oFormSize, - .MaximumSize = oFormSize, - .MinimumSize = oFormSize, + .Size = PopupSize, + .MaximumSize = PopupSize, + .MinimumSize = PopupSize, .Opacity = 0, .ShowInTaskbar = False, - .BackColor = _FormColor + .BackColor = _PopupColor } End Function @@ -53,7 +65,6 @@ Public Class Animator While o.Opacity < finalOpacity Await Task.Delay(interval) o.Opacity += 0.05 - Debug.WriteLine("Fading in, Opacity: " & o.Opacity) End While o.Opacity = finalOpacity @@ -63,10 +74,8 @@ Public Class Animator While o.Opacity > 0.0 Await Task.Delay(interval) o.Opacity -= 0.05 - Debug.WriteLine("Fading out, Opacity: " & o.Opacity) End While o.Opacity = 0 End Sub - End Class diff --git a/Windows/Animator/frmPopup.Designer.vb b/Windows/Animator/frmPopup.Designer.vb index c4b94623..09bb5b0d 100644 --- a/Windows/Animator/frmPopup.Designer.vb +++ b/Windows/Animator/frmPopup.Designer.vb @@ -1,6 +1,8 @@ - _ +Imports System.Windows.Forms + + Partial Class frmPopup - Inherits System.Windows.Forms.Form + Inherits Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ 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 From dbf43204e1465779485b7e43a3b88e7acd755376 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 3 Mar 2021 09:19:20 +0100 Subject: [PATCH 18/23] LookupGrid: Fucking autogenerated fProperties --- Controls.LookupGrid/LookupControl2.vb | 27 ++++++++++++++++++++++++++ Controls.LookupGrid/LookupControl3.vb | 28 +++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/Controls.LookupGrid/LookupControl2.vb b/Controls.LookupGrid/LookupControl2.vb index d46a34b6..c3662fa3 100644 --- a/Controls.LookupGrid/LookupControl2.vb +++ b/Controls.LookupGrid/LookupControl2.vb @@ -60,6 +60,8 @@ Public Class LookupControl2 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() @@ -196,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 a65b28aa..bea6278d 100644 --- a/Controls.LookupGrid/LookupControl3.vb +++ b/Controls.LookupGrid/LookupControl3.vb @@ -30,8 +30,36 @@ Public Class LookupControl3 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 From 3c237a474b4ea011eb79324a36deeb68a2d40ed7 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 3 Mar 2021 09:19:55 +0100 Subject: [PATCH 19/23] Windows: Version 1.2.1 --- Windows/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Windows/My Project/AssemblyInfo.vb b/Windows/My Project/AssemblyInfo.vb index c7b09627..5827f8c7 100644 --- a/Windows/My Project/AssemblyInfo.vb +++ b/Windows/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 1d315a15b8162e5eec9653c7f42f30012c917d37 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 3 Mar 2021 09:57:45 +0100 Subject: [PATCH 20/23] Windows: fix animator not disappearing, add topmost --- Windows/Animator.vb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Windows/Animator.vb b/Windows/Animator.vb index 48bb442c..c1c14b51 100644 --- a/Windows/Animator.vb +++ b/Windows/Animator.vb @@ -36,11 +36,11 @@ Public Class Animator _PopupColor = Color.FromArgb(255, 214, 49) End Sub - Public Sub Highlight(Position As Point) + Public Async Sub Highlight(Position As Point) Dim oForm = GetPopup(Position, PopupSize) oForm.Show() FadeIn(oForm, _PopupOpacity, _AnimationSpeed / 2) - Task.Delay(_AnimationInterval) + Await Task.Delay(_AnimationInterval) FadeOut(oForm, _AnimationSpeed * 2) End Sub @@ -57,7 +57,8 @@ Public Class Animator .MinimumSize = PopupSize, .Opacity = 0, .ShowInTaskbar = False, - .BackColor = _PopupColor + .BackColor = _PopupColor, + .TopMost = True } End Function From b0da6637568e2ca638ac6daba2c4b856aea104de Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 3 Mar 2021 10:32:36 +0100 Subject: [PATCH 21/23] Windows: Improve Hotkey --- Windows/Hotkey.vb | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) 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 From b35e8fa588e09beda47442185c92d2eb40e2d72d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 3 Mar 2021 10:33:43 +0100 Subject: [PATCH 22/23] ZooFlow: Add Animator, Improve Hotkey Usage --- GUIs.ZooFlow/ClassConstants.vb | 4 ++-- GUIs.ZooFlow/ZooFlow.vbproj | 21 ++++++++++++--------- GUIs.ZooFlow/frmFlowForm.vb | 15 +++++++++++---- 3 files changed, 25 insertions(+), 15 deletions(-) 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/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 1509f99b..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 diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 77d61cdb..ab9cf70e 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -34,6 +34,11 @@ Public Class frmFlowForm Private ClassWindow As Window Private ProfileFilter As ProfileFilter Private ProfileLoader As ClassProfileLoader + Private Animator As New Animator() With { + .PopupColor = Color.FromArgb(255, 214, 49), + .PopupOpacity = 0.8, + .PopupSize = New Size(100, 30) + } ' Runtime Flags Private ApplicationLoading As Boolean = True @@ -229,13 +234,13 @@ Public Class frmFlowForm Select Case oFunctionKey Case "CTRL" - HotkeyClass.AddHotKey(oKeyCode, Hotkey.ModfierKey.MOD_CONTROL, ClassConstants.HOTKEY_TRIGGER_WATCHER) + HotkeyClass.AddHotKey(oKeyCode, Hotkey.ModfierKey.MOD_CONTROL, HOTKEY_TRIGGER_WATCHER) Case "SHIFT" - HotkeyClass.AddHotKey(oKeyCode, Hotkey.ModfierKey.MOD_SHIFT, ClassConstants.HOTKEY_TRIGGER_WATCHER) + HotkeyClass.AddHotKey(oKeyCode, Hotkey.ModfierKey.MOD_SHIFT, HOTKEY_TRIGGER_WATCHER) Case "ALT" - HotkeyClass.AddHotKey(oKeyCode, Hotkey.ModfierKey.MOD_ALT, ClassConstants.HOTKEY_TRIGGER_WATCHER) + HotkeyClass.AddHotKey(oKeyCode, Hotkey.ModfierKey.MOD_ALT, HOTKEY_TRIGGER_WATCHER) Case "WIN" - HotkeyClass.AddHotKey(oKeyCode, Hotkey.ModfierKey.MOD_WIN, ClassConstants.HOTKEY_TRIGGER_WATCHER) + HotkeyClass.AddHotKey(oKeyCode, Hotkey.ModfierKey.MOD_WIN, HOTKEY_TRIGGER_WATCHER) End Select AddHandler HotkeyClass.HotKeyPressed, AddressOf HotkeyClass_HotKeyPressed @@ -943,6 +948,8 @@ Public Class frmFlowForm Select Case HotKeyID Case HOTKEY_TRIGGER_WATCHER + Animator.Highlight(Cursor.Position) + If oState.CurrentClipboardContents = String.Empty Then Logger.Info("Current Clipboard Contents is empty. Exiting.") Exit Sub From ce0096408b156ba8d3c55a8df318e852c6a74a4a Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 3 Mar 2021 10:34:10 +0100 Subject: [PATCH 23/23] Windows: Version 1.2.2 --- Windows/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Windows/My Project/AssemblyInfo.vb b/Windows/My Project/AssemblyInfo.vb index 5827f8c7..b0869ff4 100644 --- a/Windows/My Project/AssemblyInfo.vb +++ b/Windows/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +