- cambiato nome da FiveLakesUI a PluginUI
This commit is contained in:
@@ -104,10 +104,10 @@
|
||||
<DependentUpon>DoorListPageV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DoorListPage\DoorListPageVM.vb" />
|
||||
<Compile Include="FiveLakesUI.xaml.vb">
|
||||
<DependentUpon>FiveLakesUI.xaml</DependentUpon>
|
||||
<Compile Include="PluginUI\PluginUIV.xaml.vb">
|
||||
<DependentUpon>PluginUIV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FiveLakesUIVM.vb" />
|
||||
<Compile Include="PluginUI\PluginUIVM.vb" />
|
||||
<Compile Include="LUA\LuaManager.vb" />
|
||||
<Compile Include="LUA\Lua_Aux.vb" />
|
||||
<Compile Include="LUA\Lua_General.vb" />
|
||||
@@ -163,7 +163,7 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="FiveLakesUI.xaml">
|
||||
<Page Include="PluginUI\PluginUIV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
|
||||
@@ -20,7 +20,7 @@ Public Class MainMenuVM
|
||||
End Property
|
||||
|
||||
Public Sub Page(nPage As Integer)
|
||||
Map.refFiveLakesUIVM.SetSelPage(nPage)
|
||||
Map.refPluginUIVM.SetSelPage(nPage)
|
||||
End Sub
|
||||
|
||||
#End Region ' Page
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
<Grid x:Class="FiveLakesUI"
|
||||
<Grid x:Class="PluginUIV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:Effector.Plugin.FiveLakes"
|
||||
DataContext="{StaticResource FiveLakesUIVM}">
|
||||
DataContext="{StaticResource PluginUIVM}">
|
||||
<TabControl SelectedIndex="{Binding SelPage}"
|
||||
Style="{StaticResource NoHeader_TabControl}">
|
||||
<TabItem Name="DoorList"
|
||||
+2
-2
@@ -3,11 +3,11 @@ Imports Effector.Plugin.Interface
|
||||
|
||||
<Export(GetType(IPluginControl))>
|
||||
<ExportMetadata("Name", "Project")>
|
||||
Public Class FiveLakesUI
|
||||
Public Class PluginUIV
|
||||
Implements IPluginControl
|
||||
|
||||
|
||||
Private m_FiveLakesUIVM As FiveLakesUIVM
|
||||
Private m_FiveLakesUIVM As PluginUIVM
|
||||
|
||||
<ImportingConstructor>
|
||||
Sub New(Host As IHost)
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
Imports Effector.Plugin.Interface
|
||||
Imports Effector.Plugin.Lib
|
||||
|
||||
Public Class FiveLakesUIVM
|
||||
Public Class PluginUIVM
|
||||
Inherits VMBase
|
||||
|
||||
Public Enum Pages As Integer
|
||||
@@ -9,7 +9,7 @@
|
||||
Assign a Key to every Panel ViewModel to use
|
||||
it in xaml file(ProjectView.xaml).
|
||||
-->
|
||||
<local:FiveLakesUIVM x:Key="FiveLakesUIVM"/>
|
||||
<local:PluginUIVM x:Key="PluginUIVM"/>
|
||||
<local:MainMenuVM x:Key="MainMenuVM"/>
|
||||
<local:DoorListPageVM x:Key="DoorListVM"/>
|
||||
<local:MachinePageVM x:Key="MachinePageVM"/>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
Module Map
|
||||
|
||||
Private m_refFiveLakesUIVM As FiveLakesUIVM
|
||||
Private m_refPluginUIVM As PluginUIVM
|
||||
Private m_refDoorListPageVM As DoorListPageVM
|
||||
Private m_refMachinePageVM As MachinePageVM
|
||||
Private m_refSupervisorFunction As IHost
|
||||
@@ -42,9 +42,9 @@ Module Map
|
||||
|
||||
#Region "Get"
|
||||
|
||||
Public ReadOnly Property refFiveLakesUIVM As FiveLakesUIVM
|
||||
Public ReadOnly Property refPluginUIVM As PluginUIVM
|
||||
Get
|
||||
Return m_refFiveLakesUIVM
|
||||
Return m_refPluginUIVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
@@ -451,9 +451,9 @@ Module Map
|
||||
|
||||
#Region "Init"
|
||||
|
||||
Friend Function BeginInit(FiveLakesUIVM As FiveLakesUIVM) As Boolean
|
||||
m_refFiveLakesUIVM = FiveLakesUIVM
|
||||
Return Not IsNothing(m_refFiveLakesUIVM)
|
||||
Friend Function BeginInit(FiveLakesUIVM As PluginUIVM) As Boolean
|
||||
m_refPluginUIVM = FiveLakesUIVM
|
||||
Return Not IsNothing(m_refPluginUIVM)
|
||||
End Function
|
||||
Friend Function EndInit() As Boolean
|
||||
' Verifico se tutti i pezzi necessari sono stati caricati
|
||||
@@ -465,7 +465,7 @@ Module Map
|
||||
' Not IsNothing(m_refNestingTabVM) AndAlso Not IsNothing(m_refSimulTabVM) AndAlso
|
||||
' Not IsNothing(m_refMachiningTabVM) AndAlso
|
||||
' LibMap.EndInit()
|
||||
Return Not IsNothing(m_refFiveLakesUIVM)
|
||||
Return Not IsNothing(m_refPluginUIVM)
|
||||
End Function
|
||||
|
||||
#End Region ' Init
|
||||
|
||||
Reference in New Issue
Block a user