Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 DarioS
|
554b1a662e | ||
|
DarioS
|
10a0745449 | ||
|
DarioS
|
1a0eb0cb31 | ||
|
DarioS
|
33176f40fa | ||
|
Emmanuele Sassi
|
bbb6d16483 | ||
|
Emmanuele Sassi
|
57baab72d5 | ||
|
Emmanuele Sassi
|
91d8e8aa1f |
@@ -122,8 +122,6 @@ Public Module ConstIni
|
||||
Public Const K_CLR_MACHSTART As String = "MachStart"
|
||||
Public Const K_CLR_OTHERS As String = "Others"
|
||||
|
||||
Public Const S_MINMAX As String = "MinMax"
|
||||
|
||||
Public Const S_MRUFILES As String = "MruFiles"
|
||||
Public Const S_MRUIMPORTFILES As String = "MruImportFiles"
|
||||
|
||||
|
||||
@@ -1,31 +1,6 @@
|
||||
Public Module ConstMachIni
|
||||
|
||||
Public Const MACH_INI_FILE_NAME As String = "MachData.ini"
|
||||
Public Const GETWALLDATA_FILE_NAME As String = "GetWallData.lua"
|
||||
Public Const GETTS3DATA_FILE_NAME As String = "GetTs3Data.lua"
|
||||
|
||||
Public Const K_NCTYPE As String = "NCType"
|
||||
Public Const K_CONNECTIONSTRING As String = "ConnectionString"
|
||||
|
||||
Public Const S_CHANNELS As String = "Channels"
|
||||
|
||||
Public Const S_PARTPROGRAM As String = "PartProgram"
|
||||
Public Const S_EXTENSION As String = "Extension"
|
||||
|
||||
' Variables della macchina corrente
|
||||
Public Const S_MAINVARIABLES As String = "MainVariables"
|
||||
Public Const S_VARIABLES As String = "Variables"
|
||||
Public Const S_INPUTVARIABLES As String = "InputVariables"
|
||||
Public Const S_OUTPUTVARIABLES As String = "OutputVariables"
|
||||
Public Const S_MDI As String = "MDI"
|
||||
|
||||
Public Const K_BEAM As String = "Beam"
|
||||
Public Const K_WALL As String = "Wall"
|
||||
Public Const K_SCRIPT As String = "Scripts"
|
||||
Public Const K_SETUP As String = "Setup"
|
||||
Public Const K_FLOW As String = "Flow"
|
||||
|
||||
Public Const TS3DATA_FILE As String = "Ts3Data.lua"
|
||||
|
||||
Public Const S_MACHINING As String = "Machining"
|
||||
Public Const K_MACH_INITSCRIPT As String = "InitScript"
|
||||
@@ -36,4 +11,6 @@
|
||||
Public Const K_SPEED_MIN As String = "SpeedMin"
|
||||
Public Const K_SPEED_MAX As String = "SpeedMax"
|
||||
|
||||
Public Const S_MINMAX As String = "MinMax"
|
||||
|
||||
End Module
|
||||
|
||||
@@ -1,118 +0,0 @@
|
||||
<Grid x:Class="HelpPanelV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:PrintApp="clr-namespace:Icarus"
|
||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:Icarus"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
<Grid.Resources>
|
||||
<SolidColorBrush x:Key="HighlightBorder_Color" Color="Red"/>
|
||||
<Thickness x:Key="HighlightBorder_Thickness">5</Thickness>
|
||||
<CornerRadius x:Key="HighlightBorder_CornerRadius">2</CornerRadius>
|
||||
<Thickness x:Key="HighlightBorder_Margin">-2</Thickness>
|
||||
<Style x:Key="Highlight_HelpBorder" TargetType="{x:Type Border}">
|
||||
<Setter Property="BorderBrush" Value="{StaticResource HighlightBorder_Color}"/>
|
||||
<Setter Property="BorderThickness" Value="{StaticResource HighlightBorder_Thickness}"/>
|
||||
<Setter Property="CornerRadius" Value="{StaticResource HighlightBorder_CornerRadius}"/>
|
||||
<Setter Property="Margin" Value="{StaticResource HighlightBorder_Margin}"/>
|
||||
</Style>
|
||||
<Style x:Key="Popup_HelpBorder" TargetType="{x:Type Border}">
|
||||
<Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="CornerRadius" Value="5"/>
|
||||
<Setter Property="Background" Value="White"/>
|
||||
</Style>
|
||||
<Style TargetType="{x:Type Popup}">
|
||||
<Setter Property="AllowsTransparency" Value="True"/>
|
||||
<Setter Property="StaysOpen" Value="True"/>
|
||||
<Setter Property="Placement" Value="Bottom"/>
|
||||
</Style>
|
||||
</Grid.Resources>
|
||||
<Border BorderThickness="{StaticResource WindowBorder_Thickness}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="{StaticResource TitleBarHeight}"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid Style="{StaticResource TopBar_HelpButton}">
|
||||
<Border Visibility="{Binding Icon_Visibility}"
|
||||
Style="{StaticResource Highlight_HelpBorder}">
|
||||
</Border>
|
||||
</Grid>
|
||||
<Grid Grid.Column="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="1"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="2"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="3"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="4"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="5"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="6"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="7"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Grid.Column="8"
|
||||
Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Border Grid.ColumnSpan="9"
|
||||
Visibility="{Binding ProjectManager_Visibility}"
|
||||
Style="{StaticResource Highlight_HelpBorder}">
|
||||
</Border>
|
||||
</Grid>
|
||||
<Grid Grid.Column="2" Width="70"/>
|
||||
<Grid Grid.Column="3"/>
|
||||
<Grid Grid.Column="4">
|
||||
<UniformGrid Rows="1">
|
||||
<Grid Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Style="{StaticResource TopBar_HelpButton}"/>
|
||||
<Grid Style="{StaticResource TopBar_HelpButton}"/>
|
||||
</UniformGrid>
|
||||
</Grid>
|
||||
<Border Grid.Row="1"
|
||||
Grid.ColumnSpan="5"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
Margin="-2,7,0,0"
|
||||
Visibility="{Binding Icon_Visibility}"
|
||||
Style="{StaticResource Popup_HelpBorder}">
|
||||
<PrintApp:Icon_Tooltip/>
|
||||
</Border>
|
||||
<Border Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="5"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
Margin="-2,7,0,0"
|
||||
Visibility="{Binding ProjectManager_Visibility}"
|
||||
Style="{StaticResource Popup_HelpBorder}">
|
||||
<PrintApp:ProjectManager_Tooltip/>
|
||||
</Border>
|
||||
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
@@ -1,3 +0,0 @@
|
||||
Public Class HelpPanelV
|
||||
|
||||
End Class
|
||||
@@ -1,81 +0,0 @@
|
||||
Imports EgtWPFLib5
|
||||
|
||||
Public Class HelpPanelVM
|
||||
Inherits VMBase
|
||||
|
||||
Public Enum HelpPages As Integer
|
||||
NULL = 0
|
||||
ICON = 1
|
||||
PROJECTMANAGER = 2
|
||||
End Enum
|
||||
|
||||
Private m_CurrHelpPage As HelpPages
|
||||
Public ReadOnly Property CurrHelpPage As HelpPages
|
||||
Get
|
||||
Return m_CurrHelpPage
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_Icon_Visibility As Boolean = False
|
||||
Public ReadOnly Property Icon_Visibility As Visibility
|
||||
Get
|
||||
Return If(m_Icon_Visibility, Visibility.Visible, Visibility.Collapsed)
|
||||
End Get
|
||||
End Property
|
||||
Public Property Icon_IsOpen As Boolean
|
||||
Get
|
||||
Return m_Icon_Visibility
|
||||
End Get
|
||||
Set(value As Boolean)
|
||||
m_Icon_Visibility = value
|
||||
End Set
|
||||
End Property
|
||||
Friend Sub SetIconVisibility(bValue As Boolean)
|
||||
m_Icon_Visibility = bValue
|
||||
NotifyPropertyChanged(NameOf(Icon_Visibility))
|
||||
NotifyPropertyChanged(NameOf(Icon_IsOpen))
|
||||
End Sub
|
||||
|
||||
Private m_ProjectManager_Visibility As Boolean = False
|
||||
Public ReadOnly Property ProjectManager_Visibility As Visibility
|
||||
Get
|
||||
Return If(m_ProjectManager_Visibility, Visibility.Visible, Visibility.Collapsed)
|
||||
End Get
|
||||
End Property
|
||||
Public Property ProjectManager_IsOpen As Boolean
|
||||
Get
|
||||
Return m_ProjectManager_Visibility
|
||||
End Get
|
||||
Set(value As Boolean)
|
||||
m_ProjectManager_Visibility = value
|
||||
End Set
|
||||
End Property
|
||||
Friend Sub SetProjectManagerVisibility(bValue As Boolean)
|
||||
m_ProjectManager_Visibility = bValue
|
||||
NotifyPropertyChanged(NameOf(ProjectManager_Visibility))
|
||||
NotifyPropertyChanged(NameOf(ProjectManager_IsOpen))
|
||||
End Sub
|
||||
|
||||
Sub New()
|
||||
Map.SetRefHelpPanelVM(Me)
|
||||
End Sub
|
||||
|
||||
Friend Sub SelHelpPage(SelHelpPage As HelpPages)
|
||||
Select Case m_CurrHelpPage
|
||||
Case HelpPages.ICON
|
||||
SetIconVisibility(False)
|
||||
Case HelpPages.PROJECTMANAGER
|
||||
SetProjectManagerVisibility(False)
|
||||
End Select
|
||||
m_CurrHelpPage = SelHelpPage
|
||||
Select Case m_CurrHelpPage
|
||||
Case HelpPages.NULL
|
||||
SetProjectManagerVisibility(False)
|
||||
Case HelpPages.ICON
|
||||
SetIconVisibility(True)
|
||||
Case HelpPages.PROJECTMANAGER
|
||||
SetProjectManagerVisibility(True)
|
||||
End Select
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
@@ -1,12 +0,0 @@
|
||||
<RichTextBox x:Class="Icon_Tooltip"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
BorderThickness="0"
|
||||
Width="200"
|
||||
Margin="5">
|
||||
<FlowDocument>
|
||||
<Paragraph FontSize="20">Icon</Paragraph>
|
||||
<Paragraph FontSize="14">The software logo icon.
|
||||
If clicked opens the AboutBox.</Paragraph>
|
||||
</FlowDocument>
|
||||
</RichTextBox>
|
||||
@@ -1,3 +0,0 @@
|
||||
Public Class Icon_Tooltip
|
||||
|
||||
End Class
|
||||
@@ -1,29 +0,0 @@
|
||||
<RichTextBox x:Class="ProjectManager_Tooltip"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
BorderThickness="0"
|
||||
Width="300"
|
||||
Margin="10">
|
||||
<FlowDocument>
|
||||
<Paragraph FontSize="20">Project Manager</Paragraph>
|
||||
<Paragraph FontSize="14">This space permit to manage the project.
|
||||
The commands available are :</Paragraph>
|
||||
<List>
|
||||
<ListItem>
|
||||
<Paragraph>New</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Open</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Save</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Save As</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Import</Paragraph>
|
||||
</ListItem>
|
||||
</List>
|
||||
</FlowDocument>
|
||||
</RichTextBox>
|
||||
@@ -1,3 +0,0 @@
|
||||
Public Class ProjectManager_Tooltip
|
||||
|
||||
End Class
|
||||
@@ -1,71 +0,0 @@
|
||||
<EgtWPFLib5:EgtMainWindow x:Class="HelpWndV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
|
||||
Title="{Binding Title_Msg}"
|
||||
Icon="/Resources/Icarus.ico"
|
||||
Height="600"
|
||||
Width="800"
|
||||
CloseCommand="{Binding Close_Command, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource Help_Window}">
|
||||
<RichTextBox IsReadOnly="True"
|
||||
IsDocumentEnabled="True">
|
||||
|
||||
<!--<FlowDocumentReader ViewingMode="Page"
|
||||
IsTwoPageViewEnabled="False"
|
||||
IsScrollViewEnabled="False">-->
|
||||
<FlowDocument>
|
||||
<Paragraph FontSize="50"
|
||||
FontWeight="Bold"
|
||||
TextAlignment="Center">
|
||||
Icarus Manual
|
||||
</Paragraph>
|
||||
<List FontSize="14">
|
||||
<ListItem>
|
||||
<Paragraph>
|
||||
<Hyperlink Command="{Binding SoftwareStructure_Command}">
|
||||
Software Structure
|
||||
</Hyperlink>
|
||||
</Paragraph>
|
||||
<List FontSize="14">
|
||||
<ListItem>
|
||||
<Paragraph>
|
||||
<Hyperlink Command="{Binding Icon_Command}">
|
||||
Icon
|
||||
</Hyperlink>
|
||||
</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>
|
||||
<Hyperlink Command="{Binding ProjectManagerBar_Command}">
|
||||
Project Manager Bar
|
||||
</Hyperlink>
|
||||
</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>View Bar</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Status Bar</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Top Panel</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>Slice Manager</Paragraph>
|
||||
</ListItem>
|
||||
</List>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>ListItem 2</Paragraph>
|
||||
</ListItem>
|
||||
<ListItem>
|
||||
<Paragraph>ListItem 3</Paragraph>
|
||||
</ListItem>
|
||||
</List>
|
||||
|
||||
</FlowDocument>
|
||||
</RichTextBox>
|
||||
<!--</FlowDocumentReader>-->
|
||||
|
||||
</EgtWPFLib5:EgtMainWindow>
|
||||
@@ -1,18 +0,0 @@
|
||||
Public Class HelpWndV
|
||||
|
||||
Private WithEvents m_HelpWndVM As HelpWndVM
|
||||
|
||||
Sub New(Owner As Window, HelpWndVM As HelpWndVM)
|
||||
MyBase.New(Owner)
|
||||
' This call is required by the designer.
|
||||
InitializeComponent()
|
||||
Me.DataContext = HelpWndVM
|
||||
' Assegno al riferimento locale al VM il VM preso dal DataContext
|
||||
m_HelpWndVM = HelpWndVM
|
||||
End Sub
|
||||
|
||||
Private Sub CloseWindow(bDialogResult As Boolean) Handles m_HelpWndVM.m_CloseWindow
|
||||
Me.Close()
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
@@ -1,108 +0,0 @@
|
||||
Imports System.Collections.ObjectModel
|
||||
Imports System.Drawing
|
||||
Imports System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip
|
||||
Imports EgtWPFLib5
|
||||
|
||||
Public Class HelpWndVM
|
||||
|
||||
#Region "FIELDS & PROPERTIES"
|
||||
|
||||
Friend Event m_CloseWindow(bDialogResult As Boolean)
|
||||
|
||||
#Region "Messages"
|
||||
|
||||
Public ReadOnly Property Title_Msg As String
|
||||
Get
|
||||
Return "Help"
|
||||
End Get
|
||||
End Property
|
||||
|
||||
#End Region ' Messages
|
||||
|
||||
' Definizione comandi
|
||||
Private m_cmdSoftwareStructure As ICommand
|
||||
Private m_cmdIcon As ICommand
|
||||
Private m_cmdProjectManagerBar As ICommand
|
||||
Private m_cmdClose As ICommand
|
||||
|
||||
#End Region ' FIELDS & PROPERTIES
|
||||
|
||||
Sub New()
|
||||
Map.SetRefHelpWndVM(Me)
|
||||
End Sub
|
||||
|
||||
#Region "COMMANDS"
|
||||
|
||||
#Region "SoftwareStructure"
|
||||
|
||||
Public ReadOnly Property SoftwareStructure_Command As ICommand
|
||||
Get
|
||||
If m_cmdSoftwareStructure Is Nothing Then
|
||||
m_cmdSoftwareStructure = New Command(AddressOf SoftwareStructure)
|
||||
End If
|
||||
Return m_cmdSoftwareStructure
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub SoftwareStructure()
|
||||
|
||||
End Sub
|
||||
|
||||
#End Region ' SoftwareStructure
|
||||
|
||||
#Region "Icon"
|
||||
|
||||
Public ReadOnly Property Icon_Command As ICommand
|
||||
Get
|
||||
If m_cmdIcon Is Nothing Then
|
||||
m_cmdIcon = New Command(AddressOf Icon)
|
||||
End If
|
||||
Return m_cmdIcon
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub Icon()
|
||||
Map.refHelpPanelVM.SelHelpPage(HelpPanelVM.HelpPages.ICON)
|
||||
End Sub
|
||||
|
||||
#End Region ' Icon
|
||||
|
||||
#Region "ProjectManagerBar"
|
||||
|
||||
Public ReadOnly Property ProjectManagerBar_Command As ICommand
|
||||
Get
|
||||
If m_cmdProjectManagerBar Is Nothing Then
|
||||
m_cmdProjectManagerBar = New Command(AddressOf ProjectManagerBar)
|
||||
End If
|
||||
Return m_cmdProjectManagerBar
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub ProjectManagerBar()
|
||||
Map.refHelpPanelVM.SelHelpPage(HelpPanelVM.HelpPages.PROJECTMANAGER)
|
||||
End Sub
|
||||
|
||||
#End Region ' ProjectManagerBar
|
||||
|
||||
#Region "Close"
|
||||
|
||||
Public ReadOnly Property Close_Command As ICommand
|
||||
Get
|
||||
If m_cmdClose Is Nothing Then
|
||||
m_cmdClose = New Command(AddressOf Close)
|
||||
End If
|
||||
Return m_cmdClose
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub Close()
|
||||
Map.refHelpPanelVM.SelHelpPage(HelpPanelVM.HelpPages.NULL)
|
||||
Map.SetRefHelpWndVM(Nothing)
|
||||
RaiseEvent m_CloseWindow(True)
|
||||
End Sub
|
||||
|
||||
#End Region ' Close
|
||||
|
||||
#End Region ' COMMANDS
|
||||
|
||||
End Class
|
||||
@@ -158,20 +158,6 @@
|
||||
<DependentUpon>FilledSolidParamPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FilledSolidParamPanel\FilledSolidParamPanelVM.vb" />
|
||||
<Compile Include="HelpPanel\HelpPanelV.xaml.vb">
|
||||
<DependentUpon>HelpPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HelpPanel\HelpPanelVM.vb" />
|
||||
<Compile Include="HelpPanel\Icon_Tooltip.xaml.vb">
|
||||
<DependentUpon>Icon_Tooltip.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HelpPanel\ProjectManager_Tooltip.xaml.vb">
|
||||
<DependentUpon>ProjectManager_Tooltip.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HelpWnd\HelpWndV.xaml.vb">
|
||||
<DependentUpon>HelpWndV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HelpWnd\HelpWndVM.vb" />
|
||||
<Compile Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml.vb">
|
||||
<DependentUpon>ImportExportMachiningPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
@@ -384,22 +370,6 @@
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="HelpPanel\HelpPanelV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="HelpPanel\Icon_Tooltip.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="HelpPanel\ProjectManager_Tooltip.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="HelpWnd\HelpWndV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>XamlIntelliSenseFileGenerator</Generator>
|
||||
|
||||
@@ -749,7 +749,7 @@ Public Class NumericMachiningParam
|
||||
MyBase.New(Type, Cathegory)
|
||||
' leggo ed imposto eventuali min e max
|
||||
Dim sMinMax As String = ""
|
||||
If GetMainPrivateProfileString(S_MINMAX, Type, "", sMinMax) > 0 Then
|
||||
If GetPrivateProfileString(S_MINMAX, Type, "", sMinMax, CurrentMachine.sMachIniFile) > 0 Then
|
||||
Dim sMinMaxValues() As String = sMinMax.Split(","c)
|
||||
Dim dMin As Double = 0
|
||||
Dim dMax As Double = 0
|
||||
|
||||
@@ -70,5 +70,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.5.4.1")>
|
||||
<Assembly: AssemblyFileVersion("2.5.4.1")>
|
||||
<Assembly: AssemblyVersion("2.5.4.2")>
|
||||
<Assembly: AssemblyFileVersion("2.5.4.2")>
|
||||
|
||||
@@ -86,12 +86,5 @@
|
||||
<Image Source="/Resources/ProjectManager/Send.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
<Button Command="{Binding Help_Command}"
|
||||
ToolTip="{Binding Help_ToolTip}"
|
||||
Margin="2.5,0,0,0"
|
||||
Style="{StaticResource ProjManager_Button}">
|
||||
<Image Source="/Resources/ProjectManager/Send.png"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
</Button>
|
||||
|
||||
</StackPanel>
|
||||
|
||||
@@ -63,7 +63,6 @@ Public Class ProjManagerVM
|
||||
Private m_cmdExport As ICommand
|
||||
Private m_cmdOptions As ICommand
|
||||
Private m_cmdSendFeedback As ICommand
|
||||
Private m_cmdHelp As ICommand
|
||||
|
||||
|
||||
#Region "ToolTip"
|
||||
@@ -198,7 +197,7 @@ Public Class ProjManagerVM
|
||||
End Sub
|
||||
|
||||
Friend Function OpenProject(sFilePath As String) As Boolean
|
||||
Map.refSceneHostVM.OpenProject(sFilePath)
|
||||
Return Map.refSceneHostVM.OpenProject(sFilePath)
|
||||
End Function
|
||||
|
||||
#End Region ' OpenCommand
|
||||
@@ -386,7 +385,7 @@ Public Class ProjManagerVM
|
||||
Map.refSceneHostVM.SaveProject()
|
||||
End If
|
||||
EgtGetCurrFilePath(sCurrProject)
|
||||
' se modificato, chiedo se si vuole salvare
|
||||
' se modificato, chiedo se si vuole salvare
|
||||
Else
|
||||
If EgtGetModified() Then
|
||||
If MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
|
||||
@@ -484,30 +483,6 @@ Public Class ProjManagerVM
|
||||
|
||||
#End Region ' SendFeedback
|
||||
|
||||
#Region "Help"
|
||||
|
||||
''' <summary>
|
||||
''' Returns a command that do SendFeedback.
|
||||
''' </summary>
|
||||
Public ReadOnly Property Help_Command As ICommand
|
||||
Get
|
||||
If m_cmdHelp Is Nothing Then
|
||||
m_cmdHelp = New Command(AddressOf Help)
|
||||
End If
|
||||
Return m_cmdHelp
|
||||
End Get
|
||||
End Property
|
||||
|
||||
''' <summary>
|
||||
''' Execute the SendFeedback. This method is invoked by the SendFeedbackCommand.
|
||||
''' </summary>
|
||||
Public Sub Help(ByVal param As Object)
|
||||
Dim HelpWnd As New HelpWndV(Application.Current.MainWindow, New HelpWndVM())
|
||||
HelpWnd.Show()
|
||||
End Sub
|
||||
|
||||
#End Region ' Help
|
||||
|
||||
#End Region ' Commands
|
||||
|
||||
End Class
|
||||
|
||||
@@ -15,9 +15,6 @@
|
||||
<EgtWPFLib5:EgtMainWindow.TitlePanel>
|
||||
<PrintApp:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
|
||||
</EgtWPFLib5:EgtMainWindow.TitlePanel>
|
||||
<EgtWPFLib5:EgtMainWindow.HelpPanel>
|
||||
<PrintApp:HelpPanelV DataContext="{StaticResource HelpPanelVM}"/>
|
||||
</EgtWPFLib5:EgtMainWindow.HelpPanel>
|
||||
<EgtWPFLib5:EgtMainWindow.OpacityMask>
|
||||
<SolidColorBrush Color="White" Opacity="{Binding Window_Opacity}"/>
|
||||
</EgtWPFLib5:EgtMainWindow.OpacityMask>
|
||||
@@ -29,4 +26,5 @@
|
||||
<PrintApp:ProjectV DataContext="{StaticResource ProjectVM}"/>
|
||||
|
||||
</DockPanel>
|
||||
|
||||
</EgtWPFLib5:EgtMainWindow>
|
||||
|
||||
@@ -130,7 +130,10 @@ Public Class SecondaryWindowVM
|
||||
Dim sFile As String = Environment.GetCommandLineArgs(1)
|
||||
Dim sExt As String = IO.Path.GetExtension(sFile).ToLower()
|
||||
If String.IsNullOrWhiteSpace(sFile) OrElse String.IsNullOrWhiteSpace(sExt) Then Return False
|
||||
Return OpenStdFile(sFile)
|
||||
Dim bOk As Boolean = OpenStdFile(sFile)
|
||||
m_Window_Opacity = 1
|
||||
NotifyPropertyChanged(NameOf(Window_Opacity))
|
||||
Return bOk
|
||||
End Function
|
||||
|
||||
Friend Function OpenStdFile(sFile As String) As Boolean
|
||||
|
||||
@@ -160,7 +160,7 @@ Public Module CurrentMachine
|
||||
' se non esiste file dati macchina, esco
|
||||
If String.IsNullOrWhiteSpace(m_sMachDataIniFile) Then Return
|
||||
' recupero tipo di slice
|
||||
Dim sExtrusionType As String
|
||||
Dim sExtrusionType As String = S_VERTICAL
|
||||
Dim GeneralCathegory As MachiningCathegory = Map.refTopPanelVM.CurrMachining.CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL)
|
||||
Dim SlicingTypeParam As ComboMachiningParam = GeneralCathegory.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.SLICINGTYPE)
|
||||
Dim SlicingTypeValue As Machining.MPAR_SLICINGTYPE = SlicingTypeParam.SelValue.Id
|
||||
|
||||
+67
-215
@@ -52,7 +52,6 @@
|
||||
<PrintApp:MachineViewPanelVM x:Key="MachineViewPanelVM"/>
|
||||
<!--<PrintApp:ModifyPartPanelVM x:Key="ModifyPartPanelVM"/>-->
|
||||
<PrintApp:ManagePartPanelVM x:Key="ManagePartPanelVM"/>
|
||||
<PrintApp:HelpPanelVM x:Key="HelpPanelVM"/>
|
||||
<!--<EgtBEAMWALL:CALCPanelVM x:Key="CALCPanelVM"/>
|
||||
<EgtBEAMWALL:PartParametersVM x:Key="PartParametersVM"/>
|
||||
<EgtBEAMWALL:LeftPanelVM x:Key="LeftPanelVM"/>
|
||||
@@ -4191,70 +4190,81 @@
|
||||
Background="White">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button Command="{Binding AboutBoxCommand}"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource AboutBox_Button}">
|
||||
<Image Source="{TemplateBinding Icon}"
|
||||
Style="{StaticResource Button_Image}"/>
|
||||
<Image Source="{TemplateBinding Icon}"/>
|
||||
</Button>
|
||||
<ContentPresenter Grid.Column="1"
|
||||
Content="{TemplateBinding TitlePanel}"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="{TemplateBinding ProjectName}"
|
||||
ToolTip="{TemplateBinding ProjectPath}"
|
||||
<Grid Grid.Column="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<ContentPresenter Content="{TemplateBinding TitlePanel}"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock Text="{TemplateBinding ProjectName}"
|
||||
ToolTip="{TemplateBinding ProjectPath}"
|
||||
Grid.Column="1"
|
||||
TextTrimming="CharacterEllipsis"
|
||||
FontSize="14"
|
||||
VerticalAlignment="Center"
|
||||
Background="{StaticResource Icarus_Gray}"
|
||||
Padding="5,2,5,3"
|
||||
Margin="10,0,0,0"
|
||||
Foreground="White"/>
|
||||
<TextBlock x:Name="PART_MoveRectangle"
|
||||
Text="{TemplateBinding Title}"
|
||||
Grid.Column="2"
|
||||
TextTrimming="CharacterEllipsis"
|
||||
HorizontalAlignment="Stretch"
|
||||
FontSize="14"
|
||||
TextAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Width="Auto"
|
||||
Foreground="{StaticResource Icarus_Gray}"
|
||||
Panel.ZIndex="0"/>
|
||||
</Grid>
|
||||
|
||||
<Grid x:Name="WindowControlsGrid"
|
||||
Grid.Column="2"
|
||||
Background="White">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button x:Name="MinimizeButton"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Minimize.png"/>
|
||||
</Button>
|
||||
<Button x:Name="MaximizeButton"
|
||||
Grid.Column="1"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Maximize.png"/>
|
||||
</Button>
|
||||
<Button x:Name="RestoreButton"
|
||||
Grid.Column="1"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}"
|
||||
Visibility="Collapsed">
|
||||
<Image Source="\Resources\Common\Restore.png"/>
|
||||
</Button>
|
||||
<Button x:Name="CloseButton"
|
||||
Grid.Column="2"
|
||||
TextTrimming="CharacterEllipsis"
|
||||
FontSize="14"
|
||||
VerticalAlignment="Center"
|
||||
Background="{StaticResource Icarus_Gray}"
|
||||
Padding="5,2,5,3"
|
||||
Margin="10,0,0,0"
|
||||
Foreground="White"/>
|
||||
<TextBlock x:Name="PART_MoveRectangle"
|
||||
Text="{TemplateBinding Title}"
|
||||
Grid.Column="3"
|
||||
TextTrimming="CharacterEllipsis"
|
||||
HorizontalAlignment="Stretch"
|
||||
FontSize="14"
|
||||
TextAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Width="Auto"
|
||||
Foreground="{StaticResource Icarus_Gray}"
|
||||
Panel.ZIndex="0"/>
|
||||
<Button x:Name="MinimizeButton"
|
||||
Grid.Column="4"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Minimize.png"/>
|
||||
</Button>
|
||||
<Button x:Name="MaximizeButton"
|
||||
Grid.Column="5"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Maximize.png"/>
|
||||
</Button>
|
||||
<Button x:Name="RestoreButton"
|
||||
Grid.Column="5"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource TitleBar_Button}"
|
||||
Visibility="Collapsed">
|
||||
<Image Source="\Resources\Common\Restore.png"/>
|
||||
</Button>
|
||||
<Button x:Name="CloseButton"
|
||||
Grid.Column="6"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Command="{TemplateBinding CloseCommand}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Close.png"/>
|
||||
</Button>
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Command="{TemplateBinding CloseCommand}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Close.png"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</Grid>
|
||||
<Grid x:Name="PART_MainContentGrid"
|
||||
Grid.Row="1"
|
||||
@@ -4319,9 +4329,6 @@
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
x:Name="topLeft" />
|
||||
</Grid>
|
||||
<Grid Panel.ZIndex="20">
|
||||
<ContentPresenter Content="{TemplateBinding HelpPanel}"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="WindowState" Value="Maximized">
|
||||
@@ -4434,150 +4441,6 @@
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="Help_Window" TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
|
||||
<Setter Property="Background" Value="White"/>
|
||||
<Setter Property="BorderBrush" Value="Black"/>
|
||||
<Setter Property="MinHeight" Value="320"/>
|
||||
<Setter Property="MinWidth" Value="480"/>
|
||||
<Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
|
||||
<Setter Property="Title" Value="{Binding Title}"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
|
||||
<Grid Background="Transparent" x:Name="WindowRoot">
|
||||
<Border x:Name="ResizeBorder"
|
||||
BorderBrush="{StaticResource Icarus_Gray}"
|
||||
BorderThickness="{StaticResource WindowBorder_Thickness}">
|
||||
<Grid x:Name="LayoutRoot"
|
||||
Background="{TemplateBinding Background}">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="{StaticResource TitleBarHeight}"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<!--TitleBar-->
|
||||
<Grid x:Name="PART_HeaderBar"
|
||||
Background="White">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button Command="{Binding AboutBoxCommand}"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Style="{StaticResource AboutBox_Button}">
|
||||
<Image Source="{TemplateBinding Icon}"/>
|
||||
</Button>
|
||||
<Grid Grid.Column="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock x:Name="PART_MoveRectangle"
|
||||
Text="{TemplateBinding Title}"
|
||||
Grid.Column="2"
|
||||
TextTrimming="CharacterEllipsis"
|
||||
HorizontalAlignment="Stretch"
|
||||
FontSize="14"
|
||||
TextAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Width="Auto"
|
||||
Foreground="{StaticResource Icarus_Gray}"
|
||||
Panel.ZIndex="0"/>
|
||||
</Grid>
|
||||
|
||||
<Grid x:Name="WindowControlsGrid"
|
||||
Grid.Column="2"
|
||||
Background="White">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button x:Name="CloseButton"
|
||||
Grid.Column="2"
|
||||
Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
|
||||
Command="{TemplateBinding CloseCommand}"
|
||||
Style="{StaticResource TitleBar_Button}">
|
||||
<Image Source="\Resources\Common\Close.png"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</Grid>
|
||||
<Grid x:Name="PART_MainContentGrid"
|
||||
Grid.Row="1"
|
||||
Panel.ZIndex="10">
|
||||
<ContentPresenter x:Name="PART_MainContentPresenter"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Border>
|
||||
<!-- Resize grid to be inserted here -->
|
||||
<Grid x:Name="PART_ResizeGrid">
|
||||
<Rectangle x:Name="top"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
VerticalAlignment="Top"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"
|
||||
Margin="5,0,5,0" />
|
||||
<Rectangle x:Name="bottom"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
VerticalAlignment="Bottom"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"
|
||||
Margin="5,0,5,0" />
|
||||
<Rectangle x:Name="left"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
HorizontalAlignment="Left"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"
|
||||
Margin="0,5,0,5"/>
|
||||
<Rectangle x:Name="right"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
HorizontalAlignment="Right"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"
|
||||
Margin="0,5,0,5"/>
|
||||
<Rectangle x:Name="bottomLeft"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Bottom"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"/>
|
||||
<Rectangle x:Name="bottomRight"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Bottom"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"/>
|
||||
<Rectangle x:Name="topRight"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
Fill="Transparent"
|
||||
Stroke="{x:Null}"/>
|
||||
<Rectangle
|
||||
Stroke="{x:Null}"
|
||||
Fill="Transparent"
|
||||
HorizontalAlignment="Left"
|
||||
Width="{StaticResource WindowBorder_Height}"
|
||||
VerticalAlignment="Top"
|
||||
Height="{StaticResource WindowBorder_Height}"
|
||||
x:Name="topLeft" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="WindowState" Value="Maximized">
|
||||
<Setter TargetName="ResizeBorder" Property="BorderThickness" Value="0"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
<!--EgtMainWindow-->
|
||||
@@ -4838,17 +4701,6 @@
|
||||
</Style>
|
||||
|
||||
-->
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
<!-- Help -->
|
||||
|
||||
<Style x:Key="TopBar_HelpButton" TargetType="{x:Type Grid}">
|
||||
<Setter Property="Height" Value="30"/>
|
||||
<Setter Property="Width" Value="30"/>
|
||||
</Style>
|
||||
|
||||
|
||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||
|
||||
</ResourceDictionary>
|
||||
|
||||
@@ -35,8 +35,6 @@ Module Map
|
||||
Private m_refManagePartPanelVM As ManagePartPanelVM
|
||||
Private m_refMachineViewPanelVM As MachineViewPanelVM
|
||||
Private m_refImportLoadingWndVM As ImportLoadingWndVM
|
||||
Private m_refHelpPanelVM As HelpPanelVM
|
||||
Private m_refHelpWndVM As HelpWndVM
|
||||
|
||||
#Region "Get"
|
||||
|
||||
@@ -249,18 +247,6 @@ Module Map
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property refHelpPanelVM As HelpPanelVM
|
||||
Get
|
||||
Return m_refHelpPanelVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property refHelpWndVM As HelpWndVM
|
||||
Get
|
||||
Return m_refHelpWndVM
|
||||
End Get
|
||||
End Property
|
||||
|
||||
#End Region ' Get
|
||||
|
||||
#Region "Set"
|
||||
@@ -429,16 +415,6 @@ Module Map
|
||||
Return Not IsNothing(m_refImportLoadingWndVM)
|
||||
End Function
|
||||
|
||||
Friend Function SetRefHelpPanelVM(HelpPanelVM As HelpPanelVM) As Boolean
|
||||
m_refHelpPanelVM = HelpPanelVM
|
||||
Return Not IsNothing(m_refHelpPanelVM)
|
||||
End Function
|
||||
|
||||
Friend Function SetRefHelpWndVM(HelpWndVM As HelpWndVM) As Boolean
|
||||
m_refHelpWndVM = HelpWndVM
|
||||
Return Not IsNothing(m_refHelpWndVM)
|
||||
End Function
|
||||
|
||||
#End Region ' Set
|
||||
|
||||
#Region "Init"
|
||||
|
||||
Reference in New Issue
Block a user