diff --git a/Readme.md b/Readme.md index a14ea49..db4243e 100644 --- a/Readme.md +++ b/Readme.md @@ -1,5 +1,4 @@ -![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/128643029/11.2.8%2B) [![](https://img.shields.io/badge/Open_in_DevExpress_Support_Center-FF7200?style=flat-square&logo=DevExpress&logoColor=white)](https://supportcenter.devexpress.com/ticket/details/E20026) [![](https://img.shields.io/badge/📖_How_to_use_DevExpress_Examples-e9f6fc?style=flat-square)](https://docs.devexpress.com/GeneralInformation/403183) diff --git a/VB/App.xaml b/VB/App.xaml new file mode 100644 index 0000000..4b13188 --- /dev/null +++ b/VB/App.xaml @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/VB/App.xaml.vb b/VB/App.xaml.vb new file mode 100644 index 0000000..a5c27b4 --- /dev/null +++ b/VB/App.xaml.vb @@ -0,0 +1,12 @@ +Imports System.Windows + +Namespace WpfApplication + + ''' + ''' Interaction logic for App.xaml + ''' + Public Partial Class App + Inherits Application + + End Class +End Namespace diff --git a/VB/Application.xaml b/VB/Application.xaml index 4b13188..71e0f86 100644 --- a/VB/Application.xaml +++ b/VB/Application.xaml @@ -1,4 +1,4 @@ - Partial Public Class App Inherits Application + End Class End Namespace diff --git a/VB/Helpers/GlyphHelper.vb b/VB/Helpers/GlyphHelper.vb index 29ce50e..635a223 100644 --- a/VB/Helpers/GlyphHelper.vb +++ b/VB/Helpers/GlyphHelper.vb @@ -1,15 +1,11 @@ -Imports Microsoft.VisualBasic -Imports System -Imports System.Collections.Generic -Imports System.Linq Imports System.Windows.Media.Imaging Namespace WpfApplication - Friend NotInheritable Class GlyphHelper - Private Sub New() - End Sub - Public Shared Function GetGlyph(ByVal path As String) As BitmapImage - Return New BitmapImage(DevExpress.Utils.AssemblyHelper.GetResourceUri(GetType(GlyphHelper).Assembly, path)) - End Function - End Class + + Friend Module GlyphHelper + + Public Function GetGlyph(ByVal path As String) As BitmapImage + Return New BitmapImage(DevExpress.Utils.AssemblyHelper.GetResourceUri(GetType(GlyphHelper).Assembly, path)) + End Function + End Module End Namespace diff --git a/VB/MainWindow.xaml.vb b/VB/MainWindow.xaml.vb index c07ef22..1a844e1 100644 --- a/VB/MainWindow.xaml.vb +++ b/VB/MainWindow.xaml.vb @@ -1,28 +1,17 @@ -Imports Microsoft.VisualBasic -Imports System -Imports System.Collections.Generic -Imports System.Linq -Imports System.Text Imports System.Windows Imports System.Windows.Controls -Imports System.Windows.Data -Imports System.Windows.Documents -Imports System.Windows.Input -Imports System.Windows.Media -Imports System.Windows.Media.Imaging -Imports System.Windows.Navigation -Imports System.Windows.Shapes Imports DevExpress.Xpf.Docking -Imports System.Collections.ObjectModel Namespace WpfApplication - ''' - ''' Interaction logic for MainWindow.xaml - ''' - Partial Public Class MainWindow - Inherits Window - Public Sub New() - InitializeComponent() - End Sub - End Class -End Namespace \ No newline at end of file + + ''' + ''' Interaction logic for MainWindow.xaml + ''' + Public Partial Class MainWindow + Inherits Window + + Public Sub New() + InitializeComponent() + End Sub + End Class +End Namespace diff --git a/VB/My Project/AssemblyInfo.vb b/VB/My Project/AssemblyInfo.vb index 6459250..6066ec4 100644 --- a/VB/My Project/AssemblyInfo.vb +++ b/VB/My Project/AssemblyInfo.vb @@ -1,5 +1,4 @@ -Imports Microsoft.VisualBasic -Imports System.Reflection +Imports System.Reflection Imports System.Resources Imports System.Runtime.CompilerServices Imports System.Runtime.InteropServices @@ -32,10 +31,6 @@ Imports System.Windows '[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - '(used if a resource is not found in the page, - ' or application resource dictionaries) - '(used if a resource is not found in the page, - ' app, or any theme specific resource dictionaries) diff --git a/VB/My Project/Resources.Designer.vb b/VB/My Project/Resources.Designer.vb index 37d31bb..6f7246f 100644 --- a/VB/My Project/Resources.Designer.vb +++ b/VB/My Project/Resources.Designer.vb @@ -8,10 +8,7 @@ ' '------------------------------------------------------------------------------ - -Imports Microsoft.VisualBasic -Imports System -Namespace My +Namespace My.Resources ''' @@ -21,25 +18,28 @@ Namespace My ' 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. - _ - Friend Class Resources + + + + Friend Module Resources - Private Shared resourceMan As Global.System.Resources.ResourceManager + Private resourceMan As System.Resources.ResourceManager - Private Shared resourceCulture As Global.System.Globalization.CultureInfo + Private resourceCulture As System.Globalization.CultureInfo - _ - Friend Sub New() - End Sub +' internal Resources() +' { +' } ''' ''' Returns the cached ResourceManager instance used by this class. ''' - _ - Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + + Friend ReadOnly Property ResourceManager() As System.Resources.ResourceManager Get If (resourceMan Is Nothing) Then - Dim temp As New Global.System.Resources.ResourceManager("Resources", GetType(Resources).Assembly) + Dim temp As New System.Resources.ResourceManager("Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan @@ -50,8 +50,8 @@ Namespace My ''' Overrides the current thread's CurrentUICulture property for all ''' resource lookups using this strongly typed resource class. ''' - _ - Friend Shared Property Culture() As Global.System.Globalization.CultureInfo + + Friend Property Culture() As System.Globalization.CultureInfo Get Return resourceCulture End Get @@ -59,5 +59,5 @@ Namespace My resourceCulture = value End Set End Property - End Class + End Module End Namespace diff --git a/VB/My Project/Settings.Designer.vb b/VB/My Project/Settings.Designer.vb index ca564c9..db1ef6f 100644 --- a/VB/My Project/Settings.Designer.vb +++ b/VB/My Project/Settings.Designer.vb @@ -8,17 +8,15 @@ ' '------------------------------------------------------------------------------ - -Imports Microsoft.VisualBasic -Imports System Namespace My - _ + + Friend NotInheritable Partial Class Settings Inherits System.Configuration.ApplicationSettingsBase - Private Shared defaultInstance As Settings = (CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New Settings()), Settings)) + Private Shared defaultInstance As Settings = (CType(System.Configuration.ApplicationSettingsBase.Synchronized(New Settings()), Settings)) Public Shared ReadOnly Property [Default]() As Settings Get diff --git a/VB/Properties/AssemblyInfo.vb b/VB/Properties/AssemblyInfo.vb new file mode 100644 index 0000000..e349cd5 --- /dev/null +++ b/VB/Properties/AssemblyInfo.vb @@ -0,0 +1,44 @@ +Imports System.Reflection +Imports System.Runtime.InteropServices +Imports System.Windows + +' General Information about an assembly is controlled through the following +' set of attributes. Change these attribute values to modify the information +' associated with an assembly. + + + + + + + + +' Setting ComVisible to false makes the types in this assembly not visible +' to COM components. If you need to access a type in this assembly from +' COM, set the ComVisible attribute to true on that type. + +'In order to begin building localizable applications, set +'CultureYouAreCodingWith in your .csproj file +'inside a . For example, if you are using US english +'in your source files, set the to en-US. Then uncomment +'the NeutralResourceLanguage attribute below. Update the "en-US" in +'the line below to match the UICulture setting in the project file. +'[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] +'(used if a resource is not found in the page, +' or application resource dictionaries) +'(used if a resource is not found in the page, +' app, or any theme specific resource dictionaries) + 'where theme specific resource dictionaries are located +'where the generic resource dictionary is located +' Version information for an assembly consists of the following four values: +' +' Major Version +' Minor Version +' Build Number +' Revision +' +' You can specify all the values or you can default the Build and Revision Numbers +' by using the '*' as shown below: +' [assembly: AssemblyVersion("1.0.*")] + + diff --git a/VB/Properties/Resources.Designer.vb b/VB/Properties/Resources.Designer.vb new file mode 100644 index 0000000..0859038 --- /dev/null +++ b/VB/Properties/Resources.Designer.vb @@ -0,0 +1,62 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.235 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ +Namespace WpfApplication.Properties + + ''' + ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' + ' 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. + + + + Friend Class Resources + + Private Shared resourceMan As Global.System.Resources.ResourceManager + + Private Shared resourceCulture As Global.System.Globalization.CultureInfo + + + Friend Sub New() + End Sub + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + + Friend Shared ReadOnly Property ResourceManager As Global.System.Resources.ResourceManager + Get + If(WpfApplication.Properties.Resources.resourceMan Is Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Resources", GetType(WpfApplication.Properties.Resources).Assembly) + WpfApplication.Properties.Resources.resourceMan = temp + End If + + Return WpfApplication.Properties.Resources.resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + + Friend Shared Property Culture As Global.System.Globalization.CultureInfo + Get + Return WpfApplication.Properties.Resources.resourceCulture + End Get + + Set(ByVal value As Global.System.Globalization.CultureInfo) + WpfApplication.Properties.Resources.resourceCulture = value + End Set + End Property + End Class +End Namespace diff --git a/VB/Properties/Resources.resx b/VB/Properties/Resources.resx new file mode 100644 index 0000000..af7dbeb --- /dev/null +++ b/VB/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/VB/Properties/Settings.Designer.vb b/VB/Properties/Settings.Designer.vb new file mode 100644 index 0000000..64ee058 --- /dev/null +++ b/VB/Properties/Settings.Designer.vb @@ -0,0 +1,25 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.235 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ +Namespace WpfApplication.Properties + + + + Friend NotInheritable Partial Class Settings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As WpfApplication.Properties.Settings = CType((Global.System.Configuration.ApplicationSettingsBase.Synchronized(New WpfApplication.Properties.Settings())), WpfApplication.Properties.Settings) + + Public Shared ReadOnly Property [Default] As Settings + Get + Return WpfApplication.Properties.Settings.defaultInstance + End Get + End Property + End Class +End Namespace diff --git a/VB/Properties/Settings.settings b/VB/Properties/Settings.settings new file mode 100644 index 0000000..033d7a5 --- /dev/null +++ b/VB/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/VB/View/DocumentView.xaml.vb b/VB/View/DocumentView.xaml.vb index 31877bf..00e3ec9 100644 --- a/VB/View/DocumentView.xaml.vb +++ b/VB/View/DocumentView.xaml.vb @@ -1,26 +1,15 @@ -Imports Microsoft.VisualBasic -Imports System -Imports System.Collections.Generic -Imports System.Linq -Imports System.Text -Imports System.Windows Imports System.Windows.Controls -Imports System.Windows.Data -Imports System.Windows.Documents -Imports System.Windows.Input -Imports System.Windows.Media -Imports System.Windows.Media.Imaging -Imports System.Windows.Navigation -Imports System.Windows.Shapes Namespace WpfApplication.View - ''' - ''' Interaction logic for DocumentView.xaml - ''' - Partial Public Class DocumentView - Inherits UserControl - Public Sub New() - InitializeComponent() - End Sub - End Class + + ''' + ''' Interaction logic for DocumentView.xaml + ''' + Public Partial Class DocumentView + Inherits UserControl + + Public Sub New() + InitializeComponent() + End Sub + End Class End Namespace diff --git a/VB/View/PanelView.xaml.vb b/VB/View/PanelView.xaml.vb index fd11385..47d96e5 100644 --- a/VB/View/PanelView.xaml.vb +++ b/VB/View/PanelView.xaml.vb @@ -1,26 +1,15 @@ -Imports Microsoft.VisualBasic -Imports System -Imports System.Collections.Generic -Imports System.Linq -Imports System.Text -Imports System.Windows Imports System.Windows.Controls -Imports System.Windows.Data -Imports System.Windows.Documents -Imports System.Windows.Input -Imports System.Windows.Media -Imports System.Windows.Media.Imaging -Imports System.Windows.Navigation -Imports System.Windows.Shapes Namespace WpfApplication.View - ''' - ''' Interaction logic for PanelView.xaml - ''' - Partial Public Class PanelView - Inherits UserControl - Public Sub New() - InitializeComponent() - End Sub - End Class + + ''' + ''' Interaction logic for PanelView.xaml + ''' + Public Partial Class PanelView + Inherits UserControl + + Public Sub New() + InitializeComponent() + End Sub + End Class End Namespace diff --git a/VB/ViewModel/DocumentViewModel.vb b/VB/ViewModel/DocumentViewModel.vb index c7b6716..ab000a5 100644 --- a/VB/ViewModel/DocumentViewModel.vb +++ b/VB/ViewModel/DocumentViewModel.vb @@ -1,64 +1,31 @@ -Imports Microsoft.VisualBasic Imports System -Imports System.Collections.Generic -Imports System.Linq Imports DevExpress.Xpf.Docking Namespace WpfApplication - Public Class DocumentViewModel - Implements IMVVMDockingProperties + Public Class DocumentViewModel + Inherits IMVVMDockingProperties - Public Sub New(ByVal caption As String, ByVal imagePath As String) - Caption = caption - Glyph = GlyphHelper.GetGlyph(imagePath) - Text = String.Format("Document text ({0})", caption) - End Sub + Public Sub New(ByVal caption As String, ByVal imagePath As String) + Me.Caption = caption + Glyph = GetGlyph(imagePath) + Text = String.Format("Document text ({0})", caption) + End Sub - Private Property TargetName() As String Implements IMVVMDockingProperties.TargetName + Private Property TargetName As String Get Return "DocumentsGroup" End Get + Set(ByVal value As String) Throw New NotImplementedException() End Set - End Property - - - - - Private privateCaption As String - Public Property Caption() As String - Get - Return privateCaption - End Get - Set(ByVal value As String) - privateCaption = value - End Set - End Property - - - Private privateGlyph As Object - Public Property Glyph() As Object - Get - Return privateGlyph - End Get - Set(ByVal value As Object) - privateGlyph = value - End Set - End Property - Private privateText As String - Public Property Text() As String - Get - Return privateText - End Get - Set(ByVal value As String) - privateText = value - End Set - End Property + Public Property Caption As String + Public Property Glyph As Object - End Class + Public Property Text As String + End Class End Namespace diff --git a/VB/ViewModel/MainViewModel.vb b/VB/ViewModel/MainViewModel.vb index 92f52ec..9d38c41 100644 --- a/VB/ViewModel/MainViewModel.vb +++ b/VB/ViewModel/MainViewModel.vb @@ -1,39 +1,30 @@ -Imports Microsoft.VisualBasic -Imports System -Imports System.Collections.Generic -Imports System.Linq Imports System.Collections.ObjectModel Imports DevExpress.Xpf.Docking Imports System.Windows.Media Namespace WpfApplication - Public Class MainViewModel - Public Sub New() - ChildViews.Add(New DocumentViewModel("Document1", "/Images/change.png")) - ChildViews.Add(New DocumentViewModel("Document2", "/Images/create.png")) - ChildViews.Add(New DocumentViewModel("Document2", "/Images/new-16x16.png")) - ChildViews.Add(New PanelViewModel(Colors.Red)) - ChildViews.Add(New PanelViewModel(Colors.Blue)) - ChildViews.Add(New PanelViewModel(Colors.Green)) - End Sub - - Private _Children As New ObservableCollection(Of Object)() - - - Public Property ChildViews() As ObservableCollection(Of Object) - Get - Return _Children - End Get - Set(ByVal value As ObservableCollection(Of Object)) - _Children = value - - End Set - End Property - - - - - - End Class -End Namespace \ No newline at end of file + Public Class MainViewModel + + Public Sub New() + ChildViews.Add(New DocumentViewModel("Document1", "/Images/change.png")) + ChildViews.Add(New DocumentViewModel("Document2", "/Images/create.png")) + ChildViews.Add(New DocumentViewModel("Document2", "/Images/new-16x16.png")) + ChildViews.Add(New PanelViewModel(Colors.Red)) + ChildViews.Add(New PanelViewModel(Colors.Blue)) + ChildViews.Add(New PanelViewModel(Colors.Green)) + End Sub + + Private _Children As ObservableCollection(Of Object) = New ObservableCollection(Of Object)() + + Public Property ChildViews As ObservableCollection(Of Object) + Get + Return _Children + End Get + + Set(ByVal value As ObservableCollection(Of Object)) + _Children = value + End Set + End Property + End Class +End Namespace diff --git a/VB/ViewModel/PanelViewModel.vb b/VB/ViewModel/PanelViewModel.vb index 3343321..28a993d 100644 --- a/VB/ViewModel/PanelViewModel.vb +++ b/VB/ViewModel/PanelViewModel.vb @@ -1,38 +1,37 @@ -Imports Microsoft.VisualBasic Imports System -Imports System.Collections.Generic -Imports System.Linq Imports DevExpress.Xpf.Docking Imports System.Windows.Media Namespace WpfApplication - Public Class PanelViewModel - Implements IMVVMDockingProperties - - Public Sub New(ByVal c As Color) - _Color = New SolidColorBrush(c) - End Sub - - Private Property TargetName() As String Implements IMVVMDockingProperties.TargetName - Get - Return "DockPanels" - End Get - Set(ByVal value As String) - Throw New NotImplementedException() - End Set - End Property - - ' Fields... - Private _Color As SolidColorBrush - - - Public Property ColorBrush() As SolidColorBrush - Get - Return _Color - End Get - Set(ByVal value As SolidColorBrush) - _Color = value - End Set - End Property - End Class + + Public Class PanelViewModel + Inherits IMVVMDockingProperties + + Public Sub New(ByVal c As Color) + _Color = New SolidColorBrush(c) + End Sub + + Private Property TargetName As String + Get + Return "DockPanels" + End Get + + Set(ByVal value As String) + Throw New NotImplementedException() + End Set + End Property + + ' Fields... + Private _Color As SolidColorBrush + + Public Property ColorBrush As SolidColorBrush + Get + Return _Color + End Get + + Set(ByVal value As SolidColorBrush) + _Color = value + End Set + End Property + End Class End Namespace diff --git a/VB/WpfApplication.Net5.vbproj b/VB/WpfApplication.Net5.vbproj index 85f7d52..d9b8604 100644 --- a/VB/WpfApplication.Net5.vbproj +++ b/VB/WpfApplication.Net5.vbproj @@ -1,5 +1,6 @@ + On net5.0-windows x86 WinExe @@ -11,10 +12,13 @@ true x86;AnyCPU false - obj*/** + false - + + + + diff --git a/VB/WpfApplication.vbproj b/VB/WpfApplication.vbproj index 4ef2b2d..7162557 100644 --- a/VB/WpfApplication.vbproj +++ b/VB/WpfApplication.vbproj @@ -1,22 +1,21 @@  + On Debug x86 8.0.30703 2.0 {A4207FA7-043D-4A66-9577-8C47D19B21C8} WinExe + Properties WpfApplication v4.5.2 - On - Binary - Off - On 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} + 4 obj.NetFX @@ -25,18 +24,18 @@ full false bin\Debug\ - true - true + DEBUG,TRACE prompt + 4 x86 pdbonly true bin\Release\ - false - true + TRACE prompt + 4 @@ -69,7 +68,7 @@ - + MSBuild:Compile Designer @@ -80,8 +79,8 @@ MSBuild:Compile Designer - - Application.xaml + + App.xaml Code @@ -105,28 +104,29 @@ - + Code - + True True Resources.resx - + True Settings.settings True - + ResXFileCodeGenerator Resources.Designer.vb + WpfApplication.Properties - + SettingsSingleFileGenerator Settings.Designer.vb - + @@ -134,7 +134,7 @@ -