diff --git a/Controls.LookupGrid/LookupControl.vbproj b/Controls.LookupGrid/LookupControl.vbproj
index d7ed49f5..3227fde4 100644
--- a/Controls.LookupGrid/LookupControl.vbproj
+++ b/Controls.LookupGrid/LookupControl.vbproj
@@ -136,6 +136,9 @@
frmLookupGrid.vb
+
+ frmLookupGrid.vb
+
frmLookupGrid.vb
@@ -154,6 +157,7 @@
Strings.en.Designer.vb
My.Resources
+
My.Resources
ResXFileCodeGenerator
diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb
index 86543c94..b0a872ce 100644
--- a/Controls.LookupGrid/LookupControl3.vb
+++ b/Controls.LookupGrid/LookupControl3.vb
@@ -35,34 +35,6 @@ Public Class LookupControl3
Private Sub LookupControl3_EditValueChanging(sender As Object, e As ChangingEventArgs) Handles Me.EditValueChanging
e.Cancel = True
End Sub
-
- Friend WithEvents fProperties As RepositoryItemGridLookUpEdit
- Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView
-
- 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
@@ -79,6 +51,10 @@ Public Class RepositoryItemLookupControl3
UpdateSelectedValues(New List(Of String))
End Sub
+ Private Class S
+ Inherits My.Resources.Strings
+ End Class
+
Private Const NAME_DATATABLE_INTERNAL = "__INTERNAL_DATATABLE__"
Private Const TAG_DROPDOWN = "openDropdown"
Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm"
@@ -188,17 +164,17 @@ Public Class RepositoryItemLookupControl3
If MultiSelect = True Then
Select Case Values.Count
Case 0
- NullText = String.Format(_R.GetString("LookupControl_NoRecords"))
+ NullText = S.LookupControl_NoRecords
Case 1
NullText = Values.FirstOrDefault()
OwnerEdit.EditValue = Values.FirstOrDefault()
Case Else
- NullText = String.Format(_R.GetString("LookupControl_NRecords"), Values.Count)
+ NullText = String.Format(S.LookupControl_NRecords, Values.Count)
End Select
Else
Select Case Values.Count
Case 0
- NullText = String.Format(_R.GetString("LookupControl_NoRecords"))
+ NullText = S.LookupControl_NoRecords
Case Else
NullText = Values.FirstOrDefault()
' JJ at 07.05.2021
@@ -209,7 +185,9 @@ Public Class RepositoryItemLookupControl3
' If No external Datasource is supplied, create one containing the currently selected values
' If the current datasource is the internal one, update it
- If DataSource Is Nothing OrElse (TypeOf DataSource Is DataTable AndAlso DirectCast(DataSource, DataTable).TableName = NAME_DATATABLE_INTERNAL) Then
+ Dim oIsInternalDataTable = TypeOf DataSource Is DataTable AndAlso DirectCast(DataSource, DataTable).TableName = NAME_DATATABLE_INTERNAL
+
+ If DataSource Is Nothing OrElse oIsInternalDataTable Then
Dim oDataTable As New DataTable() With {
.TableName = NAME_DATATABLE_INTERNAL
}
diff --git a/Controls.LookupGrid/My Project/licenses.licx b/Controls.LookupGrid/My Project/licenses.licx
index e69de29b..0321d5c5 100644
--- a/Controls.LookupGrid/My Project/licenses.licx
+++ b/Controls.LookupGrid/My Project/licenses.licx
@@ -0,0 +1,3 @@
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/Controls.LookupGrid/Resources/Strings.fr.resx b/Controls.LookupGrid/Resources/Strings.fr.resx
new file mode 100644
index 00000000..f2fa2a11
--- /dev/null
+++ b/Controls.LookupGrid/Resources/Strings.fr.resx
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ Aucun enregistrement sélectionné
+
+
+ {0} jeux de données sélectionnés
+
+
+ Choisissez une valeur :
+
+
+ Choisissez une ou plusieurs valeurs :
+
+
\ No newline at end of file
diff --git a/Controls.LookupGrid/frmLookupGrid.Designer.vb b/Controls.LookupGrid/frmLookupGrid.Designer.vb
index 848e2eb9..38cf40f2 100644
--- a/Controls.LookupGrid/frmLookupGrid.Designer.vb
+++ b/Controls.LookupGrid/frmLookupGrid.Designer.vb
@@ -36,21 +36,34 @@ Partial Class frmLookupGrid
'gridLookup
'
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.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)
- resources.ApplyResources(Me.Panel1, "Panel1")
Me.Panel1.Name = "Panel1"
'
'btnOK
diff --git a/Controls.LookupGrid/frmLookupGrid.en.resx b/Controls.LookupGrid/frmLookupGrid.en.resx
index 2b9b7341..54e4bc6e 100644
--- a/Controls.LookupGrid/frmLookupGrid.en.resx
+++ b/Controls.LookupGrid/frmLookupGrid.en.resx
@@ -117,12 +117,49 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Clear
+
+
+
+
+
+
+
+
+
+ Default
+
+
+ Top, Left
+
+
+
+
+
+ Tile
+
+
+ Inherit
-
- 390, 293
+
+ 0, 0
+
+
+
+ Center
+
+
+
+
+
+
+ None
+
+
+
+
+
+ Clear
Choose a value:
diff --git a/Controls.LookupGrid/frmLookupGrid.fr.resx b/Controls.LookupGrid/frmLookupGrid.fr.resx
new file mode 100644
index 00000000..cbabf891
--- /dev/null
+++ b/Controls.LookupGrid/frmLookupGrid.fr.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
+
+
+ Videz
+
+
+ Choisissez une valeur :
+
+
\ No newline at end of file
diff --git a/Controls.LookupGrid/frmLookupGrid.resx b/Controls.LookupGrid/frmLookupGrid.resx
index a004d17c..f92af3bb 100644
--- a/Controls.LookupGrid/frmLookupGrid.resx
+++ b/Controls.LookupGrid/frmLookupGrid.resx
@@ -118,132 +118,174 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Fill
-
-
-
- 0, 0
-
-
- 388, 221
-
-
-
- 0
-
-
- gridLookup
-
-
- DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
-
- $this
-
-
- 0
-
-
- 12, 6
-
-
- 117, 23
-
-
- 0
-
-
- OK (F2)
-
-
- btnOK
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- Panel1
+
+ Bottom
0
-
- Top, Right
-
-
- 240, 6
-
-
- 136, 23
-
-
- 0
-
-
- Leeren
-
-
- btnClear
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- Panel1
-
1
-
- Bottom
-
-
- 0, 221
-
-
- 388, 40
-
-
- 1
-
-
- Panel1
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 1
-
-
- True
-
-
- 6, 13
+
+ gridLookup
+
388, 261
-
- 390, 293
-
-
- Wählen Sie einen Wert:
+
+ $this
viewLookup
+
+ Panel1
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ Center
+
+
+ 0
+
+
+ Panel1
+
+
+ Inherit
+
+
+ Leeren
+
DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ 6, 13
+
+
+ 390, 293
+
+
+
+
+
+
+
+
+ Fill
+
+
+ Wählen Sie einen Wert:
+
+
+ Top, Right
+
frmLookupGrid
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+
+ 1
+
+
+ Top, Left
+
+
+ btnOK
+
+
+ Panel1
+
+
+ 1
+
+
+ OK (F2)
+
+
+ 117, 23
+
+
+
+ None
+
+
+ 0
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 388, 40
+
+
+
+
+
+ Tile
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 240, 6
+
+
+
+
+
+
+ Default
+
+
+ 0, 221
+
+
+ 388, 221
+
+
+ 12, 6
+
+
+ 0
+
+
+
+
+
+ btnClear
+
+
+ DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+
+ 0
+
+
+ $this
+
+
+ 136, 23
+
+
+ True
+
+
+ fr
+
\ No newline at end of file