diff --git a/LookupGrid/LookupGrid.Designer.vb b/LookupGrid/Grid.Designer.vb similarity index 96% rename from LookupGrid/LookupGrid.Designer.vb rename to LookupGrid/Grid.Designer.vb index 6c061d3a..ee4a9218 100644 --- a/LookupGrid/LookupGrid.Designer.vb +++ b/LookupGrid/Grid.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class LookupGrid +Partial Class Grid Inherits System.Windows.Forms.UserControl 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -37,7 +37,7 @@ Partial Class LookupGrid ' Me.Button1.Location = New System.Drawing.Point(237, 0) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(56, 20) + Me.Button1.Size = New System.Drawing.Size(37, 20) Me.Button1.TabIndex = 1 Me.Button1.Text = "Button1" Me.Button1.UseVisualStyleBackColor = True diff --git a/LookupGrid/LookupGrid.resx b/LookupGrid/Grid.resx similarity index 100% rename from LookupGrid/LookupGrid.resx rename to LookupGrid/Grid.resx diff --git a/LookupGrid/Grid.vb b/LookupGrid/Grid.vb new file mode 100644 index 00000000..ec3a1a00 --- /dev/null +++ b/LookupGrid/Grid.vb @@ -0,0 +1,8 @@ + +Public Class Grid + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + + End Sub +End Class + + diff --git a/LookupGrid/LookupGridControl.Designer.vb b/LookupGrid/GridControl.Designer.vb similarity index 100% rename from LookupGrid/LookupGridControl.Designer.vb rename to LookupGrid/GridControl.Designer.vb diff --git a/LookupGrid/GridControl.vb b/LookupGrid/GridControl.vb new file mode 100644 index 00000000..9546f07d --- /dev/null +++ b/LookupGrid/GridControl.vb @@ -0,0 +1,17 @@ +Imports DevExpress.XtraGrid +Imports DevExpress.XtraGrid.Views.Base +Imports DevExpress.XtraGrid.Registrator + +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 GridViewInfoRegistrator()) + End Sub +End Class + + diff --git a/LookupGrid/GridHandler.vb b/LookupGrid/GridHandler.vb new file mode 100644 index 00000000..69ac4e82 --- /dev/null +++ b/LookupGrid/GridHandler.vb @@ -0,0 +1,18 @@ +Imports System.Windows.Forms +Imports DevExpress.XtraGrid.Views.Grid + + +Public Class GridHandler + Inherits Handler.GridHandler + + Public Sub New(ByVal gridView As GridView) + MyBase.New(gridView) + End Sub + + Protected Overrides Sub OnKeyDown(ByVal e As KeyEventArgs) + MyBase.OnKeyDown(e) + If e.KeyData = Keys.Delete AndAlso View.State = GridState.Normal Then + View.DeleteRow(View.FocusedRowHandle) + End If + End Sub +End Class diff --git a/LookupGrid/LookupGridRegistration.vb b/LookupGrid/GridRegistration.vb similarity index 75% rename from LookupGrid/LookupGridRegistration.vb rename to LookupGrid/GridRegistration.vb index 15f2ab79..0a9d0021 100644 --- a/LookupGrid/LookupGridRegistration.vb +++ b/LookupGrid/GridRegistration.vb @@ -3,22 +3,20 @@ Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraGrid.Views.Base.Handler Imports DevExpress.XtraGrid.Registrator -Namespace LookupGrid - Public Class MyGridViewInfoRegistrator +Public Class GridViewInfoRegistrator Inherits GridInfoRegistrator Public Overrides ReadOnly Property ViewName() As String Get - Return "LookupGridView" + Return "GridView" End Get End Property Public Overrides Function CreateView(ByVal grid As GridControl) As BaseView Return New LookupGridView(grid) End Function Public Overrides Function CreateHandler(ByVal view As BaseView) As BaseViewHandler - Return New LookupGridHandler(TryCast(view, LookupGridView)) + Return New GridHandler(TryCast(view, LookupGridView)) End Function End Class -End Namespace diff --git a/LookupGrid/LookupGridView.Designer.vb b/LookupGrid/GridView.Designer.vb similarity index 100% rename from LookupGrid/LookupGridView.Designer.vb rename to LookupGrid/GridView.Designer.vb diff --git a/LookupGrid/LookupGridView.vb b/LookupGrid/GridView.vb similarity index 100% rename from LookupGrid/LookupGridView.vb rename to LookupGrid/GridView.vb diff --git a/LookupGrid/LookupGrid.vb b/LookupGrid/LookupGrid.vb deleted file mode 100644 index e76185d5..00000000 --- a/LookupGrid/LookupGrid.vb +++ /dev/null @@ -1,4 +0,0 @@ - -Public Class LookupGrid - -End Class diff --git a/LookupGrid/LookupGrid.vbproj b/LookupGrid/LookupGrid.vbproj index 5533a8e5..6701abdc 100644 --- a/LookupGrid/LookupGrid.vbproj +++ b/LookupGrid/LookupGrid.vbproj @@ -6,8 +6,8 @@ AnyCPU {3DCD6D1A-C830-4241-B7E4-27430E7EA483} Library - LookupGrid - LookupGrid + DigitalData.Controls.LookupGrid + DigitalData.Controls.LookupGrid 512 Windows v4.6.1 @@ -18,7 +18,7 @@ true true bin\Debug\ - LookupGrid.xml + DigitalData.Controls.LookupGrid.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -27,7 +27,7 @@ true true bin\Release\ - LookupGrid.xml + DigitalData.Controls.LookupGrid.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -105,18 +105,18 @@ Form - - LookupGrid.vb + + Grid.vb - + UserControl - - - - LookupGridView.vb + + + + GridView.vb - + Component @@ -134,10 +134,10 @@ Settings.settings True - - LookupGridControl.vb + + GridControl.vb - + Component @@ -145,8 +145,8 @@ frmLookupGrid.vb - - LookupGrid.vb + + Grid.vb diff --git a/LookupGrid/LookupGridControl.vb b/LookupGrid/LookupGridControl.vb deleted file mode 100644 index c2a982bd..00000000 --- a/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 MyGridViewInfoRegistrator()) - End Sub - End Class -End Namespace - diff --git a/LookupGrid/LookupGridHandler.vb b/LookupGrid/LookupGridHandler.vb deleted file mode 100644 index f3757b41..00000000 --- a/LookupGrid/LookupGridHandler.vb +++ /dev/null @@ -1,19 +0,0 @@ -Imports System.Windows.Forms -Imports DevExpress.XtraGrid.Views.Grid - -Namespace LookupGrid - Public Class LookupGridHandler - Inherits Handler.GridHandler - - Public Sub New(ByVal gridView As GridView) - MyBase.New(gridView) - End Sub - - Protected Overrides Sub OnKeyDown(ByVal e As KeyEventArgs) - MyBase.OnKeyDown(e) - If e.KeyData = Keys.Delete AndAlso View.State = GridState.Normal Then - View.DeleteRow(View.FocusedRowHandle) - End If - End Sub - End Class -End Namespace diff --git a/LookupGrid/My Project/Application.Designer.vb b/LookupGrid/My Project/Application.Designer.vb index 88dd01c7..8ab460ba 100644 --- a/LookupGrid/My Project/Application.Designer.vb +++ b/LookupGrid/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ diff --git a/LookupGrid/My Project/Resources.Designer.vb b/LookupGrid/My Project/Resources.Designer.vb index 6c546ba6..b3e49c5d 100644 --- a/LookupGrid/My Project/Resources.Designer.vb +++ b/LookupGrid/My Project/Resources.Designer.vb @@ -1,60 +1,61 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ + _ Friend Module Resources - + Private resourceMan As Global.System.Resources.ResourceManager - + Private resourceCulture As Global.System.Globalization.CultureInfo - + ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' - _ + _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("LookupGrid.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Controls.LookupGrid.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan End Get End Property - + ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' - _ + _ Friend Property Culture() As Global.System.Globalization.CultureInfo Get Return resourceCulture End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) + Set resourceCulture = value End Set End Property diff --git a/LookupGrid/My Project/Settings.Designer.vb b/LookupGrid/My Project/Settings.Designer.vb index 127f3b1e..b0fbc3f3 100644 --- a/LookupGrid/My Project/Settings.Designer.vb +++ b/LookupGrid/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -13,42 +13,42 @@ Option Explicit On Namespace My - - _ + + _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get @@ -64,9 +64,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.LookupGrid.My.MySettings + Friend ReadOnly Property Settings() As Global.DigitalData.Controls.LookupGrid.My.MySettings Get - Return Global.LookupGrid.My.MySettings.Default + Return Global.DigitalData.Controls.LookupGrid.My.MySettings.Default End Get End Property End Module