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/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..2bea6d7 100644 --- a/VB/Helpers/GlyphHelper.vb +++ b/VB/Helpers/GlyphHelper.vb @@ -1,15 +1,12 @@ -Imports Microsoft.VisualBasic -Imports System +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 + 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 Class + End Module End Namespace diff --git a/VB/MainWindow.xaml b/VB/MainWindow.xaml index 6f802d5..cc3ebb6 100644 --- a/VB/MainWindow.xaml +++ b/VB/MainWindow.xaml @@ -1,4 +1,4 @@ - Partial Public Class MainWindow Inherits Window + Public Sub New() InitializeComponent() End Sub 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/View/DocumentView.xaml b/VB/View/DocumentView.xaml index 3334596..37e9351 100644 --- a/VB/View/DocumentView.xaml +++ b/VB/View/DocumentView.xaml @@ -1,4 +1,4 @@ - Partial Public Class DocumentView Inherits UserControl + Public Sub New() InitializeComponent() End Sub diff --git a/VB/View/PanelView.xaml b/VB/View/PanelView.xaml index 9ef3cb0..c78ed14 100644 --- a/VB/View/PanelView.xaml +++ b/VB/View/PanelView.xaml @@ -1,4 +1,4 @@ - Partial Public Class PanelView Inherits UserControl + Public Sub New() InitializeComponent() End Sub diff --git a/VB/ViewModel/DocumentViewModel.vb b/VB/ViewModel/DocumentViewModel.vb index c7b6716..4170254 100644 --- a/VB/ViewModel/DocumentViewModel.vb +++ b/VB/ViewModel/DocumentViewModel.vb @@ -1,63 +1,37 @@ -Imports Microsoft.VisualBasic -Imports System +Imports System Imports System.Collections.Generic Imports System.Linq Imports DevExpress.Xpf.Docking Namespace WpfApplication Public Class DocumentViewModel - Implements IMVVMDockingProperties + Inherits IMVVMDockingProperties Public Sub New(ByVal caption As String, ByVal imagePath As String) - Caption = caption + Me.Caption = caption Glyph = GlyphHelper.GetGlyph(imagePath) Text = String.Format("Document text ({0})", caption) End Sub - Private Property TargetName() As String Implements IMVVMDockingProperties.TargetName - 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 + Private Property IMVVMDockingProperties_TargetName() As String Implements IMVVMDockingProperties.TargetName Get - Return privateCaption + Return "DocumentsGroup" End Get Set(ByVal value As String) - privateCaption = value + Throw New NotImplementedException() End Set + End Property - Private privateGlyph As Object + + Public Property Caption() As String + + 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 End Class diff --git a/VB/ViewModel/MainViewModel.vb b/VB/ViewModel/MainViewModel.vb index 92f52ec..3835049 100644 --- a/VB/ViewModel/MainViewModel.vb +++ b/VB/ViewModel/MainViewModel.vb @@ -1,5 +1,4 @@ -Imports Microsoft.VisualBasic -Imports System +Imports System Imports System.Collections.Generic Imports System.Linq Imports System.Collections.ObjectModel diff --git a/VB/ViewModel/PanelViewModel.vb b/VB/ViewModel/PanelViewModel.vb index 3343321..c84507c 100644 --- a/VB/ViewModel/PanelViewModel.vb +++ b/VB/ViewModel/PanelViewModel.vb @@ -1,5 +1,4 @@ -Imports Microsoft.VisualBasic -Imports System +Imports System Imports System.Collections.Generic Imports System.Linq Imports DevExpress.Xpf.Docking @@ -7,13 +6,13 @@ Imports System.Windows.Media Namespace WpfApplication Public Class PanelViewModel - Implements IMVVMDockingProperties + Inherits IMVVMDockingProperties Public Sub New(ByVal c As Color) _Color = New SolidColorBrush(c) End Sub - Private Property TargetName() As String Implements IMVVMDockingProperties.TargetName + Private Property IMVVMDockingProperties_TargetName() As String Implements IMVVMDockingProperties.TargetName Get Return "DockPanels" End Get diff --git a/VB/WpfApplication.Net5.sln b/VB/WpfApplication.Net5.sln index 41e8bbf..bcc6b12 100644 --- a/VB/WpfApplication.Net5.sln +++ b/VB/WpfApplication.Net5.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 16 VisualStudioVersion = 12.0.30501.0 MinimumVisualStudioVersion = 10.0.40219.1 diff --git a/VB/WpfApplication.Net5.vbproj b/VB/WpfApplication.Net5.vbproj index 85f7d52..22308ab 100644 --- a/VB/WpfApplication.Net5.vbproj +++ b/VB/WpfApplication.Net5.vbproj @@ -1,3 +1,4 @@ + net5.0-windows @@ -12,6 +13,10 @@ x86;AnyCPU false obj*/** + On + Binary + Off + On diff --git a/VB/WpfApplication.sln b/VB/WpfApplication.sln index 5359cee..6d4e706 100644 --- a/VB/WpfApplication.sln +++ b/VB/WpfApplication.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 VisualStudioVersion = 12.0.30501.0 MinimumVisualStudioVersion = 10.0.40219.1 diff --git a/VB/WpfApplication.vbproj b/VB/WpfApplication.vbproj index 4ef2b2d..3fcef62 100644 --- a/VB/WpfApplication.vbproj +++ b/VB/WpfApplication.vbproj @@ -11,13 +11,13 @@ WpfApplication v4.5.2 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} + obj.NetFX On Binary Off On - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} - obj.NetFX x86 @@ -28,6 +28,7 @@ true true prompt + true x86 @@ -37,21 +38,80 @@ false true prompt + true - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + True + C:\DXDlls\21.1.5\DevExpress.Data.v21.1.dll + + + True + C:\DXDlls\21.1.5\DevExpress.Mvvm.v21.1.dll + + + True + C:\DXDlls\21.1.5\DevExpress.Pdf.v21.1.Core.dll + + + True + C:\DXDlls\21.1.5\DevExpress.Office.v21.1.Core.dll + + + True + C:\DXDlls\21.1.5\DevExpress.RichEdit.v21.1.Core.dll + + + True + C:\DXDlls\21.1.5\DevExpress.RichEdit.v21.1.Export.dll + + + True + C:\DXDlls\21.1.5\DevExpress.Printing.v21.1.Core.dll + + + True + + + True + C:\DXDlls\21.1.5\DevExpress.Xpf.CodeView.v21.1.dll + + + True + C:\DXDlls\21.1.5\DevExpress.Data.Desktop.v21.1.dll + + + True + C:\DXDlls\21.1.5\DevExpress.Xpf.Core.v21.1.dll + + + True + C:\DXDlls\21.1.5\DevExpress.Xpf.Docking.v21.1.dll + + + True + C:\DXDlls\21.1.5\DevExpress.Xpf.Layout.v21.1.Core.dll + @@ -119,12 +179,14 @@ True - ResXFileCodeGenerator + VbMyResourcesResXFileCodeGenerator Resources.Designer.vb + My.Resources SettingsSingleFileGenerator Settings.Designer.vb + My @@ -134,12 +196,12 @@ -