diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index fb4430c3..048e66ed 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -45,6 +45,8 @@ Partial Class DocumentViewer Me.buttonNextPage = New DevExpress.XtraBars.BarButtonItem() Me.buttonLastPage = New DevExpress.XtraBars.BarButtonItem() Me.buttonSettings = New DevExpress.XtraBars.BarButtonItem() + Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() + Me.RepositoryItemColorEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorEdit() Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() @@ -55,6 +57,8 @@ Partial Class DocumentViewer Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -94,7 +98,7 @@ Partial Class DocumentViewer Me.GdViewer.HQAnnotationRendering = True Me.GdViewer.IgnoreDocumentResolution = False Me.GdViewer.KeepDocumentPosition = False - Me.GdViewer.Location = New System.Drawing.Point(0, 36) + Me.GdViewer.Location = New System.Drawing.Point(0, 33) Me.GdViewer.LockViewer = False Me.GdViewer.MagnifierHeight = 90 Me.GdViewer.MagnifierWidth = 160 @@ -124,7 +128,7 @@ Partial Class DocumentViewer Me.GdViewer.ScrollLargeChange = CType(50, Short) Me.GdViewer.ScrollSmallChange = CType(1, Short) Me.GdViewer.SilentMode = True - Me.GdViewer.Size = New System.Drawing.Size(1015, 554) + Me.GdViewer.Size = New System.Drawing.Size(1015, 557) Me.GdViewer.TabIndex = 0 Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone Me.GdViewer.Zoom = 1.0R @@ -159,8 +163,8 @@ Partial Class DocumentViewer Me.BarManager1.Form = Me Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.buttonPrint, Me.buttonFitPage, Me.buttonFitWidth, Me.buttonZoomIn, Me.buttonZoomOut, Me.buttonRotateRight, Me.buttonRotateLeft, Me.buttonFlipX, Me.buttonFlipY, Me.buttonSettings, Me.buttonPrevPage, Me.buttonNextPage, Me.buttonFirstPage, Me.buttonLastPage, Me.txtCurrentPage, Me.BarStaticItem1}) Me.BarManager1.MainMenu = Me.ToolbarDocumentViewer - Me.BarManager1.MaxItemId = 18 - Me.BarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2}) + Me.BarManager1.MaxItemId = 24 + Me.BarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemColorEdit1, Me.RepositoryItemComboBox1}) ' 'ToolbarDocumentViewer ' @@ -301,13 +305,29 @@ Partial Class DocumentViewer Me.buttonSettings.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) Me.buttonSettings.Name = "buttonSettings" ' + 'RepositoryItemComboBox1 + ' + Me.RepositoryItemComboBox1.AutoHeight = False + Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemComboBox1.Items.AddRange(New Object() {"Arrow", "Text"}) + Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1" + ' + 'RepositoryItemColorEdit1 + ' + Me.RepositoryItemColorEdit1.AutoHeight = False + Me.RepositoryItemColorEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemColorEdit1.Name = "RepositoryItemColorEdit1" + Me.RepositoryItemColorEdit1.ShowCustomColors = False + Me.RepositoryItemColorEdit1.ShowSystemColors = False + Me.RepositoryItemColorEdit1.ShowWebColors = False + ' 'barDockControlTop ' Me.barDockControlTop.CausesValidation = False Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top Me.barDockControlTop.Location = New System.Drawing.Point(0, 0) Me.barDockControlTop.Manager = Me.BarManager1 - Me.barDockControlTop.Size = New System.Drawing.Size(1015, 36) + Me.barDockControlTop.Size = New System.Drawing.Size(1015, 33) ' 'barDockControlBottom ' @@ -321,17 +341,17 @@ Partial Class DocumentViewer ' Me.barDockControlLeft.CausesValidation = False Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left - Me.barDockControlLeft.Location = New System.Drawing.Point(0, 36) + Me.barDockControlLeft.Location = New System.Drawing.Point(0, 33) Me.barDockControlLeft.Manager = Me.BarManager1 - Me.barDockControlLeft.Size = New System.Drawing.Size(0, 554) + Me.barDockControlLeft.Size = New System.Drawing.Size(0, 557) ' 'barDockControlRight ' Me.barDockControlRight.CausesValidation = False Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right - Me.barDockControlRight.Location = New System.Drawing.Point(1015, 36) + Me.barDockControlRight.Location = New System.Drawing.Point(1015, 33) Me.barDockControlRight.Manager = Me.BarManager1 - Me.barDockControlRight.Size = New System.Drawing.Size(0, 554) + Me.barDockControlRight.Size = New System.Drawing.Size(0, 557) ' 'BarStaticItem1 ' @@ -370,6 +390,8 @@ Partial Class DocumentViewer Me.Size = New System.Drawing.Size(1015, 590) CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -405,4 +427,6 @@ Partial Class DocumentViewer Friend WithEvents RepositoryItemTextEdit2 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit Friend WithEvents RepositoryItemTextEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem + Friend WithEvents RepositoryItemColorEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemColorEdit + Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox End Class diff --git a/Controls.DocumentViewer/DocumentViewer.resx b/Controls.DocumentViewer/DocumentViewer.resx index e3915f17..39f91ea5 100644 --- a/Controls.DocumentViewer/DocumentViewer.resx +++ b/Controls.DocumentViewer/DocumentViewer.resx @@ -118,10 +118,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 233, 25 + 6, 19 - 508, 25 + 285, 22 @@ -359,6 +359,6 @@ - 368, 25 + 152, 18 \ No newline at end of file diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 4add2125..ceff7d12 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -328,10 +328,24 @@ Public Class DocumentViewer _hide_file_info_from_user = ViewOnly End Sub + Public Sub SetAllowAnnotations(AllowAnnotations As Boolean) + + End Sub + + ''' + ''' DEPRECATED: Use SetViewOnly + ''' Public Sub RightViewOnly(ViewOnly As Boolean) SetViewOnly(ViewOnly) End Sub + ''' + ''' DEPRECATED: Use SetViewOnly + ''' + Public Sub RightOnlyView(ViewOnly As Boolean) + SetViewOnly(ViewOnly) + End Sub + Private Sub UpdateMainUi() End Sub @@ -466,9 +480,4 @@ Public Class DocumentViewer Dim oPageWidth = Units.DocumentsToPixelsF(RichEditControl1.Document.Sections(0).Page.Width, RichEditControl1.DpiX) RichEditControl1.Views.PrintLayoutView.ZoomFactor = oControlWidth / oPageWidth End Sub - - Private Sub btnSettings_Click(sender As Object, e As XtraBars.ItemClickEventArgs) Handles buttonSettings.ItemClick - - End Sub - End Class diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj index 80ad1687..df047535 100644 --- a/Controls.DocumentViewer/DocumentViewer.vbproj +++ b/Controls.DocumentViewer/DocumentViewer.vbproj @@ -180,5 +180,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/Controls.DocumentViewer/My Project/Resources.Designer.vb b/Controls.DocumentViewer/My Project/Resources.Designer.vb index 0219a3c8..5174deed 100644 --- a/Controls.DocumentViewer/My Project/Resources.Designer.vb +++ b/Controls.DocumentViewer/My Project/Resources.Designer.vb @@ -60,6 +60,36 @@ Namespace My.Resources End Set End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property floatingobjectoutlinecolor() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("floatingobjectoutlinecolor", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property tooltips() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("tooltips", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property tooltips1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("tooltips1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/Controls.DocumentViewer/My Project/Resources.resx b/Controls.DocumentViewer/My Project/Resources.resx index 643e6c8f..64ac3874 100644 --- a/Controls.DocumentViewer/My Project/Resources.resx +++ b/Controls.DocumentViewer/My Project/Resources.resx @@ -118,7 +118,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\tooltips.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\ZooFlow-10.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\floatingobjectoutlinecolor.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\tooltips1.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/Controls.DocumentViewer/My Project/licenses.licx b/Controls.DocumentViewer/My Project/licenses.licx index 0f6c2b30..6150605b 100644 --- a/Controls.DocumentViewer/My Project/licenses.licx +++ b/Controls.DocumentViewer/My Project/licenses.licx @@ -1,4 +1,5 @@ -DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Controls.DocumentViewer/Resources/floatingobjectoutlinecolor.svg b/Controls.DocumentViewer/Resources/floatingobjectoutlinecolor.svg new file mode 100644 index 00000000..5af7cef5 --- /dev/null +++ b/Controls.DocumentViewer/Resources/floatingobjectoutlinecolor.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/Controls.DocumentViewer/Resources/tooltips.svg b/Controls.DocumentViewer/Resources/tooltips.svg new file mode 100644 index 00000000..0a0fd012 --- /dev/null +++ b/Controls.DocumentViewer/Resources/tooltips.svg @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/Controls.DocumentViewer/Resources/tooltips1.svg b/Controls.DocumentViewer/Resources/tooltips1.svg new file mode 100644 index 00000000..0a0fd012 --- /dev/null +++ b/Controls.DocumentViewer/Resources/tooltips1.svg @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/Controls.LookupGrid/LookupControl.vbproj b/Controls.LookupGrid/LookupControl.vbproj index 22c5730b..66c4fa50 100644 --- a/Controls.LookupGrid/LookupControl.vbproj +++ b/Controls.LookupGrid/LookupControl.vbproj @@ -130,10 +130,10 @@ Settings.settings True - - LookupGridControl.vb + + LookupControl3.vb - + Component @@ -147,6 +147,9 @@ LookupControl2.vb + + LookupControl3.vb + VbMyResourcesResXFileCodeGenerator diff --git a/Controls.LookupGrid/LookupGridControl.Designer.vb b/Controls.LookupGrid/LookupControl3.Designer.vb similarity index 100% rename from Controls.LookupGrid/LookupGridControl.Designer.vb rename to Controls.LookupGrid/LookupControl3.Designer.vb diff --git a/Controls.LookupGrid/LookupControl3.resx b/Controls.LookupGrid/LookupControl3.resx new file mode 100644 index 00000000..e5858cc2 --- /dev/null +++ b/Controls.LookupGrid/LookupControl3.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + False + + \ No newline at end of file diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb new file mode 100644 index 00000000..2555aa2a --- /dev/null +++ b/Controls.LookupGrid/LookupControl3.vb @@ -0,0 +1,238 @@ +Imports System.Drawing +Imports System.ComponentModel +Imports System.Windows.Forms +Imports DevExpress.XtraEditors +Imports DevExpress.XtraEditors.Repository +Imports DevExpress.XtraEditors.Registrator +Imports DevExpress.XtraEditors.ViewInfo +Imports DevExpress.XtraEditors.Drawing +Imports DevExpress.Accessibility +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 + Return TryCast(MyBase.Properties, RepositoryItemLookupControl3) + End Get + End Property + + Public Overrides ReadOnly Property EditorTypeName As String + Get + Return RepositoryItemLookupControl3.CustomEditName + End Get + End Property +End Class + + +Public Class RepositoryItemLookupControl3 + Inherits RepositoryItemGridLookUpEdit + + Shared Sub New() + RegisterLookupControl() + End Sub + + Private Const TAG_DROPDOWN = "openDropdown" + + Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm" + Private Const TEXT_NO_RECORDS = "Keine Datensätze ausgewählt" + Private Const TEXT_ONE_RECORD = "Ein Datensatz ausgewählt" + Private Const TEXT_N_RECORDS = "{0} Datensätze ausgewählt" + + Private _SelectedValues As New List(Of String) + Private _MultiSelect As Boolean = False + Private _ReadOnly As Boolean = False + + Public Const CustomEditName As String = "LookupControl3" + + Public Property AllowAddNewValues As Boolean + Public Property PreventDuplicates As Boolean + Public Overloads Property DataSource As DataTable + + Public Delegate Sub SelectedValuesChangedHandler(sender As Object, SelectedValues As List(Of String)) + Public Event SelectedValuesChanged As SelectedValuesChangedHandler + + Public Overrides ReadOnly Property EditorTypeName As String + Get + Return CustomEditName + End Get + End Property + + Public Overloads Property [ReadOnly] As Boolean + Get + Return _ReadOnly + End Get + Set(value As Boolean) + SetFormButtonEnabled(Not value) + _ReadOnly = value + End Set + End Property + + Public Property MultiSelect As Boolean + Get + Return _MultiSelect + End Get + Set(value As Boolean) + SetDropdownButtonEnabled(value) + _MultiSelect = value + End Set + End Property + + Public Property SelectedValues As List(Of String) + Get + Return _SelectedValues + End Get + Set(value As List(Of String)) + UpdateSelectedValues(value) + End Set + End Property + + Public Shared Sub RegisterLookupControl() + Dim img As Image = Nothing + Dim oClassInfo = New EditorClassInfo( + CustomEditName, + GetType(LookupControl3), + GetType(RepositoryItemLookupControl3), + GetType(GridLookUpEditBaseViewInfo), + New ButtonEditPainter(), + True, + img, + GetType(ButtonEditAccessible) + ) + EditorRegistrationInfo.Default.Editors.Add(oClassInfo) + End Sub + + Private Sub SetFormButtonEnabled(pVisible As Boolean) + Dim oButton As EditorButton = Buttons. + Where(Function(b) b.Tag = TAG_BUTTON_LOOKUP_FORM). + FirstOrDefault() + + If oButton IsNot Nothing Then + oButton.Visible = pVisible + End If + End Sub + + Private Sub SetDropdownButtonEnabled(pVisible As Boolean) + Dim oButton As EditorButton = Buttons. + Where(Function(b) b.Tag = TAG_DROPDOWN). + FirstOrDefault() + + If oButton IsNot Nothing Then + oButton.Visible = pVisible + End If + End Sub + + ''' + ''' Prevents Editvalue changing when multiselect is true + ''' + Private Sub HandleEditValueChanging(sender As Object, e As ChangingEventArgs) + If MultiSelect Then + e.Cancel = True + End If + End Sub + + Private Sub UpdateSelectedValues(Values As List(Of String)) + If Values Is Nothing OrElse Values.Count = 0 Then + Exit Sub + End If + + Values.RemoveAll(Function(v) String.IsNullOrEmpty(v)) + + If MultiSelect = True Then + ' DataSource = Values + + Select Case Values.Count + Case 0 + NullText = TEXT_NO_RECORDS + Case 1 + NullText = TEXT_ONE_RECORD + Case Else + NullText = String.Format(TEXT_N_RECORDS, Values.Count) + End Select + Else + NullText = Values.FirstOrDefault() + OwnerEdit.Text = Values.FirstOrDefault() + OwnerEdit.EditValue = Values.FirstOrDefault() + End If + + _SelectedValues = Values + + RaiseEvent SelectedValuesChanged(Me, Values) + End Sub + + Private Function GetLookupForm() As frmLookupGrid + Dim oForm As New frmLookupGrid() With { + .MultiSelect = MultiSelect, + .AddNewValues = AllowAddNewValues, + .PreventDuplicates = PreventDuplicates, + .DataSource = DataSource, + .SelectedValues = SelectedValues, + .StartPosition = FormStartPosition.Manual, + .Location = OwnerEdit.PointToScreen(New Point(OwnerEdit.Width, 0)) + } + + Return oForm + End Function + + Protected Overrides Sub RaiseButtonClick(e As ButtonPressedEventArgs) + Select Case e.Button.Tag + Case TAG_BUTTON_LOOKUP_FORM + Using oForm = GetLookupForm() + Dim oResult = oForm.ShowDialog() + + If oResult = Windows.Forms.DialogResult.OK Then + Dim oValues = oForm.SelectedValues + UpdateSelectedValues(oValues) + End If + End Using + Case Else + MyBase.RaiseButtonClick(e) + End Select + End Sub + + Public Overrides Sub Assign(item As RepositoryItem) + BeginUpdate() + Try + MyBase.Assign(item) + Dim source As RepositoryItemLookupControl3 = TryCast(item, RepositoryItemLookupControl3) + If source Is Nothing Then + Return + End If + Finally + EndUpdate() + End Try + End Sub + + Public Overrides Sub EndInit() + MyBase.EndInit() + + Dim oLookupFormButton = New EditorButton() With { + .Kind = ButtonPredefines.Search, + .Tag = TAG_BUTTON_LOOKUP_FORM, + .Width = 20 + } + + ' Add button if it does not already exists + If Buttons.Contains(oLookupFormButton) = False Then + Buttons.Insert(0, oLookupFormButton) + ' Set the button which opens the dropdown + ActionButtonIndex = 1 + End If + End Sub + + Protected Overrides Sub RaiseQueryPopUp(e As CancelEventArgs) + If MultiSelect = True Then + MyBase.RaiseQueryPopUp(e) + End If + End Sub +End Class diff --git a/Controls.LookupGrid/LookupGridControl.vb b/Controls.LookupGrid/LookupGridControl.vb deleted file mode 100644 index c0beb820..00000000 --- a/Controls.LookupGrid/LookupGridControl.vb +++ /dev/null @@ -1,18 +0,0 @@ -Imports DevExpress.XtraGrid -Imports DevExpress.XtraGrid.Views.Base -Imports DevExpress.XtraGrid.Registrator - -Namespace LookupGrid - Public Class LookupGridControl - Inherits GridControl - - Protected Overrides Function CreateDefaultView() As BaseView - Return CreateView("LookupGridView") - End Function - Protected Overrides Sub RegisterAvailableViewsCore(ByVal collection As InfoCollection) - MyBase.RegisterAvailableViewsCore(collection) - collection.Add(New LookupGridViewInfoRegistrator()) - End Sub - End Class -End Namespace - diff --git a/DDMonorepo.sln b/DDMonorepo.sln index 23aa92d6..a2324b8e 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -56,8 +56,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GUIs.Test", "GUIs.Test", "{ EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "JobRunner", "Service.JobRunner\JobRunner.vbproj", "{926E6474-5613-4373-BB99-B101158B91EF}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "LookupControlGui", "LookupControlGui\LookupControlGui.vbproj", "{B65E24B3-D334-455D-A0BF-B33B8358B013}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Language", "Modules.Language\Language.vbproj", "{D3C8CFED-D6F6-43A8-9BDF-454145D0352F}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RegexEditor", "Controls.RegexEditor\RegexEditor.vbproj", "{BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}" @@ -194,10 +192,6 @@ Global {926E6474-5613-4373-BB99-B101158B91EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {926E6474-5613-4373-BB99-B101158B91EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {926E6474-5613-4373-BB99-B101158B91EF}.Release|Any CPU.Build.0 = Release|Any CPU - {B65E24B3-D334-455D-A0BF-B33B8358B013}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B65E24B3-D334-455D-A0BF-B33B8358B013}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B65E24B3-D334-455D-A0BF-B33B8358B013}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B65E24B3-D334-455D-A0BF-B33B8358B013}.Release|Any CPU.Build.0 = Release|Any CPU {D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -347,7 +341,6 @@ Global {5EBACBFA-F11A-4BBF-8D02-91461F2293ED} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {7386AB04-DF8D-4DFB-809D-1FAC8212CB7E} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {926E6474-5613-4373-BB99-B101158B91EF} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} - {B65E24B3-D334-455D-A0BF-B33B8358B013} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {D3C8CFED-D6F6-43A8-9BDF-454145D0352F} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {BCC6942F-CD4B-4B67-8200-1C0D002E7CC2} = {F98C0329-C004-417F-B2AB-7466E88D8220} {5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} diff --git a/GUIs.Common/DocumentPropertyMenu/DocumentPropertyMenu.vb b/GUIs.Common/DocumentPropertyMenu/DocumentPropertyMenu.vb index a70784f9..2c2965f9 100644 --- a/GUIs.Common/DocumentPropertyMenu/DocumentPropertyMenu.vb +++ b/GUIs.Common/DocumentPropertyMenu/DocumentPropertyMenu.vb @@ -21,6 +21,9 @@ Public Class DocumentPropertyMenu Public Const COPY_PATH As String = "Dateipfad kopieren" Public Const OPEN_PROPERTIES As String = "Eigenschaften" + Public Event FileOpened As EventHandler(Of String) + Public Event FileClosed As EventHandler(Of String) + Public Sub New(LogConfig As LogConfig, Environment As Environment, Client As Client, FilePath As String, Optional ObjectId As Long = 0) _LogConfig = LogConfig _Logger = LogConfig.GetLogger() @@ -99,7 +102,22 @@ Public Class DocumentPropertyMenu Exit Sub End If - Process.Start(_FilePath) + Using oProc As New Process + Try + oProc.StartInfo.FileName = _FilePath + oProc.EnableRaisingEvents = True + AddHandler oProc.Exited, AddressOf Handle_OpenFile + + oProc.Start(_FilePath) + RaiseEvent FileOpened(Me, _FilePath) + Catch ex As Exception + _Logger.Error(ex) + End Try + End Using + End Sub + + Public Sub Handle_OpenFile(sender As Object, e As EventArgs) + RaiseEvent FileClosed(Me, _FilePath) End Sub Public Sub OpenFolder_Click(sender As Object, e As EventArgs) diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 39c3f8fe..c4fd5b72 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -651,6 +651,9 @@ Public Class frmDocumentResultList For Each oItem In oMenu.GetMenuItems(OperationMode, _DocumentInfo.AccessRight) e.Menu.Items.Add(oItem) Next + + AddHandler oMenu.FileOpened, AddressOf DocumentPropertyMenu_FileOpened + AddHandler oMenu.FileClosed, AddressOf DocumentPropertyMenu_FileClosed End If Catch ex As Exception _Logger.Error(ex) @@ -658,6 +661,14 @@ Public Class frmDocumentResultList End Try End Sub + Public Sub DocumentPropertyMenu_FileOpened(sender As Object, FilePath As String) + + End Sub + + Public Sub DocumentPropertyMenu_FileClosed(sender As Object, FilePath As String) + + End Sub + Public Sub Show_CriticalError(Message As String) labelCriticalError.Visibility = DevExpress.XtraBars.BarItemVisibility.Always diff --git a/GUIs.Test.DocumentViewerTest/Form2.vb b/GUIs.Test.DocumentViewerTest/Form2.vb index 00e756eb..a26a8c94 100644 --- a/GUIs.Test.DocumentViewerTest/Form2.vb +++ b/GUIs.Test.DocumentViewerTest/Form2.vb @@ -23,7 +23,8 @@ Public Class Form3 Logger.Info("DocumentViewer Form Loaded") DocumentViewer1.Init(LogConfig, Key) DocumentViewer1.LoadFile(FilePath) - DocumentViewer1.RightOnlyView(True) + DocumentViewer1.SetViewOnly(True) + DocumentViewer1.SetAllowAnnotations(True) Logger.Info("File Loaded") End Sub diff --git a/GUIs.Test.TestGUI/My Project/Resources.Designer.vb b/GUIs.Test.TestGUI/My Project/Resources.Designer.vb index fa5ddfea..d69a1a29 100644 --- a/GUIs.Test.TestGUI/My Project/Resources.Designer.vb +++ b/GUIs.Test.TestGUI/My Project/Resources.Designer.vb @@ -59,5 +59,15 @@ Namespace My.Resources resourceCulture = value End Set End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property alignhorizontalbottom() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("alignhorizontalbottom", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property End Module End Namespace diff --git a/GUIs.Test.TestGUI/My Project/Resources.resx b/GUIs.Test.TestGUI/My Project/Resources.resx index af7dbebb..efecad5a 100644 --- a/GUIs.Test.TestGUI/My Project/Resources.resx +++ b/GUIs.Test.TestGUI/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,13 @@ 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 + + + ..\Resources\alignhorizontalbottom.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.Test.TestGUI/My Project/licenses.licx b/GUIs.Test.TestGUI/My Project/licenses.licx index 4c066627..f2a4df50 100644 --- a/GUIs.Test.TestGUI/My Project/licenses.licx +++ b/GUIs.Test.TestGUI/My Project/licenses.licx @@ -1,3 +1,4 @@ DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Test.TestGUI/Resources/alignhorizontalbottom.svg b/GUIs.Test.TestGUI/Resources/alignhorizontalbottom.svg new file mode 100644 index 00000000..116256f2 --- /dev/null +++ b/GUIs.Test.TestGUI/Resources/alignhorizontalbottom.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index 729364fc..ca2162e8 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -51,18 +51,10 @@ My Project\app.manifest - - - - - - - - - - False - bin\Debug\DigitalData.Controls.LookupGrid.dll - + + + + ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll @@ -133,11 +125,17 @@ Form - + + frmLookup.vb + + Form - - Form1.vb + + Form + + + frmOld.vb Form @@ -175,8 +173,11 @@ frmFolderWatcher.vb - - Form1.vb + + frmLookup.vb + + + frmOld.vb frmRelations.vb @@ -210,6 +211,10 @@ + + {3dcd6d1a-c830-4241-b7e4-27430e7ea483} + LookupControl + {44982f9b-6116-44e2-85d0-f39650b1ef99} Config @@ -235,5 +240,8 @@ EDMIService + + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmLookup.Designer.vb b/GUIs.Test.TestGUI/frmLookup.Designer.vb new file mode 100644 index 00000000..fe2490f7 --- /dev/null +++ b/GUIs.Test.TestGUI/frmLookup.Designer.vb @@ -0,0 +1,138 @@ + +Partial Class frmLookup + 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() + Dim EditorButtonImageOptions1 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() + Dim SerializableAppearanceObject1 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject2 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject3 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject4 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLookup)) + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.RepositoryItemLookupControl31 = New DigitalData.Controls.LookupGrid.RepositoryItemLookupControl3() + Me.RepositoryItemLookupControl31View = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.LookupControl31 = New DigitalData.Controls.LookupGrid.LookupControl3() + Me.LookupControl31View = New DevExpress.XtraGrid.Views.Grid.GridView() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemLookupControl31, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemLookupControl31View, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LookupControl31.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LookupControl31View, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'GridControl1 + ' + Me.GridControl1.Location = New System.Drawing.Point(12, 12) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemLookupControl31}) + Me.GridControl1.Size = New System.Drawing.Size(400, 200) + Me.GridControl1.TabIndex = 1 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn1}) + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'GridColumn1 + ' + Me.GridColumn1.Caption = "GridColumn1" + Me.GridColumn1.ColumnEdit = Me.RepositoryItemLookupControl31 + Me.GridColumn1.Name = "GridColumn1" + Me.GridColumn1.Visible = True + Me.GridColumn1.VisibleIndex = 0 + ' + 'RepositoryItemLookupControl31 + ' + Me.RepositoryItemLookupControl31.ActionButtonIndex = 1 + Me.RepositoryItemLookupControl31.AllowAddNewValues = False + Me.RepositoryItemLookupControl31.AutoHeight = False + Me.RepositoryItemLookupControl31.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Search, "", 20, True, True, False, EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, "", "openLookupForm", Nothing, DevExpress.Utils.ToolTipAnchor.[Default]), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemLookupControl31.DataSource = Nothing + Me.RepositoryItemLookupControl31.MultiSelect = False + Me.RepositoryItemLookupControl31.Name = "RepositoryItemLookupControl31" + Me.RepositoryItemLookupControl31.PopupView = Me.RepositoryItemLookupControl31View + Me.RepositoryItemLookupControl31.PreventDuplicates = False + Me.RepositoryItemLookupControl31.ReadOnly = False + Me.RepositoryItemLookupControl31.SelectedValues = CType(resources.GetObject("RepositoryItemLookupControl31.SelectedValues"), System.Collections.Generic.List(Of String)) + ' + 'RepositoryItemLookupControl31View + ' + Me.RepositoryItemLookupControl31View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + Me.RepositoryItemLookupControl31View.Name = "RepositoryItemLookupControl31View" + Me.RepositoryItemLookupControl31View.OptionsSelection.EnableAppearanceFocusedCell = False + Me.RepositoryItemLookupControl31View.OptionsView.ShowGroupPanel = False + ' + 'LookupControl31 + ' + Me.LookupControl31.Location = New System.Drawing.Point(539, 55) + Me.LookupControl31.Name = "LookupControl31" + Me.LookupControl31.Properties.AllowAddNewValues = False + Me.LookupControl31.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.LookupControl31.Properties.DataSource = Nothing + Me.LookupControl31.Properties.MultiSelect = False + Me.LookupControl31.Properties.PopupView = Me.LookupControl31View + Me.LookupControl31.Properties.PreventDuplicates = False + Me.LookupControl31.Properties.ReadOnly = False + Me.LookupControl31.Properties.SelectedValues = CType(resources.GetObject("LookupControl31.Properties.SelectedValues"), System.Collections.Generic.List(Of String)) + Me.LookupControl31.Size = New System.Drawing.Size(100, 20) + Me.LookupControl31.TabIndex = 2 + ' + 'LookupControl31View + ' + Me.LookupControl31View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + Me.LookupControl31View.Name = "LookupControl31View" + Me.LookupControl31View.OptionsSelection.EnableAppearanceFocusedCell = False + Me.LookupControl31View.OptionsView.ShowGroupPanel = False + ' + 'frmLookup + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.LookupControl31) + Me.Controls.Add(Me.GridControl1) + Me.Name = "frmLookup" + Me.Text = "Form1" + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemLookupControl31, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemLookupControl31View, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LookupControl31.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LookupControl31View, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents RepositoryItemLookupControl31 As DigitalData.Controls.LookupGrid.RepositoryItemLookupControl3 + Friend WithEvents RepositoryItemLookupControl31View As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents LookupControl31 As DigitalData.Controls.LookupGrid.LookupControl3 + Friend WithEvents LookupControl31View As DevExpress.XtraGrid.Views.Grid.GridView +End Class diff --git a/GUIs.Test.TestGUI/frmLookup.resx b/GUIs.Test.TestGUI/frmLookup.resx new file mode 100644 index 00000000..4f340c6b --- /dev/null +++ b/GUIs.Test.TestGUI/frmLookup.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u + ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u + PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB + AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0 + ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAAAAAAAAAAABEDAAAAAAAAAAs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u + ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u + PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB + AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0 + ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAAAAAAAAAAABEDAAAAAAAAAAs= + + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmLookup.vb b/GUIs.Test.TestGUI/frmLookup.vb new file mode 100644 index 00000000..4902254d --- /dev/null +++ b/GUIs.Test.TestGUI/frmLookup.vb @@ -0,0 +1,35 @@ +Imports DigitalData.Controls.LookupGrid + +Public Class frmLookup + Private _Datasource As List(Of String) = New List(Of String) + + Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load + For index = 1 To 1000000 + _Datasource.Add($"item-{index}") + Next + + LookupControl31.Properties.DataSource = GetDatatable(10) + + Dim oEditor As New LookupControl3 + GridControl1.DataSource = New List(Of String) From {"foo", "var"} + End Sub + + Private Function GetDatatable(Limit As Integer) As DataTable + Dim oDatatable As New DataTable + Dim oColumns As New List(Of DataColumn) From { + New DataColumn("Col1", GetType(String)), + New DataColumn("Col2", GetType(String)) + } + + oDatatable.Columns.AddRange(oColumns.ToArray) + + For Each Item In _Datasource.Take(Limit) + Dim oRow = oDatatable.NewRow() + oRow.Item("Col1") = Item + oRow.Item("Col2") = Item & "_" & "SomeLong Random(String) !!!111einself" + oDatatable.Rows.Add(oRow) + Next + + Return oDatatable + End Function +End Class diff --git a/GUIs.Test.TestGUI/Form1.Designer.vb b/GUIs.Test.TestGUI/frmOld.Designer.vb similarity index 99% rename from GUIs.Test.TestGUI/Form1.Designer.vb rename to GUIs.Test.TestGUI/frmOld.Designer.vb index 6ac95de9..5d8866f6 100644 --- a/GUIs.Test.TestGUI/Form1.Designer.vb +++ b/GUIs.Test.TestGUI/frmOld.Designer.vb @@ -1,5 +1,5 @@  -Partial Class Form1 +Partial Class frmOld Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.Test.TestGUI/Form1.resx b/GUIs.Test.TestGUI/frmOld.resx similarity index 100% rename from GUIs.Test.TestGUI/Form1.resx rename to GUIs.Test.TestGUI/frmOld.resx diff --git a/GUIs.Test.TestGUI/Form1.vb b/GUIs.Test.TestGUI/frmOld.vb similarity index 99% rename from GUIs.Test.TestGUI/Form1.vb rename to GUIs.Test.TestGUI/frmOld.vb index dc815368..e3d6b428 100644 --- a/GUIs.Test.TestGUI/Form1.vb +++ b/GUIs.Test.TestGUI/frmOld.vb @@ -4,7 +4,7 @@ Imports System.ComponentModel Imports DigitalData.Controls.LookupGrid Imports DevExpress.XtraEditors -Public Class Form1 +Public Class frmOld Dim MyLogger As LogConfig Dim Logger As Logger diff --git a/GUIs.Test.TestGUI/frmStart.Designer.vb b/GUIs.Test.TestGUI/frmStart.Designer.vb index b5fac931..b6b73b38 100644 --- a/GUIs.Test.TestGUI/frmStart.Designer.vb +++ b/GUIs.Test.TestGUI/frmStart.Designer.vb @@ -23,6 +23,7 @@ Partial Class frmStart Private Sub InitializeComponent() Me.Button1 = New System.Windows.Forms.Button() + Me.Button2 = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'Button1 @@ -34,11 +35,21 @@ Partial Class frmStart Me.Button1.Text = "Relations" Me.Button1.UseVisualStyleBackColor = True ' + 'Button2 + ' + Me.Button2.Location = New System.Drawing.Point(12, 73) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(236, 55) + Me.Button2.TabIndex = 0 + Me.Button2.Text = "Relations" + Me.Button2.UseVisualStyleBackColor = True + ' 'frmStart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.Button1) Me.Name = "frmStart" Me.Text = "frmStart" @@ -47,4 +58,5 @@ Partial Class frmStart End Sub Friend WithEvents Button1 As Button + Friend WithEvents Button2 As Button End Class diff --git a/GUIs.Test.TestGUI/frmStart.vb b/GUIs.Test.TestGUI/frmStart.vb index 5033e556..67685e1b 100644 --- a/GUIs.Test.TestGUI/frmStart.vb +++ b/GUIs.Test.TestGUI/frmStart.vb @@ -2,4 +2,8 @@ Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click frmRelations.Show() End Sub + + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + frmLookup.Show() + End Sub End Class \ No newline at end of file diff --git a/LookupControlGui/LookupControlGui.vbproj b/LookupControlGui/LookupControlGui.vbproj index 7c499cbe..67dddd2e 100644 --- a/LookupControlGui/LookupControlGui.vbproj +++ b/LookupControlGui/LookupControlGui.vbproj @@ -76,11 +76,11 @@ - + Form - - Form1.vb + + frmLookup.vb Form @@ -100,8 +100,8 @@ - - Form1.vb + + frmLookup.vb VbMyResourcesResXFileCodeGenerator diff --git a/LookupControlGui/My Project/Application.Designer.vb b/LookupControlGui/My Project/Application.Designer.vb index 50b0d981..7eb96be9 100644 --- a/LookupControlGui/My Project/Application.Designer.vb +++ b/LookupControlGui/My Project/Application.Designer.vb @@ -32,7 +32,7 @@ Namespace My _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.LookupControlGui.Form1 + Me.MainForm = Global.LookupControlGui.frmLookup End Sub End Class End Namespace diff --git a/LookupControlGui/Form1.Designer.vb b/LookupControlGui/frmLookup.Designer.vb similarity index 99% rename from LookupControlGui/Form1.Designer.vb rename to LookupControlGui/frmLookup.Designer.vb index 0211ca49..12ca51ed 100644 --- a/LookupControlGui/Form1.Designer.vb +++ b/LookupControlGui/frmLookup.Designer.vb @@ -1,5 +1,5 @@  -Partial Class Form1 +Partial Class frmLookup Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -32,7 +32,7 @@ Partial Class Form1 Dim SerializableAppearanceObject6 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Dim SerializableAppearanceObject7 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Dim SerializableAppearanceObject8 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLookup)) Dim EditorButtonImageOptions3 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() Dim SerializableAppearanceObject9 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Dim SerializableAppearanceObject10 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() diff --git a/LookupControlGui/Form1.resx b/LookupControlGui/frmLookup.resx similarity index 100% rename from LookupControlGui/Form1.resx rename to LookupControlGui/frmLookup.resx diff --git a/LookupControlGui/Form1.vb b/LookupControlGui/frmLookup.vb similarity index 98% rename from LookupControlGui/Form1.vb rename to LookupControlGui/frmLookup.vb index fb5b1ebe..800e2449 100644 --- a/LookupControlGui/Form1.vb +++ b/LookupControlGui/frmLookup.vb @@ -1,4 +1,4 @@ -Public Class Form1 +Public Class frmLookup Private _Datasource As New List(Of String) Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load diff --git a/Modules.Interfaces/My Project/AssemblyInfo.vb b/Modules.Interfaces/My Project/AssemblyInfo.vb index 957974e5..14a07d11 100644 --- a/Modules.Interfaces/My Project/AssemblyInfo.vb +++ b/Modules.Interfaces/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +