diff --git a/CompoPanel/CompoPanelView.xaml b/CompoPanel/CompoPanelView.xaml index 7eade49..f2b4084 100644 --- a/CompoPanel/CompoPanelView.xaml +++ b/CompoPanel/CompoPanelView.xaml @@ -2,16 +2,22 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - + + + + + + + - + - + + + + diff --git a/ProjectManager/ProjectManagerViewModel.vb b/ProjectManager/ProjectManagerViewModel.vb index bb3839f..ee6cac9 100644 --- a/ProjectManager/ProjectManagerViewModel.vb +++ b/ProjectManager/ProjectManagerViewModel.vb @@ -33,6 +33,7 @@ Public Class ProjectManagerViewModel Private m_CmdLastProject As ICommand Private m_cmdSendFeedback As ICommand Private m_CmdCreateTemplate As ICommand + Private m_cmdGuide As ICommand #Region "ToolTip" @@ -83,6 +84,12 @@ Public Class ProjectManagerViewModel End Get End Property + Public ReadOnly Property GuideToolTip As String + Get + Return "Guide" + End Get + End Property + #End Region ' ToolTip #End Region ' Fields & Properties @@ -346,7 +353,7 @@ Public Class ProjectManagerViewModel OptionsWindow.Height = 550 OptionsWindow.Width = 550 - OptionsWindow.DataContext = New OptionsViewModel(DirectCast(m_rfMainWindowViewModel.DoorParameters.DataContext, DoorParametersViewModel).CurrDoor) + OptionsWindow.DataContext = New OptionsViewModel(m_rfMainWindowViewModel) OptionsWindow.Owner = Application.Current.MainWindow OptionsWindow.ShowDialog() End Sub @@ -549,6 +556,27 @@ Public Class ProjectManagerViewModel #End Region ' CreateTemplate + +#Region "Guide" + Public ReadOnly Property GuideCommand As ICommand + Get + If m_CmdGuide Is Nothing Then + m_cmdGuide = New Command(AddressOf Guide) + End If + Return m_cmdGuide + End Get + End Property + + Public Sub Guide() + Dim rfGuideViewModel As New GuideViewModel + Dim GuideWindow As New GuideView(Application.Current.MainWindow, rfGuideViewModel) + GuideWindow.Height = 700 + GuideWindow.Width = 600 + GuideWindow.Show() + End Sub + +#End Region ' Guide + #End Region ' Commands Public Event PropertyChanged As PropertyChangedEventHandler Implements INotifyPropertyChanged.PropertyChanged