Egalware/OmagCUT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OmagCUT :

Browse Source 
- Cambio tema disponibile nella OptionsPageUC (necessario riavvio programma per applicarlo)
This commit is contained in:
Renzo Lanza
2019-09-20 12:44:53 +00:00
parent b4922b6704
commit 7be2395fc3
192 changed files with 1781 additions and 3702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AboutBoxWD.xaml
+3 -3
View File
@@ -1,12 +1,12 @@
<Window x:Class="AboutBoxWD"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
FontFamily="./Resources/Fonts/#Century Gothic"
FontFamily="{DynamicResource OmagCut_Font}"
Title="AboutBoxWD" Height="469.15" Width="511.8" WindowStyle="None" ResizeMode="NoResize"
AllowsTransparency="True" Background="Transparent" ShowInTaskbar="False">
<!-- Definizione dell'AboutBox -->
<Border Style="{StaticResource OmagCut_WindowBorder}">
<Border Style="{DynamicResource OmagCut_WindowBorder}">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
@@ -51,7 +51,7 @@
<TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="8" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="15" />
<Button Name="ExitBtn" Grid.Column="1" Grid.Row="10" IsCancel="True"
Style="{StaticResource OmagCut_WindowGrayTextButton}" Margin="1,0"/>
Style="{DynamicResource OmagCut_WindowGrayTextButton}" Margin="1,0"/>
</Grid>
AlarmsPageUC.xaml
+63 -64
View File
@@ -8,7 +8,7 @@
d:DesignHeight="768" d:DesignWidth="1280">
<!-- Definizione della AlarmsPage -->
<Border Style="{StaticResource OmagCut_PageBorder}" >
<Border Style="{DynamicResource OmagCut_PageBorder}" >
<Grid>
<Grid.ColumnDefinitions>
@@ -38,7 +38,7 @@
</Grid.RowDefinitions>
<GroupBox Name="SetUpGpBx" Grid.ColumnSpan="3" Grid.RowSpan="9"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid Name="CurrToolsGrid" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
@@ -57,8 +57,8 @@
</Grid.RowDefinitions>
<TextBlock Name="CurrSawTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<ComboBox x:Name="CurrSawCmBx" Grid.Column="1" Grid.Row="1" Style="{StaticResource OmagCut_ComboBox}">
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<ComboBox x:Name="CurrSawCmBx" Grid.Column="1" Grid.Row="1" Style="{DynamicResource OmagCut_ComboBox}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
@@ -67,7 +67,7 @@
</ComboBox>
<TextBlock Name="AuxiliaryToolTxBl" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
Visibility="Hidden"/>
<ComboBox Name="AuxiliaryToolCmBx" Grid.Column="1" Grid.Row="3" Style="{StaticResource OmagCut_ComboBox}" Visibility="Hidden">
<ComboBox.ItemTemplate>
@@ -78,7 +78,7 @@
</ComboBox>
<TextBlock Name="CurrDrillTxBl" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
Visibility="Hidden"/>
<ComboBox Name="CurrDrillCmBx" Grid.Column="1" Grid.Row="3" Style="{StaticResource OmagCut_ComboBox}" Visibility="Hidden">
<ComboBox.ItemTemplate>
@@ -89,7 +89,7 @@
</ComboBox>
<TextBlock Name="CurrMillTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
Visibility="Hidden"/>
<ComboBox Name="CurrMillCmBx" Grid.Column="1" Grid.Row="5" Style="{StaticResource OmagCut_ComboBox}" Visibility="Hidden">
<ComboBox.ItemTemplate>
@@ -100,7 +100,7 @@
</ComboBox>
<Button Name="SetUpBtn" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Visibility="Hidden"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
</Grid>
@@ -109,7 +109,7 @@
</Grid>
<GroupBox Name="HolesGpBx" Grid.Column="2" Grid.Row="0" Grid.RowSpan="2"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid>
<Grid.ColumnDefinitions>
@@ -124,22 +124,22 @@
</Grid.RowDefinitions>
<TextBlock Name="HolesOffsetTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="HolesOffsetTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="HolesOverlapTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="HolesOverlapTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="HolesToleranceTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="HolesToleranceTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="OneHoleInCornerTxBl" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="OneHoleInCornerChBx" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
@@ -147,7 +147,7 @@
</GroupBox>
<GroupBox Name="MaterialsGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="0"
<GroupBox Name="MaterialsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0"
Grid.Row="3" Grid.ColumnSpan="2" Grid.RowSpan="5">
<Grid>
@@ -166,20 +166,20 @@
</ListBox>
<EgtWPFLib:EgtTextBox Name="MatNameTxBx" Grid.Row="1" Width="240" Visibility="Hidden"
Style="{StaticResource OmagCut_KeyboardTextBox}" />
Style="{DynamicResource OmagCut_KeyboardTextBox}" />
<UniformGrid Grid.Row="2" Columns="2">
<Button Name="NewMatBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="RemoveMatBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
</UniformGrid>
</Grid>
</GroupBox>
<GroupBox Name="SawGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="1" Grid.RowSpan="2">
<GroupBox Name="SawGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1" Grid.RowSpan="2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
@@ -193,30 +193,30 @@
</Grid.RowDefinitions>
<TextBlock Name="CutExtraLenTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="CutExtraLenTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="AngleCutExtraLenTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="AngleCutExtraLenTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="ExtArcMinRadTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ExtArcMinRadTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="IntArcMaxSideAngTxBl" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="IntArcMaxSideAngTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
</Grid>
</GroupBox>
<GroupBox Name="MachineParamGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="1" Grid.Row="2">
<GroupBox Name="MachineParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1" Grid.Row="2">
<Grid Grid.Column="2" Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
@@ -224,14 +224,14 @@
</Grid.ColumnDefinitions>
<TextBlock Name="SafeZTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SafeZTxBx" Grid.Column="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
</Grid>
</GroupBox>
<GroupBox Name="MillingsParamGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="2"
<GroupBox Name="MillingsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2"
Grid.Row="2" Grid.RowSpan="2">
<Grid Grid.Column="3" Grid.Row="2">
<Grid.ColumnDefinitions>
@@ -245,30 +245,29 @@
</Grid.RowDefinitions>
<TextBlock Name="CornerCutsTxBl" Grid.Row="0" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="CornerCutsChBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
<TextBlock Name="InternalCutsTxBl" Grid.Row="1" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" Margin="10,0,0,10" VerticalAlignment="Bottom" />
Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,0,10" VerticalAlignment="Bottom" />
<CheckBox Name="InternalCutsChBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
<TextBlock Name="ShortTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ShortTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
</Grid>
</GroupBox>
<GroupBox Name="DirectCutsParamGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="4
">
<GroupBox Name="DirectCutsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="4">
<Grid>
<TextBlock Name="FinalHomeTxBl"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="FinalHomeChBx" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
@@ -276,7 +275,7 @@
</GroupBox>
<GroupBox Name="NestingParamGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="5
<GroupBox Name="NestingParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="5
" Grid.RowSpan="2">
<Grid>
<Grid.ColumnDefinitions>
@@ -289,12 +288,12 @@
</Grid.RowDefinitions>
<TextBlock Name="CompleteCutsTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="CompleteCutsChBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="CompleteCutsChBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
<TextBlock Name="AlignTxBl" Grid.Row="1" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="AlignChBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
@@ -302,7 +301,7 @@
</GroupBox>
<Border Style="{StaticResource OmagCut_NoNameGroupBorder}" Grid.Column="2" Grid.Row="7">
<Border Style="{DynamicResource OmagCut_NoNameGroupBorder}" Grid.Column="2" Grid.Row="7">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
@@ -310,14 +309,14 @@
</Grid.ColumnDefinitions>
<TextBlock Name="AdditionalTableTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
<EgtWPFLib:EgtTextBox Name="AdditionalTableTxBx" Grid.Column="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
</Grid>
</Border>
<GroupBox Name="AutoRawImageParamGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="3" Grid.Row="0" Grid.RowSpan="2">
<GroupBox Name="AutoRawImageParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3" Grid.Row="0" Grid.RowSpan="2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
@@ -337,24 +336,24 @@
</Grid.ColumnDefinitions>
<Button Name="BackImageBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
</Grid>
<TextBlock Name="ThresholdTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ThresholdTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="ToleranceTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ToleranceTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
</Grid>
</GroupBox>
<GroupBox Name="CutFredGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="3"
<GroupBox Name="CutFredGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3"
Grid.Row="2" Grid.RowSpan="1">
<Grid>
<Grid.ColumnDefinitions>
@@ -367,18 +366,18 @@
</Grid.RowDefinitions>
<TextBlock Name="CfrLenTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="CfrLenTxBx" Grid.Column="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="CfrPercTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="CfrPercTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
</Grid>
</GroupBox>
<Border Name="SideAngCutProbeGpBx" Style="{StaticResource OmagCut_NoNameGroupBorder}" Grid.Column="3" Grid.Row="6">
<Border Name="SideAngCutProbeGpBx" Style="{DynamicResource OmagCut_NoNameGroupBorder}" Grid.Column="3" Grid.Row="6">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
@@ -386,14 +385,14 @@
</Grid.ColumnDefinitions>
<TextBlock Name="SideAngCutProbeTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="SideAngCutProbeChBx" Grid.Column="1" Grid.Row="0" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
</Grid>
</Border>
<Border Name="WashingGpBx" Style="{StaticResource OmagCut_NoNameGroupBorder}" Grid.Column="3" Grid.Row="7">
<Border Name="WashingGpBx" Style="{DynamicResource OmagCut_NoNameGroupBorder}" Grid.Column="3" Grid.Row="7">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
@@ -401,7 +400,7 @@
</Grid.ColumnDefinitions>
<TextBlock Name="WashingTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="WashingChBx" Grid.Column="1" Grid.Row="0" Style="{StaticResource OmagCut_CheckBox_Single}"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
</Grid>
@@ -410,8 +409,8 @@
<UniformGrid Columns="4" Grid.Row="8">
<Button x:Name="SawProbingBtn"
Style="{StaticResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="Resources/SawProbe.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="{DynamicResource SawProbeImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</Button>
</UniformGrid>
Application.xaml
-2
View File
@@ -10,9 +10,7 @@
<ResourceDictionary x:Name="ThemeDictionary">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="OmagCUTTestDictionary.xaml"/>
<ResourceDictionary Source="OmagCUTAlternativeDictionary.xaml"/>
<ResourceDictionary Source="OmagCUTDictionary.xaml"/>
<!--<ResourceDictionary Source="OmagCUTClassicDictionary.xaml"/>-->
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
BarCodeWD.xaml
+8 -9
View File
@@ -2,12 +2,12 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
FontFamily="./Resources/Fonts/#Century Gothic"
FontFamily="{DynamicResource OmagCut_Font}"
ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
Title="SaveNameWD" Height="255.9" Width="426.5" ShowInTaskbar="False">
<!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
<Border Style="{StaticResource OmagCut_Border}">
<Border Style="{DynamicResource OmagCut_Border}">
<Grid x:Name="SaveNameGrid">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
@@ -23,9 +23,9 @@
</Grid.RowDefinitions>
<TextBlock Name="BarCodeTxbl" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="BarCodeTxBx" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_KeyboardTextBox}"/>
Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
<Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="3" Grid.RowSpan="1">
<Grid.ColumnDefinitions>
@@ -37,14 +37,13 @@
</Grid.ColumnDefinitions>
<Button Name="OkBtn" Grid.Column="1"
IsDefault="True"
Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="ExitBtn" Grid.Column="3"
IsCancel="True"
Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
CSVPage.xaml
+21 -17
View File
@@ -27,7 +27,7 @@
</Grid.ColumnDefinitions>
<!--Griglia per oscurare i bottoni della pagina sottostante-->
<Grid Background="{StaticResource OmagCut_Gray}">
<Grid Background="{DynamicResource OmagCut_Gray}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -49,7 +49,7 @@
<Label Name="CsvPathTxBl" Grid.Row="1" Background="White" FontSize="16" VerticalAlignment="Center" Padding="2,5,0,5"/>
<TreeView Name="PartsTreeView" Grid.Row="2">
<TreeView Name="PartsTreeView" Grid.Row="2" Background="{DynamicResource OmagCut_TreeViewBackGroundColor}">
<TreeView.Resources>
<!--Modifico HierarchicalDataTemplate del CathegoryItem per poter inserire immagine e testo e per -->
<!--renderlo apribile con un solo click -->
@@ -70,6 +70,7 @@
<!-- multibinding quando sono attivi.-->
<HierarchicalDataTemplate.ItemContainerStyle>
<Style TargetType="{x:Type TreeViewItem}" >
<Setter Property="Foreground" Value="{DynamicResource OmagCut_TreeViewTextColor}" />
<Setter Property="IsSelected" Value="{Binding IsSelected}" />
<Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
<Setter Property="Template">
@@ -90,6 +91,7 @@
<ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</Border>
<ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
<Rectangle Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" VerticalAlignment="Top" Fill="{DynamicResource OmagCut_TreeViewDelimiterColor}" Height="1" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsExpanded" Value="false">
@@ -148,6 +150,7 @@
<!--che si presenta quando la categoria rimane vuota (ombra causata dal multibinding). -->
<TreeView.ItemContainerStyle>
<Style TargetType="{x:Type TreeViewItem}">
<Setter Property="Foreground" Value="{DynamicResource OmagCut_TreeViewTextColor}" />
<Setter Property="IsSelected" Value="{Binding IsSelected}" />
<Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
<Setter Property="Template">
@@ -170,6 +173,7 @@
<ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</Border>
<ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
<Rectangle Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Fill="{DynamicResource OmagCut_TreeViewDelimiterColor}" Height="1" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsExpanded" Value="false">
@@ -214,16 +218,16 @@
</Grid.ColumnDefinitions>
<Button Name="NewBtn" Grid.Column="0"
Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/CsvNew.png" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource CsvNewImg}" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
<Button Name="OpenBtn" Grid.Column="1"
Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/CsvOpen.png" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource CsvOpenImg}" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
<Button Name="RuinedPartsBtn" Grid.Column="2"
Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/CsvRuinedParts.png" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource CsvRuinedPartsImg}" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
</Grid>
@@ -231,7 +235,7 @@
</Grid>
<!--Lower button grid, sfondo grigio per coprire i bottoni della pagina sottostante-->
<Grid Grid.Column="1" Grid.Row="2" Background="{StaticResource OmagCut_Gray}">
<Grid Grid.Column="1" Grid.Row="2" Background="{DynamicResource OmagCut_Gray}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -243,18 +247,18 @@
</Grid.ColumnDefinitions>
<ToggleButton Name="PlusBtn" Grid.Column="0"
Style="{StaticResource OmagCut_YellowIconToggleButton}">
<Image Source="Resources/CsvPlus.png" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
Style="{DynamicResource OmagCut_YellowIconToggleButton}">
<Image Source="{DynamicResource CsvPlusImg}" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
</ToggleButton>
<ToggleButton Name="MinusBtn" Grid.Column="1"
Style="{StaticResource OmagCut_YellowIconToggleButton}">
<Image Source="Resources/CsvMinus.png" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
Style="{DynamicResource OmagCut_YellowIconToggleButton}">
<Image Source="{DynamicResource CsvMinusImg}" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
</ToggleButton>
<Button Name="InsertBtn" Grid.Column="3" Style="{StaticResource OmagCut_YellowTextButton}" />
<Button Name="RemoveBtn" Grid.Column="4" Style="{StaticResource OmagCut_YellowTextButton}" />
<Button Name="InsertBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}" />
<Button Name="RemoveBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowTextButton}" />
<Button Name="OkBtn" Grid.Column="6" Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}" />
<Button Name="OkBtn" Grid.Column="6" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}" />
</Button>
CadCutPageUC.xaml
+9 -9
View File
@@ -29,19 +29,19 @@
<ColumnDefinition Width="7*"/>
</Grid.ColumnDefinitions>
<Button Name="PhotoBtn" Grid.Column="0" Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/Photo.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="RawPartBtn" Grid.Column="1" Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/RawPart.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="DrawBtn" Grid.Column="2" Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/Draw.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="DrawBtn" Grid.Column="2" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource DrawImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="ImportBtn" Grid.Column="3" Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/Import.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="ImportBtn" Grid.Column="3" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource ImportImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="SplitBtn" Grid.Column="4" Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Button Name="SplitBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Name="SplitImage" Width="65" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
CadCutPageUC.xaml.vb
+24 -8
View File
@@ -92,7 +92,11 @@ Public Class CadCutPageUC
DrawBtn.IsEnabled = True
ImportBtn.IsEnabled = True
End If
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Split.png", UriKind.Relative))
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Split.png", UriKind.Relative))
Else
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Split.png", UriKind.Relative))
End If
' Se macchina fotografica abilitata
If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.MAN_PHOTO) Then
PhotoBtn.IsEnabled = True
@@ -192,11 +196,15 @@ Public Class CadCutPageUC
Select Case m_CadCutMode
Case CadCutModes.Nest, CadCutModes.FastGrid
' Passo alla pagina Split
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Nest.png", UriKind.Relative))
If m_CadCutMode = CadCutModes.Nest Then
CadCutPageGrid.Children.Remove(m_NestPage)
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Nest.png", UriKind.Relative))
Else
CadCutPageGrid.Children.Remove(m_FastGridSlabManager)
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Nest.png", UriKind.Relative))
End If
If m_CadCutMode = CadCutModes.Nest Then
CadCutPageGrid.Children.Remove(m_NestPage)
Else
CadCutPageGrid.Children.Remove(m_FastGridSlabManager)
End If
CadCutPageGrid.Children.Add(m_SplitPage)
m_CadCutMode = CadCutModes.Split
@@ -227,10 +235,14 @@ Public Class CadCutPageUC
RemoveVacuumCups()
EgtEnableModified()
' Passo alla pagina Nest
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Split.png", UriKind.Relative))
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Split.png", UriKind.Relative))
Else
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Split.png", UriKind.Relative))
End If
CadCutPageGrid.Children.Remove(m_SplitPage)
If GetPrivateProfileInt(S_FASTGRID, K_FG_ENABLE, 0, m_MainWindow.GetIniFile()) <> 0 And
GetPrivateProfileInt(S_FASTGRID, K_FG_ACTIVE, 0, m_MainWindow.GetIniFile()) <> 0 Then
GetPrivateProfileInt(S_FASTGRID, K_FG_ACTIVE, 0, m_MainWindow.GetIniFile()) <> 0 Then
CadCutPageGrid.Children.Add(m_FastGridSlabManager)
m_CadCutMode = CadCutModes.FastGrid
Else
@@ -241,7 +253,11 @@ Public Class CadCutPageUC
' consentito solo se in spostamento finale pezzi
If Not m_SplitPage.m_bOnAuxTab Then Return
' Passo alla pagina Nest
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Split.png", UriKind.Relative))
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Split.png", UriKind.Relative))
Else
SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Split.png", UriKind.Relative))
End If
CadCutPageGrid.Children.Remove(m_MoveRawPartPage)
CadCutPageGrid.Children.Add(m_NestPage)
m_CadCutMode = CadCutModes.Nest
ChooseColor.xaml
+9 -9
View File
@@ -2,10 +2,10 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
FontFamily="./Resources/Fonts/#Century Gothic"
FontFamily="{DynamicResource OmagCut_Font}"
Title="OpenFile" Height="682.6" Width="682.6" WindowStyle="None" ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" Background="Transparent">
<Border Style="{StaticResource OmagCut_Border}">
<Border Style="{DynamicResource OmagCut_Border}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
@@ -92,19 +92,19 @@
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="RTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="GMsgTxBl" Grid.Column="2" Grid.Row="0"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="GTxBx" Grid.Column="3" Grid.Row="0" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="BMsgTxBl" Grid.Column="4" Grid.Row="0"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="BTxBx" Grid.Column="5" Grid.Row="0" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<Button Name="SelectedColorBtn" Grid.Row="0" Grid.Column="7"
Style="{StaticResource OmagCut_Button}" />
@@ -121,11 +121,11 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Button Name="OkBtn" Grid.Row="0" Grid.Column="1" Style="{StaticResource OmagCut_GradientBlueIconButton}" IsDefault="True" HorizontalAlignment="Center" VerticalAlignment="Center">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="OkBtn" Grid.Row="0" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" HorizontalAlignment="Center" VerticalAlignment="Center">
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="ExitBtn" Grid.Row="0" Grid.Column="3" Style="{StaticResource OmagCut_GradientBlueIconButton}" IsCancel="True" HorizontalAlignment="Center" VerticalAlignment="Center">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="ExitBtn" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True" HorizontalAlignment="Center" VerticalAlignment="Center">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
ChooseMachining.xaml
+9 -9
View File
@@ -1,12 +1,12 @@
<Window x:Class="ChooseMachining"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
FontFamily="./Resources/Fonts/#Century Gothic"
FontFamily="{DynamicResource OmagCut_Font}"
ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
Title="ChooseMachining" Height="255.9" Width="426.5">
<!--Definizione della pagina di scelta della lavorazione corrente-->
<Border Style="{StaticResource OmagCut_Border}">
<Border Style="{DynamicResource OmagCut_Border}">
<Grid Name="ChooseMachiningGrid">
<Grid.ColumnDefinitions>
@@ -34,7 +34,7 @@
</ComboBox>
<TextBlock Name="AuxiliaryMachiningTxBl" Grid.Column="1" Grid.Row="2"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" Visibility="Hidden"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" Visibility="Hidden"/>
<ComboBox Name="AuxiliaryMachiningCmBx" Grid.Column="1" Grid.Row="3" Visibility="Hidden">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -44,7 +44,7 @@
</ComboBox>
<TextBlock Name="CurrDrillingTxBl" Grid.Column="1" Grid.Row="2"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" Visibility="Hidden"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" Visibility="Hidden"/>
<ComboBox Name="CurrDrillingCmBx" Grid.Column="1" Grid.Row="3" Visibility="Hidden">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -54,7 +54,7 @@
</ComboBox>
<TextBlock Name="CurrMillingTxBl" Grid.Column="1" Grid.Row="2"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" Visibility="Hidden"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" Visibility="Hidden"/>
<ComboBox Name="CurrMillingCmBx" Grid.Column="1" Grid.Row="3" Visibility="Hidden">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -72,13 +72,13 @@
<ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions>
<Button Name="OkBtn" Grid.Column="1" Style="{StaticResource OmagCut_GradientBlueIconButton}"
<Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}"
IsCancel="True">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="ExitBtn" Grid.Column="3" Style="{StaticResource OmagCut_GradientBlueIconButton}"
<Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}"
IsCancel="True">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
ChooseToolWD.xaml
+9 -9
View File
@@ -2,10 +2,10 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
FontFamily="./Resources/Fonts/#Century Gothic"
FontFamily="{DynamicResource OmagCut_Font}"
Title="OpenFile" Height="682.6" Width="426.6" WindowStyle="None" ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" Background="Transparent">
<Border Style="{StaticResource OmagCut_Border}">
<Border Style="{DynamicResource OmagCut_Border}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
@@ -21,10 +21,10 @@
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<TextBlock Name="FilePathTxBl" Grid.Column="1" Grid.Row="1"
TextAlignment="Center"
<TextBlock Name="FilePathTxBl" Grid.Column="1" Grid.Row="1" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<!--TextAlignment="Center"
FontSize="20"
VerticalAlignment="Center"/>
VerticalAlignment="Center"-->
<ListBox Name="SetUpToolListBox" Grid.Column="1" Grid.Row="2"
ItemsSource="{Binding ItemList}">
<ListBox.ItemTemplate>
@@ -43,11 +43,11 @@
<ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions>
<Button Name="OkBtn" Grid.Column="1" Style="{StaticResource OmagCut_GradientBlueIconButton}" IsDefault="True">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="ExitBtn" Grid.Column="3" Style="{StaticResource OmagCut_GradientBlueIconButton}" IsCancel="True">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
CompoDimensionUC.xaml
+13 -13
View File
@@ -31,49 +31,49 @@
<TextBlock Name="Label1" Grid.Row="0"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TextBox1" Grid.Column="1" Grid.Row="0" Width="90"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="Label2" Grid.Row="1"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TextBox2" Grid.Column="1" Grid.Row="1" Width="90"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="Label3" Grid.Row="2"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TextBox3" Grid.Column="1" Grid.Row="2" Width="90"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="Label4" Grid.Row="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TextBox4" Grid.Column="1" Grid.Row="3" Width="90"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="Label5" Grid.Row="4"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TextBox5" Grid.Column="1" Grid.Row="4" Width="90"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="Label6" Grid.Row="5"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TextBox6" Grid.Column="1" Grid.Row="5" Width="90"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="Label7" Grid.Row="6"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TextBox7" Grid.Column="1" Grid.Row="6" Width="90"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="Label8" Grid.Row="7"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TextBox8" Grid.Column="1" Grid.Row="7" Width="90"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="Label9" Grid.Row="8"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TextBox9" Grid.Column="1" Grid.Row="8" Width="90"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="Label10" Grid.Row="9"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TextBox10" Grid.Column="1" Grid.Row="9" Width="90"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<Button Name="InternComponentBtn" Grid.Row="11" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="AddBtn" Grid.Row="10" Style="{StaticResource OmagCut_YellowTextButton}"/>
<Button Name="CancelBtn" Grid.Column="1" Grid.Row="10" Style="{StaticResource OmagCut_YellowTextButton}"/>
<Button Name="AddBtn" Grid.Row="10" Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="CancelBtn" Grid.Column="1" Grid.Row="10" Style="{DynamicResource OmagCut_YellowTextButton}"/>
</Grid>
CompoTrfData.xaml
+11 -11
View File
@@ -2,12 +2,12 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
FontFamily="./Resources/Fonts/#Century Gothic"
FontFamily="{DynamicResource OmagCut_Font}"
ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
Title="ChooseMachining" Height="426.5" Width="426.5">
<!--Definizione della pagina di impostazione dati Trf su componenti-->
<Border Style="{StaticResource OmagCut_Border}">
<Border Style="{DynamicResource OmagCut_Border}">
<Grid Name="CompoTrfDataGrid">
<Grid.ColumnDefinitions>
@@ -35,27 +35,27 @@
Style="{StaticResource OmagCut_KeyboardTextBox}"/>
<TextBlock Name="OrdDescTxBl" Grid.Column="1" Grid.Row="2"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
<EgtWPFLib:EgtTextBox Name="OrdDescTxBx" Grid.Column="2" Grid.Row="2"
Style="{StaticResource OmagCut_KeyboardTextBox}"/>
<TextBlock Name="PartCodeTxBl" Grid.Column="1" Grid.Row="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
<EgtWPFLib:EgtTextBox Name="PartCodeTxBx" Grid.Column="2" Grid.Row="3"
Style="{StaticResource OmagCut_KeyboardTextBox}"/>
<TextBlock Name="MatCodeTxBl" Grid.Column="1" Grid.Row="4"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
<EgtWPFLib:EgtTextBox Name="MatCodeTxBx" Grid.Column="2" Grid.Row="4"
Style="{StaticResource OmagCut_KeyboardTextBox}"/>
<TextBlock Name="SurfCodeTxBl" Grid.Column="1" Grid.Row="5"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
<EgtWPFLib:EgtTextBox Name="SurfCodeTxBx" Grid.Column="2" Grid.Row="5"
Style="{StaticResource OmagCut_KeyboardTextBox}"/>
<TextBlock Name="ThicknessTxBl" Grid.Column="1" Grid.Row="6"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
<EgtWPFLib:EgtTextBox Name="ThicknessTxBx" Grid.Column="2" Grid.Row="6"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -68,13 +68,13 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="OkBtn" Grid.Column="1" Style="{StaticResource OmagCut_GradientBlueIconButton}"
<Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}"
IsCancel="True">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="ExitBtn" Grid.Column="3" Style="{StaticResource OmagCut_GradientBlueIconButton}"
<Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}"
IsCancel="True">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
ConstIni.vb
+1
View File
@@ -40,6 +40,7 @@ Module ConstIni
Public Const K_CONTOURFROMCAMERA As String = "ContourFromCamera"
Public Const K_REGISTRATION As String = "Registration"
Public Const K_VIRTUALKEYBOARD As String = "VirtualKeyboard"
Public Const K_THEME As String = "Theme"
Public Const S_LANGUAGES As String = "Languages"
Public Const K_LANGUAGE As String = "Language"
ControlsMachineButtonUC.xaml
+6 -6
View File
@@ -9,37 +9,37 @@
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<Border Style="{StaticResource OmagCut_Page2Border}">
<Border Style="{DynamicResource OmagCut_Page2Border}">
<ItemsControl ItemsSource="{Binding ButtonList}">
<ItemsControl.Resources>
<DataTemplate DataType="{x:Type OmagCUT:TwoStateButton}">
<ToggleButton IsChecked="{Binding IsChecked}"
Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
<Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
</DataTemplate>
<DataTemplate DataType="{x:Type OmagCUT:NoStateButton}">
<Button Command="{Binding ExecuteCommand}"
Style="{StaticResource OmagCut_YellowGradientYellowIconButton}">
Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</DataTemplate>
<DataTemplate DataType="{x:Type OmagCUT:ThreeStateButton}">
<Button Command="{Binding ExecuteCommand}"
Background="{Binding Background}"
Style="{StaticResource OmagCut_MachineCommandsYellowGradientYellowIconButton}">
Style="{DynamicResource OmagCut_MachineCommandsYellowGradientYellowIconButton}">
<Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</DataTemplate>
<DataTemplate DataType="{x:Type OmagCUT:DoubleCommandButton}">
<ToggleButton IsChecked="{Binding IsChecked}"
Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
<Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
</DataTemplate>
<DataTemplate DataType="{x:Type OmagCUT:PressedCommandButton}">
<Button Style="{StaticResource OmagCut_MachineCommandsYellowGradientYellowIconButton}"
<Button Style="{DynamicResource OmagCut_MachineCommandsYellowGradientYellowIconButton}"
PreviewMouseUp="PressedCommandButton_PreviewMouseUp"
PreviewMouseDown="PressedCommandButton_PreviewMouseDown">
<Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
ControlsMachineButtonUC.xaml.vb
+41 -11
View File
@@ -522,17 +522,23 @@ Public Class TwoStateButton
Public ReadOnly Property ImageSource As String
Get
Dim sNewIcons As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
sNewIcons = ""
Else
sNewIcons = "NewIcons\"
End If
' Se variabile di stato "Nothing" o non collegato a CN, imposto immagine fissa
If StateFlag = BTN_STATE_NOTHING Or Not m_MainWindow.m_bNCLink Or IsNothing(FImageName) Or String.IsNullOrWhiteSpace(FImageName) Then
' ritorno immagine dello stato true
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & TImageName
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sNewIcons & TImageName
End If
If m_IsChecked Then
' ritorno immagine dello stato true
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & TImageName
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sNewIcons & TImageName
Else
' ritorno immagine dello stato false
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & FImageName
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sNewIcons & FImageName
End If
End Get
End Property
@@ -555,7 +561,13 @@ Public Class NoStateButton
Public ReadOnly Property ImageSource As String
Get
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & TImageName
Dim sNewIcons As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
sNewIcons = ""
Else
sNewIcons = "NewIcons\"
End If
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sNewIcons & TImageName
End Get
End Property
@@ -614,8 +626,14 @@ Public Class ThreeStateButton
End Property
Public ReadOnly Property ImageSource As String
Get
Dim sNewIcons As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
sNewIcons = ""
Else
sNewIcons = "NewIcons\"
End If
' ritorno immagine dello stato true
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & TImageName
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sNewIcons & TImageName
End Get
End Property
@@ -676,17 +694,23 @@ Public Class DoubleCommandButton
Public ReadOnly Property ImageSource As String
Get
Dim sNewIcons As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
sNewIcons = ""
Else
sNewIcons = "NewIcons\"
End If
' Se variabile di stato "Nothing" o non collegato a CN, imposto immagine fissa
If StateFlag = BTN_STATE_NOTHING Or Not m_MainWindow.m_bNCLink Or IsNothing(FImageName) Or String.IsNullOrWhiteSpace(FImageName) Then
' ritorno immagine dello stato true
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & TImageName
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sNewIcons & TImageName
End If
If m_IsChecked Then
' ritorno immagine dello stato true
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & TImageName
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sNewIcons & TImageName
Else
' ritorno immagine dello stato false
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & FImageName
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sNewIcons & FImageName
End If
End Get
End Property
@@ -712,17 +736,23 @@ Public Class PressedCommandButton
Public ReadOnly Property ImageSource As String
Get
Dim sNewIcons As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
sNewIcons = ""
Else
sNewIcons = "NewIcons\"
End If
' Se variabile di stato "Nothing" o non collegato a CN, imposto immagine fissa
If StateFlag = BTN_STATE_NOTHING Or Not m_MainWindow.m_bNCLink Or IsNothing(FImageName) Or String.IsNullOrWhiteSpace(FImageName) Then
' ritorno immagine dello stato true
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & TImageName
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sNewIcons & TImageName
End If
If m_IsPressed Then
' ritorno immagine dello stato true
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & TImageName
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sNewIcons & TImageName
Else
' ritorno immagine dello stato false
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & FImageName
Return m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sNewIcons & FImageName
End If
End Get
End Property
CopyTemplateUC.xaml
+9 -9
View File
@@ -6,7 +6,7 @@
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">
<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">
<!-- Definizione della Grid SingleCut -->
<Grid Name="SingleCutGrid" >
@@ -35,7 +35,7 @@
</Grid.ColumnDefinitions>
<Button Name="Point1Btn" Grid.Column="0"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
</Grid>
@@ -55,9 +55,9 @@
</Grid.ColumnDefinitions>
<ToggleButton Name="LineBtn" Grid.Column="0"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="ArcBtn" Grid.Column="1"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
</Grid>
@@ -69,16 +69,16 @@
</Grid.ColumnDefinitions>
<Button Name="RemoveBtn" Grid.Column="0" Grid.Row="3" Grid.RowSpan="2"
Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
<Button Name="CloseBtn" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2"
Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
</Grid>
<Button Name="SaveBtn" Grid.Column="0" Grid.Row="10" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
<Button Name="SaveBtn" Grid.Column="0" Grid.Row="10" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
<Button Name="ExitBtn" Grid.Column="2" Grid.Row="10" Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="ExitBtn" Grid.Column="2" Grid.Row="10" Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
CurrentProjectPageUC.xaml
+9 -9
View File
@@ -38,7 +38,7 @@
</Grid.RowDefinitions>
<!-- Definizione della Grid con le caratteristiche del progetto -->
<Border Name="CurrProjGrid" Style="{StaticResource OmagCut_Border}" Grid.Row="0" >
<Border Name="CurrProjGrid" Style="{DynamicResource OmagCut_Border}" Grid.Row="0" >
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -52,20 +52,20 @@
</Grid.RowDefinitions>
<TextBlock Name="MaterialTxBl" Grid.Row="0"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="MaterialTxBx" Grid.Column="1" Grid.Row="0" Width="100"
Style="{StaticResource OmagCut_FixedTextBox}"/>
Style="{DynamicResource OmagCut_FixedTextBox}"/>
<TextBlock Name="HeightTxBl" Grid.Row="1"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="1" Width="100"
Style="{StaticResource OmagCut_FixedTextBox}" TextAlignment="Right"/>
<TextBlock Name="ToolTxBl" Grid.Row="2" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/>
<TextBlock Name="ToolTxBl" Grid.Row="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ToolTxBx" Grid.Column="1" Grid.Row="2" Width="100"
Style="{StaticResource OmagCut_FixedTextBox}"/>
Style="{DynamicResource OmagCut_FixedTextBox}"/>
<TextBlock Name="MachiningTxBl" Grid.Row="3"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="MachiningTxBx" Grid.Column="1" Grid.Row="3" Width="100"
Style="{StaticResource OmagCut_FixedTextBox}"/>
Style="{DynamicResource OmagCut_FixedTextBox}"/>
</Grid>
DirectCutPageUC.xaml
+19 -19
View File
@@ -28,16 +28,16 @@
<ColumnDefinition Width="7*"/>
</Grid.ColumnDefinitions>
<Button Name="PhotoBtn" Grid.Column="0" Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/Photo.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="RawPartBtn" Grid.Column="1" Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/RawPart.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="MachViewModeBtn" Grid.Column="3"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/MHT.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource MHTImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</Button>
</Grid>
@@ -61,19 +61,19 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Button Name="ManualBtn" Grid.Column="2" Grid.Row="0"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="SingleCutBtn" Grid.Row="1"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="MultipleCutBtn" Grid.Row="2"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="GridCutBtn" Grid.Row="3"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="FlatteningCutBtn" Grid.Row="4"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="CopyTemplateBtn" Grid.Row="5"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="SawTestBtn" Grid.Row="6"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
</Grid>
</Grid>
@@ -97,18 +97,18 @@
</Grid.ColumnDefinitions>
<ToggleButton Name="ControlsMachineBtn" Grid.Column="0"
Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<Image Source="Resources/Manual.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
<Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</ToggleButton>
<ToggleButton Name="VacuumMachineBtn" Grid.Column="1"
Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<Image Source="Resources/Manual.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</ToggleButton>
<Button Name="ManualModeBtn" Grid.Column="4"
Style="{StaticResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="Resources/Manual.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
</Button>
</Grid>
DirectCutPageUC.xaml.vb
+4
View File
@@ -190,7 +190,11 @@ Public Class DirectCutPageUC
Private Sub ControlsMachineBtn_Click(sender As Object, e As RoutedEventArgs) Handles ControlsMachineBtn.Click
If ControlsMachineBtn.IsChecked Then
m_ControlsMachineButton = New ControlsMachineButtonUC
m_ControlsMachineButton.SetValue(Grid.RowProperty, 1)
m_NewMachineButtonsType = m_ControlsMachineButton.GetPrivateProfileMachineButtons(S_CONTROLMACHBUTTONS, "Button1", Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, m_MainWindow.GetMachIniFile())
MachineButtonGrid.Children.Add(m_ControlsMachineButton)
'm_ControlsMachineButton = m_ControlsMachineButton 'NotifyPropertyChanged("ButtonList")
If VacuumMachineBtn.IsChecked Then
MachineButtonGrid.Children.Remove(m_VacuumMachineButton)
VacuumMachineBtn.IsChecked = False
DrawPageUC.xaml
+12 -12
View File
@@ -31,9 +31,9 @@
</Grid.ColumnDefinitions>
<ToggleButton Name="SideAngleBtn" Grid.Column="0"
Style="{StaticResource OmagCut_RightGrayYellowTextToggleButton}"/>
Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
<ToggleButton Name="DripCutBtn" Grid.Column="1" Padding="0"
Style="{StaticResource OmagCut_RightGrayYellowTextToggleButton}"/>
Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
</Grid>
@@ -56,7 +56,7 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<ToggleButton Name="DimensionBtn" Grid.Column="0" Style="{StaticResource OmagCut_YellowToggleButton}" Visibility="Collapsed"/>
<ToggleButton Name="DimensionBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowToggleButton}" Visibility="Collapsed"/>
</Grid>
<Grid Name="VariablesGrd" Grid.Row="1" Grid.ColumnSpan="2"/>
@@ -66,8 +66,8 @@
</Grid>
<Button Name="BackBtn" Grid.Column="1" Grid.Row="14"
Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
@@ -102,12 +102,12 @@
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Name="PartNameTxBl" Grid.Column="0" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"
<TextBlock Name="PartNameTxBl" Grid.Column="0" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"
TextAlignment="Right"/>
<EgtWPFLib:EgtTextBox Name="PartNameTxBx" Grid.Column="1" Width="130"
Style="{StaticResource OmagCut_KeyboardTextBox}"/>
<Button Name="TrfDataBtn" Grid.Column="1"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
</Grid>
@@ -120,15 +120,15 @@
<TextBlock Name="PartNumTxBl" Grid.Column="0" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"
TextAlignment="Right"/>
<EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
</Grid>
<Button Name="OkBtn" Grid.Column="3" Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="OkBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="ExitBtn" Grid.Column="4" Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="ExitBtn" Grid.Column="4" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
EditValueWD.xaml
+8 -9
View File
@@ -2,12 +2,12 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
FontFamily="./Resources/Fonts/#Century Gothic"
FontFamily="{DynamicResource OmagCut_Font}"
ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
Title="EditValueWD" Height="255.9" Width="426.5" ShowInTaskbar="False">
<!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
<Border Style="{StaticResource OmagCut_Border}">
<Border Style="{DynamicResource OmagCut_Border}">
<Grid x:Name="SaveNameGrid">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
@@ -23,9 +23,9 @@
</Grid.RowDefinitions>
<TextBlock Name="ValueTxbl" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ValueTxBx" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="3" Grid.RowSpan="1">
<Grid.ColumnDefinitions>
@@ -37,14 +37,13 @@
</Grid.ColumnDefinitions>
<Button Name="OkBtn" Grid.Column="1"
IsDefault="True"
Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="ExitBtn" Grid.Column="3"
IsCancel="True"
Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
EgtDictionary.xaml
+2 -2
View File
@@ -355,10 +355,10 @@
<Setter Property="Background" TargetName="border" Value="#FFBEE6FD"/>
<Setter Property="BorderBrush" TargetName="border" Value="#FF3C7FB1"/>
</Trigger>-->
<Trigger Property="IsPressed" Value="True">
<!--<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" TargetName="border" Value="#FFC4E5F6"/>
<Setter Property="BorderBrush" TargetName="border" Value="#FF2C628B"/>
</Trigger>
</Trigger>-->
<!--Commentato per poter gestire il colore di evidenziazione direttamente nello Style del ToggleButton-->
<!--<Trigger Property="ToggleButton.IsChecked" Value="True">
<Setter Property="Background" TargetName="border" Value="#FFBCDDEE"/>
EgtDictionary.xaml.vb
+14 -2
View File
@@ -126,7 +126,13 @@ Namespace ControlExtensions
' Width of the line to the left of the header
' to be used to set the width of the first column of the Grid
Dim GridLengthConverter As New GridLengthConverter
Dim lineWidth As Double = CDbl(GridLengthConverter.ConvertToString(values(2)))
'Dim lineWidth As Double = CDbl(GridLengthConverter.ConvertToString(values(2)))
Dim lineWidth As Double
If GridLengthConverter.ConvertToString(values(2)).Contains("*") Then
lineWidth = 1
Else
lineWidth = CDbl(GridLengthConverter.ConvertToString(values(2)))
End If
' Calcolo il Margin sottraendo alla larghezza della colonna (6) il massimo tra BorderThickness e CornerRadius
Dim dRightMargin = -6 + Math.Max(dBorderThickness, dCornerRadius)
@@ -184,7 +190,13 @@ Namespace ControlExtensions
' Width of the line to the left of the header
' to be used to set the width of the first column of the Grid
Dim GridLengthConverter As New GridLengthConverter
Dim lineWidth As Double = CDbl(GridLengthConverter.ConvertToString(values(3)))
'Dim lineWidth As Double = CDbl(GridLengthConverter.ConvertToString(values(3)))
Dim lineWidth As Double
If GridLengthConverter.ConvertToString(values(3)).Contains("*") Then
lineWidth = 1
Else
lineWidth = CDbl(GridLengthConverter.ConvertToString(values(3)))
End If
' Doesn't make sense to have a Grid
' with 0 as width or height
FastGridSlabManager.xaml
+5 -5
View File
@@ -44,25 +44,25 @@
<TextBlock Name="OrderTxBl"
Grid.Row="0" Grid.Column="0"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="OrderTxBx"
Grid.Row="0" Grid.Column="1"
Margin="13,0,6,0"
Style="{StaticResource OmagCut_KeyboardTextBox}"/>
Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
<TextBlock Name="CurrSlabTxBl"
Grid.Row="1" Grid.Column="0"
Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="CurrSlabTxBx"
Grid.Row="1" Grid.Column="1"
Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
</Grid>
<GroupBox Name="PieceTypeGpBx"
Grid.Row="2"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<UniformGrid Rows="2">
<UniformGrid Columns="3" >
FlatteningCut.xaml
+7 -7
View File
@@ -7,7 +7,7 @@
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">
<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">
<!-- Definizione della Grid FlatteningCut -->
<Grid Name="FlatteningCutGrid" >
@@ -37,9 +37,9 @@
</Grid.ColumnDefinitions>
<ToggleButton Name="Point1Btn" Grid.Column="0"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="Point2Btn" Grid.Column="1"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
</Grid>
@@ -118,10 +118,10 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="SimulBtn" Grid.Column="0" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
<Button Name="OkBtn" Grid.Column="1" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
<Button Name="ExitBtn" Grid.Column="2" Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
<Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
<Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
FrameCutPageUC.xaml
+20 -20
View File
@@ -33,14 +33,14 @@
<ColumnDefinition Width="4*"/>
</Grid.ColumnDefinitions>
<Button Name="PhotoBtn" Grid.Column="0" Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/Photo.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="RawPartBtn" Grid.Column="1" Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/RawPart.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{StaticResource OmagCut_RightGrayYellowIconToggleButton}">
<Image Source="Resources/FrameMachining.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
<Image Source="{DynamicResource FrameMachiningImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
</Grid>
@@ -78,43 +78,43 @@
<UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
<Button Name="SelSectionBtn"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Grid>
<Button Name="SelGuideBtn"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<UniformGrid Name="ArcGrid" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
<TextBlock Name="ArcRadTxBl" Grid.Row="2" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ArcRadTxBx" Grid.Column="2" Grid.Row="2" Width="50"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="ArcAngTxBl" Grid.Row="3" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ArcAngTxBx" Grid.Column="2" Grid.Row="3" Width="50"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
</UniformGrid>
</Grid>
</UniformGrid>
<TextBlock Name="OffsZTxBl" Grid.Row="2" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="OffsZTxBx" Grid.Column="2" Grid.Row="2" Width="50"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="OffsXyTxBl" Grid.Row="3" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="OffsXyTxBx" Grid.Column="2" Grid.Row="3" Width="50"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="OffsYyTxBl" Grid.Row="4" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="OffsYyTxBx" Grid.Column="2" Grid.Row="4" Width="50"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
<Button Name="MirrorPartBtn"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="RemovePartBtn"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
</UniformGrid>
<!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
FrameMachiningUC.xaml
+10 -10
View File
@@ -9,7 +9,7 @@
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<Grid Grid.Row="1" Background="{StaticResource OmagCut_Gray}">
<Grid Grid.Row="1" Background="{DynamicResource OmagCut_Gray}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -30,9 +30,9 @@
</Grid.RowDefinitions>
<TextBlock Name="SawRoughingTxBl" Grid.Row="0" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<ComboBox Name="SawRoughingCmBx" Grid.Row="1" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
<ComboBox Name="SawRoughingCmBx" Grid.Row="1" Grid.ColumnSpan="3" Style="{DynamicResource OmagCut_ComboBox}"
Width="200" MaxDropDownHeight="300">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -42,7 +42,7 @@
</ComboBox>
<TextBlock Name="SawFinishingTxBl" Grid.Row="2" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<ComboBox Name="SawFinishingCmBx" Grid.Row="3" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
Width="200" MaxDropDownHeight="300">
@@ -54,7 +54,7 @@
</ComboBox>
<TextBlock Name="SawSideFinTxBl" Grid.Row="4" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<ComboBox Name="SawSideFinCmBx" Grid.Row="5" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
Width="200" MaxDropDownHeight="300">
@@ -66,17 +66,17 @@
</ComboBox>
<TextBlock Name="StartTrimTxBl" Grid.Row="6" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="StartTrimTxBx" Grid.Column="2" Grid.Row="6" Width="50"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="EndTrimTxBl" Grid.Row="7" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="EndTrimTxBx" Grid.Column="2" Grid.Row="7" Width="50"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="SawSingleTxBl" Grid.Row="8" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
<ComboBox Name="SawSingleCmBx" Grid.Row="9" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
Width="200" MaxDropDownHeight="300">
GridCut.xaml
+6 -6
View File
@@ -34,9 +34,9 @@
</Grid.ColumnDefinitions>
<ToggleButton Name="Point1Btn" Grid.Column="0"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="Point2Btn" Grid.Column="1"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
</Grid>
@@ -130,10 +130,10 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="SimulBtn" Grid.Column="0" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
<Button Name="OkBtn" Grid.Column="1" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
<Button Name="ExitBtn" Grid.Column="2" Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
<Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
<Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
ImportPageUC.xaml
+17 -17
View File
@@ -32,11 +32,11 @@
</Grid.ColumnDefinitions>
<ToggleButton Name="SideAngleBtn" Grid.Column="0"
Style="{StaticResource OmagCut_RightGrayYellowTextToggleButton}"/>
Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
<ToggleButton Name="DripCutBtn" Grid.Column="1" Padding="0"
Style="{StaticResource OmagCut_RightGrayYellowTextToggleButton}"/>
Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
<ToggleButton Name="DripDrillBtn" Grid.Column="2" Padding="0"
Style="{StaticResource OmagCut_RightGrayYellowTextToggleButton}"/>
Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
</Grid>
@@ -49,13 +49,13 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Name="FilePathTxBl" Foreground="White" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
<TextBlock Name="FilePathTxBl" Foreground="White" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
<ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
ItemsSource="{Binding ItemList}"/>
<Border Name="MessageBrd" Grid.Row="4" BorderThickness="0,1,0,0" BorderBrush="Gray">
<TextBlock Name="MessageTxBx" TextAlignment="Center"
Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
</Border>
</Grid>
@@ -75,13 +75,13 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="UseLayerBtn" Grid.Column="0" Style="{StaticResource OmagCut_YellowTextButton}"/>
<Button Name="UseClosedCurveBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowTextButton}"/>
<Button Name="UseRegionBtn" Grid.Column="2" Style="{StaticResource OmagCut_YellowTextButton}"/>
<Button Name="ResetBtn" Grid.Column="3" Style="{StaticResource OmagCut_YellowTextButton}"/>
<Button Name="UseLayerBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="UseClosedCurveBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="UseRegionBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="ResetBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}"/>
<RadioButton Name="mmBtn" Grid.Column="4" Style="{StaticResource OmagCut_YellowToggleButton}"/>
<RadioButton Name="inchBtn" Grid.Column="5" Style="{StaticResource OmagCut_YellowToggleButton}"/>
<RadioButton Name="mmBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<RadioButton Name="inchBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<Grid Name="PartNumberGrd" Grid.Column="6" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
@@ -89,19 +89,19 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Name="PartNumTxBl" Grid.Column="0" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"
<TextBlock Name="PartNumTxBl" Grid.Column="0" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"
TextAlignment="Right"/>
<EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
</Grid>
<Button Name="OkBtn" Grid.Column="8" Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="OkBtn" Grid.Column="8" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="ExitBtn" Grid.Column="9" Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="ExitBtn" Grid.Column="9" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
InternalComponentPageUC.xaml
+14 -13
View File
@@ -7,7 +7,7 @@
d:DesignHeight="768" d:DesignWidth="256">
<!-- Definizione della MainComponentPage -->
<Grid Name="MainComponentPageGrid" Background="{StaticResource OmagCut_Gray}">
<Grid Name="MainComponentPageGrid" Background="{DynamicResource OmagCut_Gray}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
@@ -22,7 +22,7 @@
</Grid.RowDefinitions>
<!-- Attenzione! Questi Button devono avere lo stesso nome dei componenti nel file Ini -->
<Button Name="Compo1" Grid.Row="0" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo1" Grid.Row="0" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -34,7 +34,7 @@
</Grid>
</Button>
<Button Name="Compo2" Grid.Row="1" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo2" Grid.Row="1" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -46,7 +46,7 @@
</Grid>
</Button>
<Button Name="Compo3" Grid.Row="2" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo3" Grid.Row="2" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -58,7 +58,7 @@
</Grid>
</Button>
<Button Name="Compo4" Grid.Row="3" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo4" Grid.Row="3" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -70,7 +70,7 @@
</Grid>
</Button>
<Button Name="Compo5" Grid.Row="4" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo5" Grid.Row="4" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -82,7 +82,7 @@
</Grid>
</Button>
<Button Name="Compo6" Grid.Row="5" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo6" Grid.Row="5" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -94,7 +94,7 @@
</Grid>
</Button>
<Button Name="Compo7" Grid.Row="6" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo7" Grid.Row="6" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -106,7 +106,7 @@
</Grid>
</Button>
<Button Name="Compo8" Grid.Row="7" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo8" Grid.Row="7" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -118,9 +118,10 @@
</Grid>
</Button>
<Button Name="Compo9" Grid.Row="8" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo9" Grid.Row="8" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Image Name="ImageCompo9" Source="/Resources/NumericKeyboardArrow.png"/>
<Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />
<!--"/Resources/NumericKeyboardArrow.png"/>-->
<TextBlock Name="LabelCompo9" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</Grid>
</Button>
@@ -131,8 +132,8 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="BackBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="BackBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
MachineButtonsUC.xaml
+10 -10
View File
@@ -21,43 +21,43 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<ToggleButton Name="MachineButton1" Grid.Column="0" Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<ToggleButton Name="MachineButton1" Grid.Column="0" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
<Image Name="ImageButton1" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
<ToggleButton Name="MachineButton2" Grid.Column="1" Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<ToggleButton Name="MachineButton2" Grid.Column="1" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
<Image Name="ImageButton2" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
<ToggleButton Name="MachineButton3" Grid.Column="2" Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<ToggleButton Name="MachineButton3" Grid.Column="2" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
<Image Name="ImageButton3" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
<ToggleButton Name="MachineButton4" Grid.Column="3" Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<ToggleButton Name="MachineButton4" Grid.Column="3" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
<Image Name="ImageButton4" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
<ToggleButton Name="MachineButton5" Grid.Column="4" Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<ToggleButton Name="MachineButton5" Grid.Column="4" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
<Image Name="ImageButton5" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
<ToggleButton Name="MachineButton6" Grid.Column="5" Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<ToggleButton Name="MachineButton6" Grid.Column="5" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
<Image Name="ImageButton6" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
<ToggleButton Name="MachineButton7" Grid.Column="6" Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<ToggleButton Name="MachineButton7" Grid.Column="6" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
<Image Name="ImageButton7" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
<ToggleButton Name="MachineButton8" Grid.Column="7" Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<ToggleButton Name="MachineButton8" Grid.Column="7" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
<Image Name="ImageButton8" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
<ToggleButton Name="MachineButton9" Grid.Column="8" Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<ToggleButton Name="MachineButton9" Grid.Column="8" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
<Image Name="ImageButton9" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
<ToggleButton Name="MachineButton10" Grid.Column="9" Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
<ToggleButton Name="MachineButton10" Grid.Column="9" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
<Image Name="ImageButton10" Style="{StaticResource OmagCut_ButtonIcon}"/>
</ToggleButton>
MachineButtonsUC.xaml.vb
+84 -12
View File
@@ -73,7 +73,13 @@ Public Class MachineButtonsUC
If StateFlagArray(nIndex) = BTN_STATE_NOTHING Then
' mostra immagine fissa
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
@@ -87,7 +93,13 @@ Public Class MachineButtonsUC
For nIndex As Integer = 0 To m_nCount - 1
Dim sImage As String = If(String.IsNullOrEmpty(ImageArrayN(nIndex)), ImageArrayY(nIndex), ImageArrayN(nIndex))
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sImage
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sImage
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & sImage
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & sImage
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
@@ -186,7 +198,13 @@ Public Class MachineButtonsUC
If SpindleState Then
GetToggleButton(nIndex + 1).IsChecked = True
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
@@ -195,7 +213,13 @@ Public Class MachineButtonsUC
Else
GetToggleButton(nIndex + 1).IsChecked = False
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayN(nIndex)
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
@@ -211,7 +235,13 @@ Public Class MachineButtonsUC
If CoolantState Then
GetToggleButton(nIndex + 1).IsChecked = True
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
@@ -220,7 +250,13 @@ Public Class MachineButtonsUC
Else
GetToggleButton(nIndex + 1).IsChecked = False
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayN(nIndex)
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
@@ -236,7 +272,13 @@ Public Class MachineButtonsUC
If LaserState Then
GetToggleButton(nIndex + 1).IsChecked = True
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
@@ -245,7 +287,13 @@ Public Class MachineButtonsUC
Else
GetToggleButton(nIndex + 1).IsChecked = False
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayN(nIndex)
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
@@ -261,7 +309,13 @@ Public Class MachineButtonsUC
If ThreeAxisState Then
GetToggleButton(nIndex + 1).IsChecked = True
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
@@ -270,7 +324,13 @@ Public Class MachineButtonsUC
Else
GetToggleButton(nIndex + 1).IsChecked = False
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
@@ -286,7 +346,13 @@ Public Class MachineButtonsUC
If FiveAxisState Then
GetToggleButton(nIndex + 1).IsChecked = True
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
@@ -295,7 +361,13 @@ Public Class MachineButtonsUC
Else
GetToggleButton(nIndex + 1).IsChecked = False
Try
Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
End If
'Dim s As String = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
MachineCNPageUC.xaml
+21 -21
View File
@@ -8,7 +8,7 @@
d:DesignHeight="768" d:DesignWidth="1280">
<!-- Definizione della ImportPage -->
<Border Background="{StaticResource OmagCut_Gray}" >
<Border Background="{DynamicResource OmagCut_Gray}" >
<Grid Name="ImportPageGrid">
<Grid.ColumnDefinitions>
@@ -24,7 +24,7 @@
<RowDefinition Height="4.5*"/>
</Grid.RowDefinitions>
<GroupBox Name="CNModeGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.ColumnSpan="2" Margin="0,0,4,0">
<GroupBox Name="CNModeGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.ColumnSpan="2" Margin="0,0,4,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
@@ -35,21 +35,21 @@
</Grid.ColumnDefinitions>
<Button Name="AutoBtn" Grid.Column="0"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="ManualBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="MDIBtn" Grid.Column="2"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="SingleBtn" Grid.Column="3"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="HomeBtn" Grid.Column="4"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
</Grid>
</GroupBox>
<GroupBox Name="CommandsGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="2" Grid.ColumnSpan="2">
<GroupBox Name="CommandsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.ColumnSpan="2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
@@ -57,32 +57,32 @@
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<Button Name="StartBtn" Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="StartBtn" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="StopBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="ResetBtn" Grid.Column="2"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
</Grid>
</GroupBox>
<GroupBox Name="MDICommandGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Row="1">
<GroupBox Name="MDICommandGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="6*"/>
<ColumnDefinition Width="1.5*"/>
</Grid.ColumnDefinitions>
<EgtWPFLib:EgtTextBox Name="MDITxBx" Margin="10,0,10,0" Style="{StaticResource OmagCut_KeyboardTextBox}"/>
<EgtWPFLib:EgtTextBox Name="MDITxBx" Margin="10,0,10,0" Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
<Button Name="MDIConfirmBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
</Grid>
</GroupBox>
<GroupBox Name="PartProgTransferGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Row="2"
<GroupBox Name="PartProgTransferGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="2"
Grid.ColumnSpan="3">
<Grid>
<Grid.ColumnDefinitions>
@@ -94,20 +94,20 @@
</Grid.ColumnDefinitions>
<Button Name="DownloadBtn" Grid.Column="0"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="UploadBtn" Grid.Column="1"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="ActivateBtn" Grid.Column="2"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button Name="DeleteBtn" Grid.Column="3"
Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<EgtWPFLib:EgtTextBox Name="DULoadTxBx" Grid.Column="4" Width="100" Text="900.0"
Style="{StaticResource OmagCut_KeyboardTextBox}"/>
Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
</Grid>
</GroupBox>
<GroupBox Name="ErrorLstGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Row="3" Grid.ColumnSpan="4">
<GroupBox Name="ErrorLstGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="3" Grid.ColumnSpan="4">
<ListBox Name="ErrorLstBx">
<ListBox.ItemTemplate>
<DataTemplate>
MachinePageUC.xaml
+4 -4
View File
@@ -30,10 +30,10 @@
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<ToggleButton Name="AlarmsBtn" Style="{StaticResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="ToolsDBBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="MachiningDBBtn" Grid.Column="2" Style="{StaticResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="TestingPageBtn" Grid.Column="3" Style="{StaticResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="AlarmsBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="ToolsDBBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="MachiningDBBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="TestingPageBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
</Grid>
MachiningDbPageUC.xaml
+100 -88
View File
@@ -9,7 +9,7 @@
d:DesignHeight="768" d:DesignWidth="1280" Initialized="MachiningDbPage_Initialized" Loaded="MachiningDbPage_Loaded">
<!-- Definizione della MachiningDbPage -->
<Border Style="{StaticResource OmagCut_PageBorder}">
<Border Style="{DynamicResource OmagCut_PageBorder}">
<Grid Name="MachiningDbPageGrid" >
<Grid.ColumnDefinitions>
@@ -22,7 +22,7 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TreeView Name="MachiningTreeView" >
<TreeView Name="MachiningTreeView" Background="{DynamicResource OmagCut_TreeViewBackGroundColor}">
<TreeView.Resources>
<!--Modifico HierarchicalDataTemplate del CathegoryItem per poter inserire immagine e testo e per -->
<!--renderlo apribile con un solo click -->
@@ -43,6 +43,7 @@
<!-- multibinding quando sono attivi.-->
<HierarchicalDataTemplate.ItemContainerStyle>
<Style TargetType="{x:Type TreeViewItem}" >
<Setter Property="Foreground" Value="{DynamicResource OmagCut_TreeViewTextColor}" />
<Setter Property="IsSelected" Value="{Binding IsSelected}" />
<Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
<Setter Property="Template">
@@ -63,6 +64,7 @@
<ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</Border>
<ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
<Rectangle Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" VerticalAlignment="Top" Fill="{DynamicResource OmagCut_TreeViewDelimiterColor}" Height="1" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsExpanded" Value="false">
@@ -72,8 +74,12 @@
<Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
</Trigger>
<Trigger Property="IsSelected" Value="true">
<Setter Property="Background" TargetName="Bd" Value="Transparent"/>
<Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
<Setter Property="Background" TargetName="Bd" >
<Setter.Value>
<SolidColorBrush Color="Yellow" Opacity="0.4"/>
</Setter.Value>
</Setter>
<Setter Property="BorderBrush" TargetName="Bd" Value="Yellow"/>
<Setter Property="BorderThickness" TargetName="Bd" Value="1"/>
<!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>-->
</Trigger>
@@ -114,6 +120,7 @@
<!--che si presenta quando la categoria rimane vuota (ombra causata dal multibinding). -->
<TreeView.ItemContainerStyle>
<Style TargetType="{x:Type TreeViewItem}">
<Setter Property="Foreground" Value="{DynamicResource OmagCut_TreeViewTextColor}" />
<Setter Property="IsSelected" Value="{Binding IsSelected}" />
<Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
<Setter Property="Template">
@@ -136,6 +143,7 @@
<ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</Border>
<ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
<Rectangle Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Fill="{DynamicResource OmagCut_TreeViewDelimiterColor}" Height="1" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsExpanded" Value="false">
@@ -145,8 +153,12 @@
<Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
</Trigger>
<Trigger Property="IsSelected" Value="true">
<Setter Property="Background" TargetName="Bd" Value="Transparent"/>
<Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
<Setter Property="Background" TargetName="Bd" >
<Setter.Value>
<SolidColorBrush Color="Yellow" Opacity="0.4"/>
</Setter.Value>
</Setter>
<Setter Property="BorderBrush" TargetName="Bd" Value="Yellow"/>
<Setter Property="BorderThickness" TargetName="Bd" Value="0,1,1,1"/>
<Setter Property="Background" TargetName="ExpanderBorder" Value="Transparent"/>
<Setter Property="BorderBrush" TargetName="ExpanderBorder" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
@@ -220,24 +232,24 @@
</Grid.RowDefinitions>
<TextBlock Name="NameTxBl" Grid.Column="0" Grid.Row="0" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="NameTxBx" Grid.Column="1" Grid.Row="0" Grid.RowSpan="3"
Style="{StaticResource OmagCut_LeftKeyboardTextBoxNoBorder}" />
Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}" />
<TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="3" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="3" Grid.RowSpan="3"
Style="{StaticResource OmagCut_LeftKeyboardTextBoxNoBorder}" />
Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}" />
<!-- Parametri Taglio -->
<TextBlock Name="SideAngleTxBl" Grid.Column="2" Grid.Row="3" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="3" Grid.Row="3" Grid.RowSpan="3" Margin="0,0,15,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="StepTypeTxBl" Grid.Column="0" Grid.Row="6" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="StepTypeCmBx" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3" Style="{StaticResource OmagCut_LeftComboBoxNoBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -247,15 +259,15 @@
</ComboBox>
<TextBlock Name="AcrossTxBl" Grid.Row="3" Grid.Column="2" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<CheckBox Name="AcrossChBx" Grid.Row="3" Grid.Column="3" Grid.RowSpan="3" Style="{StaticResource OmagCut_CheckBox_Single}"/>
<TextBlock Name="InvertTxBl" Grid.Row="6" Grid.Column="2" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<CheckBox Name="InvertChBx" Grid.Row="6" Grid.Column="3" Grid.RowSpan="3" Style="{StaticResource OmagCut_CheckBox_Single}"/>
<Border Name="SideBrd" Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="4" Grid.RowSpan="3"
Style="{StaticResource OmagCut_NoNameGroupBorder}">
Style="{DynamicResource OmagCut_NoNameGroupBorder}">
<Grid>
<Grid.ColumnDefinitions>
@@ -269,7 +281,7 @@
</Grid.RowDefinitions>
<TextBlock Name="WorkSideTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="WorkSideCmBx" Grid.Column="1" Grid.Row="5" Style="{StaticResource OmagCut_LeftComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -279,7 +291,7 @@
</ComboBox>
<TextBlock Name="HeadSideTxBl" Grid.Column="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="HeadSideCmBx" Grid.Column="4" Grid.Row="5" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -293,7 +305,7 @@
</Border>
<Border Name="TypeBrd" Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4" Grid.RowSpan="6"
Style="{StaticResource OmagCut_NoNameGroupBorder}">
Style="{DynamicResource OmagCut_NoNameGroupBorder}">
<Grid Name="TypeGrd">
<Grid.ColumnDefinitions>
@@ -308,12 +320,12 @@
</Grid.RowDefinitions>
<TextBlock Name="StartPosTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="StartPosTxBx" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
<TextBlock Name="LeadInTypeTxBl" Grid.Column="2" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="LeadInTypeCmBx" Grid.Column="3" Grid.Row="0" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -324,7 +336,7 @@
<!--Questo è solo per sgrossatura con lama-->
<TextBlock Name="LeadLinkTypeTxBl" Grid.Column="2" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="LeadLinkTypeCmBx" Grid.Column="3" Grid.Row="0" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -334,7 +346,7 @@
</ComboBox>
<TextBlock Name="ExtLinkTypeTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="ExtLinkTypeCmBx" Grid.Column="1" Grid.Row="1" Style="{StaticResource OmagCut_LeftComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -344,7 +356,7 @@
</ComboBox>
<TextBlock Name="LeadOutTypeTxBl" Grid.Column="2" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="LeadOutTypeCmBx" Grid.Column="3" Grid.Row="1" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -358,7 +370,7 @@
</Border>
<Border Name="CurveBrd" Grid.Column="0" Grid.Row="18" Grid.ColumnSpan="4" Grid.RowSpan="3"
Style="{StaticResource OmagCut_NoNameGroupBorder}">
Style="{DynamicResource OmagCut_NoNameGroupBorder}">
<Grid>
<Grid.ColumnDefinitions>
@@ -372,7 +384,7 @@
</Grid.RowDefinitions>
<TextBlock Name="CurveUseTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="CurveUseCmBx" Grid.Column="1" Grid.Row="0" Style="{StaticResource OmagCut_LeftComboBoxInBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -382,16 +394,16 @@
</ComboBox>
<TextBlock Name="ApproxTxBl" Grid.Column="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ApproxTxBx" Grid.Column="3"
Style="{StaticResource OmagCut_MachRightCalculatorTextBoxInBorder}" />
Style="{DynamicResource OmagCut_MachRightCalculatorTextBoxInBorder}" />
</Grid>
</Border>
<GroupBox Name="SawStepGpBx" Grid.Column="0" Grid.Row="21" Grid.ColumnSpan="4" Grid.RowSpan="6"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid Name="SawStepGrd">
<Grid.ColumnDefinitions>
@@ -407,31 +419,31 @@
</Grid.RowDefinitions>
<TextBlock Name="ForwardSawStepTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<TextBlock Name="BackwardSawStepTxBl" Grid.Column="2" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="BackwardSawStepTxBx" Grid.Column="3" Grid.Row="0"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="ForwardStepSideAngTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ForwardStepSideAngTxBx" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="BackwardStepSideAngTxBl" Grid.Column="2" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="BackwardStepSideAngTxBx" Grid.Column="3" Grid.Row="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="ArcIntTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ArcIntTxBx" Grid.Column="1" Grid.Row="2"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}"/>
<TextBlock Name="ArcExtTxBl" Grid.Column="2" Grid.Row="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ArcExtTxBx" Grid.Column="3" Grid.Row="2"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}"/>
</Grid>
@@ -443,12 +455,12 @@
<!-- Parametri Foratura -->
<TextBlock Name="ThrouAddLenTxBl" Grid.Column="2" Grid.Row="6" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ThrouAddLenTxBx" Grid.Column="3" Grid.Row="6" Grid.RowSpan="3" Margin="0,0,15,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<GroupBox Name="LowLenGpBx" Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="4" Grid.RowSpan="4"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid>
<Grid.ColumnDefinitions>
@@ -462,21 +474,21 @@
</Grid.RowDefinitions>
<TextBlock Name="StartsLowLenTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="StartsLowLenTxBx" Grid.Column="1" Grid.Row="3"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="EndsLowLenTxBl" Grid.Column="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="EndsLowLenTxBx" Grid.Column="3" Grid.Row="3"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
</Grid>
</GroupBox>
<Border Name="DrillStepBrd" Grid.Column="0" Grid.Row="13" Grid.ColumnSpan="4" Grid.RowSpan="3"
Style="{StaticResource OmagCut_NoNameGroupBorder}">
Style="{DynamicResource OmagCut_NoNameGroupBorder}">
<Grid Name="DrillStepGrd">
<Grid.ColumnDefinitions>
@@ -490,14 +502,14 @@
</Grid.RowDefinitions>
<TextBlock Name="DrillStepTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="StepTxBx" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_LeftCalculatorTextBoxInBorder}" />
Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
<TextBlock Name="ReturnPosTxBl" Grid.Column="2" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="ReturnPosTxBx" Grid.Column="3" Grid.Row="0"
Style="{StaticResource OmagCut_MachRightCalculatorTextBoxInBorder}" />
Style="{DynamicResource OmagCut_MachRightCalculatorTextBoxInBorder}" />
</Grid>
@@ -506,7 +518,7 @@
<!-- Parametri Sgrossatura con lama -->
<GroupBox Name="SawRouStepGpBx" Grid.Column="0" Grid.Row="18" Grid.ColumnSpan="4" Grid.RowSpan="4"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid Name="SawRouStepGrd">
<Grid.ColumnDefinitions>
@@ -520,12 +532,12 @@
</Grid.RowDefinitions>
<TextBlock Name="SawRouStepTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<TextBlock Name="SideStepTxBl" Grid.Column="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SideStepTxBx" Grid.Column="3" Grid.Row="3"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
</Grid>
@@ -534,7 +546,7 @@
<!--Materiali-->
<Border Name="MaterialsBrd" Grid.Column="0" Grid.Row="27" Grid.ColumnSpan="4" Grid.RowSpan="12"
Style="{StaticResource OmagCut_NoNameGroupBorder}">
Style="{DynamicResource OmagCut_NoNameGroupBorder}">
<Grid Name="MaterialGrd">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
@@ -561,14 +573,14 @@
</ListBox>
<TextBlock Name="MinThicknessTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="MinThicknessTxBx" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
<TextBlock Name="MaxThicknessTxBl" Grid.Column="2" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="MaxThicknessTxBx" Grid.Column="3" Grid.Row="1"
Style="{StaticResource OmagCut_MachRightCalculatorTextBoxInBorder}" />
Style="{DynamicResource OmagCut_MachRightCalculatorTextBoxInBorder}" />
</Grid>
</Border>
@@ -622,7 +634,7 @@
</Grid.RowDefinitions>
<TextBlock Name="ToolTxBl" Grid.Column="0" Grid.RowSpan="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<ComboBox Name="ToolCmBx" Grid.Column="1" Grid.Row="0" Grid.RowSpan="3" Style="{StaticResource OmagCut_MachToolLeftComboBoxNoBorder}">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -638,14 +650,14 @@
</Grid.ColumnDefinitions>
<TextBlock Name="SpeedTxBl" Grid.Column="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1"
Style="{StaticResource OmagCut_MachToolCalculatorTextBox}" />
Style="{DynamicResource OmagCut_MachToolCalculatorTextBox}" />
</Grid>
<GroupBox Name="FeedGpBx" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2" Grid.RowSpan="14"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid Name="FeedGrd">
<Grid.ColumnDefinitions>
@@ -661,41 +673,41 @@
</Grid.RowDefinitions>
<TextBlock Name="FeedTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="FeedTxBx" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}"/>
<TextBlock Name="TipFeedTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="TipFeedTxBx" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="StartFeedTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="StartFeedTxBx" Grid.Column="1" Grid.Row="2"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="EndFeedTxBl" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="EndFeedTxBx" Grid.Column="1" Grid.Row="3"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="VertFeedTxBl" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="VertFeedTxBx" Grid.Column="1" Grid.Row="4"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="BackFeedTxBl" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="BackFeedTxBx" Grid.Column="1" Grid.Row="4"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
</Grid>
</GroupBox>
<GroupBox Name="OffsetGpBx" Grid.Column="0" Grid.Row="20" Grid.ColumnSpan="2" Grid.RowSpan="6"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid Name="OffsetGrd">
<Grid.ColumnDefinitions>
@@ -708,14 +720,14 @@
</Grid.RowDefinitions>
<TextBlock Name="RadOffsetTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="RadOffsetTxBx" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
<TextBlock Name="LonOffsetTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="LonOffsetTxBx" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_CalculatorTextBoxInGroupBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
</Grid>
@@ -733,13 +745,13 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="NewBtn" Grid.Column="0" Style="{StaticResource OmagCut_YellowGradientYellowTextButton}"/>
<Button Name="SaveBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowGradientYellowTextButton}"/>
<Button Name="NewBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
<Button Name="SaveBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
<Button Name="RemoveBtn" Grid.Column="2"
Style="{StaticResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
<Button Name="OkBtn" Grid.Column="4" Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="OkBtn" Grid.Column="4" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
MainComponentPageUC.xaml
+11 -10
View File
@@ -22,7 +22,7 @@
</Grid.RowDefinitions>
<!-- Attenzione! Questi Button devono avere lo stesso nome dei componenti nel file Ini -->
<Button Name="Compo1" Grid.Row="0" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo1" Grid.Row="0" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -34,7 +34,7 @@
</Grid>
</Button>
<Button Name="Compo2" Grid.Row="1" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo2" Grid.Row="1" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -46,7 +46,7 @@
</Grid>
</Button>
<Button Name="Compo3" Grid.Row="2" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo3" Grid.Row="2" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -58,7 +58,7 @@
</Grid>
</Button>
<Button Name="Compo4" Grid.Row="3" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo4" Grid.Row="3" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -70,7 +70,7 @@
</Grid>
</Button>
<Button Name="Compo5" Grid.Row="4" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo5" Grid.Row="4" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -82,7 +82,7 @@
</Grid>
</Button>
<Button Name="Compo6" Grid.Row="5" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo6" Grid.Row="5" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -94,7 +94,7 @@
</Grid>
</Button>
<Button Name="Compo7" Grid.Row="6" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo7" Grid.Row="6" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -106,7 +106,7 @@
</Grid>
</Button>
<Button Name="Compo8" Grid.Row="7" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo8" Grid.Row="7" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
@@ -123,9 +123,10 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="Compo9" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_YellowIconButton}">
<Button Name="Compo9" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
<Grid>
<Image Name="ImageCompo9" Source="/Resources/NumericKeyboardArrow.png"/>
<Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />
<!--Source="/Resources/NumericKeyboardArrow.png"/>-->
<TextBlock Name="LabelCompo9" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</Grid>
</Button>
MainWindow.xaml
+12 -12
View File
@@ -3,11 +3,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:OmagCUT"
Title="MainWindow" Height="1024" Width="1280" ResizeMode="NoResize" WindowStyle="None"
FontFamily="./Resources/Fonts/#Century Gothic"
FontFamily="{DynamicResource OmagCut_Font}"
Icon="Resources/LogoOmag.jpg">
<!-- ** Definizione della Grid della MainWindow ** -->
<Grid Name="MainWindowGrid" Background="{StaticResource OmagCut_Gray}">
<Grid Name="MainWindowGrid" Background="{DynamicResource OmagCut_Gray}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="15*"/>
<ColumnDefinition Width="2*"/>
@@ -27,7 +27,7 @@
</Grid.ColumnDefinitions>
<Border Name="LogoBrd" Background="Transparent">
<Image Source="Resources/LogoOmag.jpg" Stretch="Uniform" Margin="1"/>
<Image Source="{DynamicResource LogoOmagImg}" Stretch="Uniform" Margin="1"/>
</Border>
<!-- ** Definizione della Grid delle tab ** -->
@@ -41,20 +41,20 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<ToggleButton Name="WorkInProgressBtn" Grid.Column="0" Style="{StaticResource OmagCut_BlueToggleButton}">
<ToggleButton Name="WorkInProgressBtn" Grid.Column="0" Style="{DynamicResource OmagCut_BlueToggleButton}">
<!--<TextBlock Name="WorkInProgressTxBl" TextWrapping="Wrap" TextAlignment="Center" />-->
</ToggleButton>
<ToggleButton Name="DirectCutBtn" Grid.Column="1" Style="{StaticResource OmagCut_BlueToggleButton}"/>
<ToggleButton Name="CadCutBtn" Grid.Column="2" Style="{StaticResource OmagCut_BlueToggleButton}"/>
<ToggleButton Name="FrameCutBtn" Grid.Column="3" Style="{StaticResource OmagCut_BlueToggleButton}"/>
<ToggleButton Name="MachineBtn" Grid.Column="4" Style="{StaticResource OmagCut_BlueToggleButton}"/>
<ToggleButton Name="OptionsBtn" Grid.Column="5" Style="{StaticResource OmagCut_BlueIconToggleButton}">
<Image Source="Resources/Options.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
<ToggleButton Name="DirectCutBtn" Grid.Column="1" Style="{DynamicResource OmagCut_BlueToggleButton}"/>
<ToggleButton Name="CadCutBtn" Grid.Column="2" Style="{DynamicResource OmagCut_BlueToggleButton}"/>
<ToggleButton Name="FrameCutBtn" Grid.Column="3" Style="{DynamicResource OmagCut_BlueToggleButton}"/>
<ToggleButton Name="MachineBtn" Grid.Column="4" Style="{DynamicResource OmagCut_BlueToggleButton}"/>
<ToggleButton Name="OptionsBtn" Grid.Column="5" Style="{DynamicResource OmagCut_BlueIconToggleButton}">
<Image Source="{DynamicResource OptionsImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
</ToggleButton>
</Grid>
<Button Grid.Column="2" Style="{StaticResource OmagCut_BlueIconButton}" Click="ExitBtn_Click">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Grid.Column="2" Style="{DynamicResource OmagCut_BlueIconButton}" Click="ExitBtn_Click">
<Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
MainWindow.xaml.vb
+3 -2
View File
@@ -1016,14 +1016,15 @@ Class MainWindow
End If
End Sub
Private Sub EgtWPFInit()
Friend Sub EgtWPFInit()
'EgtBasicInfo
EgtWPFLib.InitializeEgtWPFLib.EgtBasicInfo_Initialization("C:/EgtDev/OmagCUT",
1280, 1024, 15, 12,
"/#Century Gothic",
"/gothic.ttf",
Application.Current.FindResource("FontSize_UpperCaseCharacter"),
Application.Current.FindResource("FontSize_LowerCaseCharacter"))
Application.Current.FindResource("FontSize_LowerCaseCharacter"),
GetPrivateProfileInt(S_GENERAL, K_THEME, 0, GetIniFile()))
' EgtMessageBox
EgtWPFLib.InitializeEgtWPFLib.EgtMsgBox_Initialization(Application.Current.FindResource("OmagCut_WindowBorder"),
Application.Current.FindResource("OmagCut_WindowGrayTextButton"),
ManualAxesMoveUC.xaml
+8 -8
View File
@@ -7,7 +7,7 @@
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<Border Style="{StaticResource OmagCut_Page2Border}">
<Border Style="{DynamicResource OmagCut_Page2Border}">
<!-- Definizione della Grid laterale -->
<Grid>
@@ -51,19 +51,19 @@
</Grid>
<Button x:Name="L1Btn" Grid.Row="1" Height="60" Width="60" Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button x:Name="L1Btn" Grid.Row="1" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<EgtWPFLib:EgtTextBox Name="L1TxBx" Grid.Column="1" Grid.Row="1" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<Button x:Name="L2Btn" Grid.Row="2" Height="60" Width="60" Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button x:Name="L2Btn" Grid.Row="2" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<EgtWPFLib:EgtTextBox x:Name="L2TxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<Button x:Name="L3Btn" Grid.Row="3" Height="60" Width="60" Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button x:Name="L3Btn" Grid.Row="3" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<EgtWPFLib:EgtTextBox x:Name="L3TxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<Button x:Name="R1Btn" Grid.Row="4" Height="60" Width="60" Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button x:Name="R1Btn" Grid.Row="4" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<EgtWPFLib:EgtTextBox x:Name="R1TxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<Button x:Name="R2Btn" Grid.Row="5" Height="60" Width="60" Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
<Button x:Name="R2Btn" Grid.Row="5" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
<EgtWPFLib:EgtTextBox x:Name="R2TxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -73,8 +73,8 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="BackBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="BackBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
MoveRawPartPage.xaml
+31 -31
View File
@@ -27,7 +27,7 @@
</Grid.ColumnDefinitions>
<!--Griglia per oscurare i bottoni della pagina sottostante-->
<Grid Background="{StaticResource OmagCut_Gray}">
<Grid Background="{DynamicResource OmagCut_Gray}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -35,11 +35,11 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="PrevBtn" Grid.Column="0" Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="PrevBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="NextBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/NumericKeyboardArrow.png" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
<Button Name="NextBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
<Image.RenderTransform>
<TransformGroup>
<RotateTransform Angle="180"/>
@@ -47,7 +47,7 @@
</Image.RenderTransform>
</Image>
</Button>
<Button Name="ModifyBtn" Grid.Column="2" Style="{StaticResource OmagCut_YellowTextButton}"/>
<Button Name="ModifyBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
</Grid>
</Grid>
@@ -72,46 +72,46 @@
</Grid.RowDefinitions>
<Button Name="TopLBtn" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_TopGrayGradientYellowButton}">
<Image Source="Resources/TopLeft.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
<Image Source="{DynamicResource TopLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<Button Name="UpBtn" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_TopGrayGradientYellowButton}">
<Image Source="Resources/UpArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
<Image Source="{DynamicResource UpArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<Button Name="TopRBtn" Grid.Column="2" Grid.Row="1"
Style="{StaticResource OmagCut_TopGrayGradientYellowButton}">
<Image Source="Resources/TopRight.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
<Image Source="{DynamicResource TopRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<Button Name="LeftBtn" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_LeftGrayGradientYellowButton}">
<Image Source="Resources/LeftArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_LeftGrayGradientYellowButton}">
<Image Source="{DynamicResource LeftArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<EgtWPFLib:EgtTextBox Name="StepMoveTxBx" Grid.Column="1" Grid.Row="2" Width="50"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<Button Name="ResetBtn" Grid.Column="1" Grid.Row="2"
Style="{StaticResource OmagCut_YellowTextButton}">
Style="{DynamicResource OmagCut_YellowTextButton}">
</Button>
<Button Name="RightBtn" Grid.Column="2" Grid.Row="2"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/RightArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource RightArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<Button Name="BottomLBtn" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_BottomGrayGradientYellowButton}">
<Image Source="Resources/BottomLeft.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
<Image Source="{DynamicResource BottomLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<Button Name="DownBtn" Grid.Column="1" Grid.Row="3"
Style="{StaticResource OmagCut_BottomGrayGradientYellowButton}">
<Image Source="Resources/DownArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
<Image Source="{DynamicResource DownArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<Button Name="BottomRBtn" Grid.Column="2" Grid.Row="3"
Style="{StaticResource OmagCut_BottomGrayGradientYellowButton}">
<Image Source="Resources/BottomRight.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
<Image Source="{DynamicResource BottomRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
<Button Name="RotateCounterClockwiseBtn" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/CounterClockwiseRotate.png" Width="64" Height="65" HorizontalAlignment="Center"
Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource CounterClockwiseRotateImg}" Width="64" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
@@ -121,20 +121,20 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<EgtWPFLib:EgtTextBox Name="RotationAngleTxBx" Width="50"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
Text="°"/>
</Grid>
<Button Name="RotateClockwiseBtn" Grid.Column="2" Grid.Row="4"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/ClockwiseRotate.png" Width="65" Height="65" HorizontalAlignment="Center"
Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
<Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="6"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Grid Grid.Row="7" Grid.ColumnSpan="3">
<Grid.ColumnDefinitions>
@@ -149,7 +149,7 @@
</Grid>
<!--Lower button grid, sfondo grigio per coprire i bottoni della pagina sottostante-->
<Grid Grid.Column="1" Grid.Row="2" Background="{StaticResource OmagCut_Gray}">
<Grid Grid.Column="1" Grid.Row="2" Background="{DynamicResource OmagCut_Gray}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
MultipleCut.xaml
+7 -7
View File
@@ -7,7 +7,7 @@
mc:Ignorable="d"
d:DesignHeight="597.3" d:DesignWidth="256">
<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">
<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">
<!-- Definizione della Grid MultipleCut -->
<Grid Name="SingleCutGrid" >
@@ -35,9 +35,9 @@
</Grid.ColumnDefinitions>
<ToggleButton Name="Point1Btn" Grid.Column="0"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="Point2Btn" Grid.Column="1"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
</Grid>
@@ -136,10 +136,10 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="SimulBtn" Grid.Column="0" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
<Button Name="OkBtn" Grid.Column="1" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
<Button Name="ExitBtn" Grid.Column="2" Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
<Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
<Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
NestPageUC.xaml
+23 -23
View File
@@ -40,28 +40,28 @@
<Label Name="PositioningLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
HorizontalAlignment="Center" FontSize="15" />
<Button Name="UpBtn" Grid.Column="1" Grid.Row="1"
Style="{StaticResource OmagCut_TopGrayGradientYellowButton}">
<Image Source="Resources/UpArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
<Image Source="{DynamicResource UpArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
</Button>
<Button Name="LeftBtn" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_LeftGrayGradientYellowButton}">
<Image Source="Resources/LeftArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_LeftGrayGradientYellowButton}">
<Image Source="{DynamicResource LeftArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
</Button>
<ToggleButton Name="MaximizeMoveBtn" Grid.Column="1" Grid.Row="2"
Style="{StaticResource OmagCut_YellowIconToggleButton}">
<Image Source="Resources/MaxMove.png" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
Style="{DynamicResource OmagCut_YellowIconToggleButton}">
<Image Source="Resources/MaxMove.png" Style="{DynamicResource OmagCut_ScaleButtonIcon}"/>
</ToggleButton>
<Button Name="RightBtn" Grid.Column="2" Grid.Row="2"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/RightArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource RightArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
</Button>
<EgtWPFLib:EgtTextBox Name="StepMoveTxBx" Grid.Column="0" Grid.Row="3" Width="50"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<Button Name="DownBtn" Grid.Column="1" Grid.Row="3"
Style="{StaticResource OmagCut_BottomGrayGradientYellowButton}">
<Image Source="Resources/DownArrow.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
<Image Source="{DynamicResource DownArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
</Button>
<Grid Grid.Column="2" Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -70,38 +70,38 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<EgtWPFLib:EgtTextBox Name="RotationAngleTxBx" Width="50"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
Text="°"/>
</Grid>
<Button Name="RotateCounterClockwiseBtn" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_LeftGrayGradientYellowButton}">
<Image Source="Resources/CounterClockwiseRotate.png" Width="64" Height="65" HorizontalAlignment="Center"
Style="{DynamicResource OmagCut_LeftGrayGradientYellowButton}">
<Image Source="{DynamicResource CounterClockwiseRotateImg}" Width="64" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
<ToggleButton Name="MagneticPiecesBtn" Grid.Column="1" Grid.Row="4"
Style="{StaticResource OmagCut_YellowIconToggleButton}">
<Image Source="Resources/AlignPieces.png" Width="65" Height="65" HorizontalAlignment="Center"
Style="{DynamicResource OmagCut_YellowIconToggleButton}">
<Image Source="{DynamicResource AlignPiecesImg}" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</ToggleButton>
<Button Name="RotateClockwiseBtn" Grid.Column="2" Grid.Row="4"
Style="{StaticResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="Resources/ClockwiseRotate.png" Width="65" Height="65" HorizontalAlignment="Center"
Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
<Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
<UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
<Button Name="InsertPartBtn" Style="{StaticResource OmagCut_YellowTextButton}" Padding="1"/>
<Button Name="StorePartBtn" Style="{StaticResource OmagCut_YellowTextButton}" Padding="1"/>
<Button Name="InsertPartBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
<Button Name="StorePartBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
</UniformGrid>
<Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="6"
Style="{StaticResource OmagCut_YellowTextButton}" Padding="1"/>
Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
<UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
<Button Name="SelectAllBtn" Style="{StaticResource OmagCut_YellowTextButton}" Padding="1"/>
<Button Name="DeselectAllBtn" Style="{StaticResource OmagCut_YellowTextButton}" Padding="1"/>
<Button Name="SelectAllBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
<Button Name="DeselectAllBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
</UniformGrid>
</Grid>
OmagCUT.vbproj
+149 -17
View File
@@ -119,9 +119,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
</Reference>
<Reference Include="EgtWPFLib, Version=1.6.20.3, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="EgtWPFLib, Version=2.1.7.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\EgtProg\DllD32\EgtWPFLib.dll</HintPath>
<HintPath>..\..\EgtProg\Dll32\EgtWPFLib.dll</HintPath>
</Reference>
<Reference Include="EgtWPFLib5">
<HintPath>..\..\EgtProg\OmagCUT\EgtWPFLib5.dll</HintPath>
@@ -226,8 +226,8 @@
<Compile Include="FrameMachiningUC.xaml.vb">
<DependentUpon>FrameMachiningUC.xaml</DependentUpon>
</Compile>
<Compile Include="OmagCUTAlternativeDictionary.xaml.vb">
<DependentUpon>OmagCUTAlternativeDictionary.xaml</DependentUpon>
<Compile Include="OmagCUTDictionary.xaml.vb">
<DependentUpon>OmagCUTDictionary.xaml</DependentUpon>
</Compile>
<Compile Include="SideAngle.vb" />
<Compile Include="UnderDrillUC.xaml.vb">
@@ -297,9 +297,6 @@
<Compile Include="MainComponentPageUC.xaml.vb">
<DependentUpon>MainComponentPageUC.xaml</DependentUpon>
</Compile>
<Compile Include="OmagCUTDictionary.xaml.vb">
<DependentUpon>OmagCUTDictionary.xaml</DependentUpon>
</Compile>
<Compile Include="OptionsPageUC.xaml.vb">
<DependentUpon>OptionsPageUC.xaml</DependentUpon>
</Compile>
@@ -423,17 +420,17 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="OmagCUTAlternativeDictionary.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="OmagCUTClassicDictionary.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="OmagCUTDictionary.xaml">
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="OmagCUTTestDictionary.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="UnderDrillUC.xaml">
<Generator>MSBuild:Compile</Generator>
@@ -533,10 +530,6 @@
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="OmagCUTDictionary.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="OptionsPageUC.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -654,7 +647,12 @@
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
<AppDesigner Include="My Project\" />
<Resource Include="Resources\Fonts\gothic.ttf" />
<Resource Include="Resources\Fonts\Roboto-Regular.ttf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\Fonts\gothic.ttf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\AvantiVeloce.png" />
@@ -795,6 +793,140 @@
<ItemGroup>
<Resource Include="Resources\Send.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Negative\AlignPieces.png" />
<Resource Include="Resources\Negative\BarCode.png" />
<Resource Include="Resources\Negative\BottomLeft.png" />
<Resource Include="Resources\Negative\BottomRight.png" />
<Resource Include="Resources\Negative\ClockwiseRotate.png" />
<Resource Include="Resources\Negative\CounterClockwiseRotate.png" />
<Resource Include="Resources\Negative\CsvMinus.png" />
<Resource Include="Resources\Negative\CsvNew.png" />
<Resource Include="Resources\Negative\CsvOpen.png" />
<Resource Include="Resources\Negative\CsvPlus.png" />
<Resource Include="Resources\Negative\CsvRuinedParts.png" />
<Resource Include="Resources\Negative\DownArrow.png" />
<Resource Include="Resources\Negative\Draw.png" />
<Resource Include="Resources\Negative\FrameMachining.png" />
<Resource Include="Resources\Negative\GenericView.png" />
<Resource Include="Resources\Negative\HalfTurnRotate.png" />
<Resource Include="Resources\Negative\Import.png" />
<Resource Include="Resources\Negative\LeftArrow.png" />
<Resource Include="Resources\Negative\LookFromTOP.png" />
<Resource Include="Resources\Negative\Manual.png" />
<Resource Include="Resources\Negative\Measure.png" />
<Resource Include="Resources\Negative\MHT.png" />
<Resource Include="Resources\Negative\Nest.png" />
<Resource Include="Resources\Negative\NumericKeyboardArrow.png" />
<Resource Include="Resources\Negative\Options.png" />
<Resource Include="Resources\Negative\Pan.png" />
<Resource Include="Resources\Negative\Photo.png" />
<Resource Include="Resources\Negative\RawPart.png" />
<Resource Include="Resources\Negative\RawProbe.png" />
<Resource Include="Resources\Negative\RightArrow.png" />
<Resource Include="Resources\Negative\SawProbe.png" />
<Resource Include="Resources\Negative\Split.png" />
<Resource Include="Resources\Negative\ToolChangerPos.png" />
<Resource Include="Resources\Negative\TopLeft.png" />
<Resource Include="Resources\Negative\TopRight.png" />
<Resource Include="Resources\Negative\UpArrow.png" />
<Resource Include="Resources\Negative\V.png" />
<Resource Include="Resources\Negative\X.png" />
<Resource Include="Resources\Negative\ZoomAll.png" />
<Resource Include="Resources\Negative\ZoomIn.png" />
<Resource Include="Resources\Negative\ZoomOut.png" />
<Resource Include="Resources\Negative\ZoomWin.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\NewIcons\centro.png" />
<Resource Include="Resources\NewIcons\freccia-dx.png" />
<Resource Include="Resources\NewIcons\freccia-giu.png" />
<Resource Include="Resources\NewIcons\freccia-nera.png" />
<Resource Include="Resources\NewIcons\freccia-small.png" />
<Resource Include="Resources\NewIcons\freccia-su.png" />
<Resource Include="Resources\NewIcons\freccia-sx.png" />
<Resource Include="Resources\NewIcons\freccia.png" />
<Resource Include="Resources\NewIcons\ico-3D.png" />
<Resource Include="Resources\NewIcons\ico-cursore.png" />
<Resource Include="Resources\NewIcons\ico-cut.png" />
<Resource Include="Resources\NewIcons\ico-deseleziona.png" />
<Resource Include="Resources\NewIcons\ico-elimina.png" />
<Resource Include="Resources\NewIcons\ico-hover-3D.png" />
<Resource Include="Resources\NewIcons\ico-hover-cursore.png" />
<Resource Include="Resources\NewIcons\ico-hover-magnete.png" />
<Resource Include="Resources\NewIcons\ico-hover-mano.png" />
<Resource Include="Resources\NewIcons\ico-hover-puntatore.png" />
<Resource Include="Resources\NewIcons\ico-hover-righello.png" />
<Resource Include="Resources\NewIcons\ico-hover-zoom+.png" />
<Resource Include="Resources\NewIcons\ico-hover-zoom-.png" />
<Resource Include="Resources\NewIcons\ico-impostazioni.png" />
<Resource Include="Resources\NewIcons\ico-inserisci-prezzo.png" />
<Resource Include="Resources\NewIcons\ico-magnete.png" />
<Resource Include="Resources\NewIcons\ico-mano.png" />
<Resource Include="Resources\NewIcons\ico-parcheggia.png" />
<Resource Include="Resources\NewIcons\ico-puntatore.png" />
<Resource Include="Resources\NewIcons\ico-righello.png" />
<Resource Include="Resources\NewIcons\ico-salva.png" />
<Resource Include="Resources\NewIcons\ico-seleziona-tutto.png" />
<Resource Include="Resources\NewIcons\icone-tagli-1.png" />
<Resource Include="Resources\NewIcons\icone-tagli-2.png" />
<Resource Include="Resources\NewIcons\icone-tagli-3.png" />
<Resource Include="Resources\NewIcons\icone-tagli-4.png" />
<Resource Include="Resources\NewIcons\icone-tagli-5.png" />
<Resource Include="Resources\NewIcons\icone-tagli-6.png" />
<Resource Include="Resources\NewIcons\logo-OmCut.png" />
<Resource Include="Resources\NewIcons\ruota-oggetto-dx.png" />
<Resource Include="Resources\NewIcons\ruota-oggetto-inclinato.png" />
<Resource Include="Resources\NewIcons\ruota-oggetto-sx.png" />
<Resource Include="Resources\NewIcons\zoom+.png" />
<Resource Include="Resources\NewIcons\zoom-.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\NewIcons\1-BottomLeft.png" />
<Resource Include="Resources\NewIcons\2-BottomRight.png" />
<Resource Include="Resources\NewIcons\3-TopRight.png" />
<Resource Include="Resources\NewIcons\4-TopLeft.png" />
<Resource Include="Resources\NewIcons\AvantiVeloce.png" />
<Resource Include="Resources\NewIcons\BarCode.png" />
<Resource Include="Resources\NewIcons\CsvMinus.png" />
<Resource Include="Resources\NewIcons\CsvNew.png" />
<Resource Include="Resources\NewIcons\CsvOpen.png" />
<Resource Include="Resources\NewIcons\CsvPlus.png" />
<Resource Include="Resources\NewIcons\CsvRuinedParts.png" />
<Resource Include="Resources\NewIcons\DownArrow.png" />
<Resource Include="Resources\NewIcons\GenericView-hover.png" />
<Resource Include="Resources\NewIcons\GenericView.png" />
<Resource Include="Resources\NewIcons\IndietroVeloce.png" />
<Resource Include="Resources\NewIcons\LeftArrow.png" />
<Resource Include="Resources\NewIcons\Manual.png" />
<Resource Include="Resources\NewIcons\MaxMove.png" />
<Resource Include="Resources\NewIcons\Nest.png" />
<Resource Include="Resources\NewIcons\NumericKeyboardArrow.png" />
<Resource Include="Resources\NewIcons\Options.png" />
<Resource Include="Resources\NewIcons\Pause.png" />
<Resource Include="Resources\NewIcons\Play.png" />
<Resource Include="Resources\NewIcons\PlayStep.png" />
<Resource Include="Resources\NewIcons\RawProbe.png" />
<Resource Include="Resources\NewIcons\RightArrow.png" />
<Resource Include="Resources\NewIcons\SawProbe.png" />
<Resource Include="Resources\NewIcons\Send.png" />
<Resource Include="Resources\NewIcons\Split.png" />
<Resource Include="Resources\NewIcons\Stop.png" />
<Resource Include="Resources\NewIcons\ToolChangerPos.png" />
<Resource Include="Resources\NewIcons\UpArrow.png" />
<Resource Include="Resources\NewIcons\V.png" />
<Resource Include="Resources\NewIcons\X.png" />
<Resource Include="Resources\NewIcons\ZoomAll-hover.png" />
<Resource Include="Resources\NewIcons\ZoomAll.png" />
<Resource Include="Resources\NewIcons\ZoomWin.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\NewIcons\Vacuum.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\NewIcons\FrameMachining.png" />
<Resource Include="Resources\NewIcons\MHT.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe
OmagCUTAlternativeDictionary.xaml
-2524
View File
File diff suppressed because it is too large Load Diff
OmagCUTAlternativeDictionary.xaml.vb
-310
View File
@@ -1,310 +0,0 @@
Imports System.Collections.ObjectModel
Imports System.ComponentModel
Partial Class OmagCUTAlternativeDictionary
Inherits ResourceDictionary
Dim m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
' Evento della TextBox con Style che permette di aprire in automatico la calcolatrice
'Friend Sub NumericKeyboard_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
' ' Recupero dati da sorgente
' Dim sTitle As String = String.Empty
' Dim sText As String = String.Empty
' Dim TxBx As TextBox = CType(e.Source, TextBox)
' If Not IsNothing(TxBx) Then
' sText = TxBx.Text
' Dim AssocLabel As Label = TxBx.Tag
' If Not IsNothing(AssocLabel) Then
' sTitle = AssocLabel.Content
' End If
' End If
' ' Creo calcolatrice
' Dim NumericKeyboardWD As New NumericKeyboardWD(sTitle, sText, e.Source)
' ' La visualizzo
' NumericKeyboardWD.ShowDialog()
'End Sub
' Evento della TextBox con Style che permette di aggiornare in automatico il componente con il nuovo valore
'Private Sub NumericKeyboard_TextChanged(sender As Object, e As TextChangedEventArgs)
' Select Case m_MainWindow.m_ActivePage
' Case MainWindow.Pages.Draw
' If Not m_MainWindow.m_DrawPageUC.m_bShowVar Then
' m_MainWindow.m_DrawPageUC.UpdateView()
' End If
' Case MainWindow.Pages.RawPart
' If Not m_MainWindow.m_RawPartPage.m_bShowVar Then
' m_MainWindow.m_RawPartPage.UpdateRawPart()
' End If
' End Select
'End Sub
End Class
Namespace TreeViewItem
Public Class AlternativeCathegoryItem
Inherits AlternativeTreeViewItemBase
'Private m_sTitle As String
Private m_sPictureString As String
Private m_nFType As Integer
Private m_Items As ObservableCollection(Of CustomItem)
'Public Property Name As String
' Get
' Return m_sTitle
' End Get
' Set(value As String)
' m_sTitle = value
' End Set
'End Property
Public ReadOnly Property PictureString As String
Get
Return "/Resources/ToolsTreeViewImages/Folder.png"
End Get
End Property
Public ReadOnly Property nFType As Integer
Get
Return m_nFType
End Get
End Property
Public Property Items As ObservableCollection(Of CustomItem)
Get
Return m_Items
End Get
Set(value As ObservableCollection(Of CustomItem))
m_Items = value
End Set
End Property
Sub New(sName As String, nType As Integer)
Name = sName
m_nFType = nType
Me.Items = New ObservableCollection(Of CustomItem)
End Sub
End Class
Public Class ALternativeCustomItem
Inherits AlternativeTreeViewItemBase
'Private m_sTitle As String
Private m_nType As Integer
'Public Property Name As String
' Get
' Return m_sTitle
' End Get
' Set(value As String)
' m_sTitle = value
' End Set
'End Property
Public ReadOnly Property nType As Integer
Get
Return m_nType
End Get
End Property
Sub New(Title As String, nType As Integer)
Me.Name = Title
m_nType = nType
End Sub
End Class
Public Class AlternativePartCathegoryItem
Inherits AlternativeTreeViewItemBase
Private m_nFType As Integer
Private m_Items As ObservableCollection(Of PartCustomItem)
Public ReadOnly Property PictureString As String
Get
Return "/Resources/ToolsTreeViewImages/Folder.png"
End Get
End Property
Public ReadOnly Property nFType As Integer
Get
Return m_nFType
End Get
End Property
Public Property Items As ObservableCollection(Of PartCustomItem)
Get
Return m_Items
End Get
Set(value As ObservableCollection(Of PartCustomItem))
m_Items = value
End Set
End Property
Sub New(sName As String, nType As Integer)
Name = sName
m_nFType = nType
Me.Items = New ObservableCollection(Of PartCustomItem)
End Sub
End Class
Public Class AlternativePartCustomItem
Inherits AlternativeTreeViewItemBase
Private m_nType As Integer
Private m_bIsActive As Boolean
Private m_sText1 As String
Private m_sText2 As String
Public Property sText1 As String
Get
Return m_sText1
End Get
Set(value As String)
m_sText1 = value
NotifyPropertyChanged("sText1")
End Set
End Property
Public Property sText2 As String
Get
Return m_sText2
End Get
Set(value As String)
m_sText2 = value
NotifyPropertyChanged("sText2")
End Set
End Property
Public ReadOnly Property nType As Integer
Get
Return m_nType
End Get
End Property
Public Property bIsActive As Boolean
Get
Return m_bIsActive
End Get
Set(value As Boolean)
If value <> m_bIsActive Then
m_bIsActive = value
NotifyPropertyChanged("bIsActive")
End If
End Set
End Property
Sub New(Title As String, nType As Integer, sText1 As String, sText2 As String)
Me.Name = Title
m_nType = nType
m_sText1 = sText1
m_sText2 = sText2
m_bIsActive = True
End Sub
Sub New(Title As String, nType As Integer, sText1 As String, sText2 As String, bIsActive As Boolean)
Me.Name = Title
m_nType = nType
m_sText1 = sText1
m_sText2 = sText2
m_bIsActive = bIsActive
End Sub
End Class
Public Class AlternativeTreeViewItemBase
Implements INotifyPropertyChanged
Private m_Name As String
Public Property Name As String
Get
Return m_Name
End Get
Set(value As String)
If (value <> m_Name) Then
m_Name = value
NotifyPropertyChanged("Name")
End If
End Set
End Property
Private m_isSelected As Boolean
Public Property IsSelected As Boolean
Get
Return m_isSelected
End Get
Set(value As Boolean)
If (value <> m_isSelected) Then
m_isSelected = value
NotifyPropertyChanged("IsSelected")
End If
End Set
End Property
Private m_isExpanded As Boolean
Public Property IsExpanded As Boolean
Get
Return m_isExpanded
End Get
Set(value As Boolean)
If (value <> m_isExpanded) Then
m_isExpanded = value
NotifyPropertyChanged("IsExpanded")
End If
End Set
End Property
Public Event PropertyChanged As PropertyChangedEventHandler Implements INotifyPropertyChanged.PropertyChanged
Public Sub NotifyPropertyChanged(propName As String)
RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(propName))
End Sub
End Class
End Namespace
Namespace ArithmeticConverterNameSpace
Public Class AlternativeCheckboxConverter
Implements IMultiValueConverter
Public Function Convert(values() As Object, targetType As Type, parameter As Object, culture As Globalization.CultureInfo) As Object Implements IMultiValueConverter.Convert
If values.Length <> 2 Then
Throw New ArgumentException("There should be three values.")
End If
If String.IsNullOrEmpty(values(0).ToString) Then
values(0) = "0"
End If
If String.IsNullOrEmpty(values(1).ToString()) Then
values(2) = "0"
End If
Dim x As Double
If Not Double.TryParse(values(0).ToString(), x) Then
Throw New ArgumentException("values[0] must parse to double")
End If
Dim y As Double
If Not Double.TryParse(values(1).ToString(), y) Then
Throw New ArgumentException("values[0] must parse to double")
End If
Return (x / y) - 1
End Function
Public Function ConvertBack(value As Object, targetTypes() As Type, parameter As Object, culture As Globalization.CultureInfo) As Object() Implements IMultiValueConverter.ConvertBack
Throw New NotImplementedException()
End Function
End Class
End Namespace
OmagCUTDictionary.xaml
+93 -5
View File
@@ -99,9 +99,73 @@
<Thickness x:Key="RightComboBoxInBorder_Margin">2,0,10,0</Thickness>
<CornerRadius x:Key="Page_CornerRadius">9.5</CornerRadius> <!--2.5mm-->
<!-- ______________________________________________________________________________________________________________________ -->
<BitmapImage x:Key="AlignPiecesImg" UriSource="Resources/AlignPieces.png"></BitmapImage>
<BitmapImage x:Key="BarCodeImg" UriSource="Resources/BarCode.png"></BitmapImage>
<BitmapImage x:Key="BottomLeftImg" UriSource="Resources/BottomLeft.png"></BitmapImage>
<BitmapImage x:Key="BottomRightImg" UriSource="Resources/BottomRight.png"></BitmapImage>
<BitmapImage x:Key="ClockwiseRotateImg" UriSource="Resources/ClockwiseRotate.png"></BitmapImage>
<BitmapImage x:Key="CounterClockwiseRotateImg" UriSource="Resources/CounterClockwiseRotate.png"></BitmapImage>
<BitmapImage x:Key="CsvMinusImg" UriSource="Resources/CsvMinus.png"></BitmapImage>
<BitmapImage x:Key="CsvNewImg" UriSource="Resources/CsvNew.png"></BitmapImage>
<BitmapImage x:Key="CsvOpenImg" UriSource="Resources/CsvOpen.png"></BitmapImage>
<BitmapImage x:Key="CsvPlusImg" UriSource="Resources/CsvPlus.png"></BitmapImage>
<BitmapImage x:Key="CsvRuinedPartsImg" UriSource="Resources/CsvRuinedParts.png"></BitmapImage>
<BitmapImage x:Key="DownArrowImg" UriSource="Resources/DownArrow.png"></BitmapImage>
<BitmapImage x:Key="DrawImg" UriSource="Resources/Draw.png"></BitmapImage>
<BitmapImage x:Key="FrameMachiningImg" UriSource="Resources/FrameMachining.png"></BitmapImage>
<BitmapImage x:Key="GenericViewImg" UriSource="Resources/GenericView.png"></BitmapImage>
<BitmapImage x:Key="HalfTurnRotateImg" UriSource="Resources/HalfTurnRotate.png"></BitmapImage>
<BitmapImage x:Key="ImportImg" UriSource="Resources/Import.png"></BitmapImage>
<BitmapImage x:Key="LeftArrowImg" UriSource="Resources/LeftArrow.png"></BitmapImage>
<BitmapImage x:Key="LookFromTOPImg" UriSource="Resources/LookFromTOP.png"></BitmapImage>
<BitmapImage x:Key="ManualImg" UriSource="Resources/Manual.png"></BitmapImage>
<BitmapImage x:Key="MeasureImg" UriSource="Resources/Measure.png"></BitmapImage>
<BitmapImage x:Key="MHTImg" UriSource="Resources/MHT.png"></BitmapImage>
<BitmapImage x:Key="NestImg" UriSource="Resources/Nest.png"></BitmapImage>
<BitmapImage x:Key="NumericKeyboardArrowImg" UriSource="Resources/NumericKeyboardArrow.png"></BitmapImage>
<BitmapImage x:Key="OptionsImg" UriSource="Resources/Options.png"></BitmapImage>
<BitmapImage x:Key="PanImg" UriSource="Resources/Pan.png"></BitmapImage>
<BitmapImage x:Key="PhotoImg" UriSource="Resources/Photo.png"></BitmapImage>
<BitmapImage x:Key="RawPartImg" UriSource="Resources/RawPart.png"></BitmapImage>
<BitmapImage x:Key="RawProbeImg" UriSource="Resources/RawProbe.png"></BitmapImage>
<BitmapImage x:Key="RightArrowImg" UriSource="Resources/RightArrow.png"></BitmapImage>
<BitmapImage x:Key="SawProbeImg" UriSource="Resources/SawProbe.png"></BitmapImage>
<BitmapImage x:Key="SendImg" UriSource="Resources/Send.png"></BitmapImage>
<BitmapImage x:Key="SplitImg" UriSource="Resources/Split.png"></BitmapImage>
<BitmapImage x:Key="ToolChangerPosImg" UriSource="Resources/ToolChengerPos.png"></BitmapImage>
<BitmapImage x:Key="TopLeftImg" UriSource="Resources/TopLeft.png"></BitmapImage>
<BitmapImage x:Key="TopRightImg" UriSource="Resources/TopRight.png"></BitmapImage>
<BitmapImage x:Key="UpArrowImg" UriSource="Resources/UpArrow.png"></BitmapImage>
<BitmapImage x:Key="VImg" UriSource="Resources/V.png"></BitmapImage>
<BitmapImage x:Key="XImg" UriSource="Resources/X.png"></BitmapImage>
<BitmapImage x:Key="ZoomAllImg" UriSource="Resources/ZoomAll.png"></BitmapImage>
<BitmapImage x:Key="ZoomInImg" UriSource="Resources/ZoomIn.png"></BitmapImage>
<BitmapImage x:Key="ZoomOutImg" UriSource="Resources/ZoomOut.png"></BitmapImage>
<BitmapImage x:Key="ZoomWinImg" UriSource="Resources/ZoomWIn.png"></BitmapImage>
<BitmapImage x:Key="LogoOmagImg" UriSource="Resources/LogoOmag.jpg"></BitmapImage>
<BitmapImage x:Key="AvantiVeloceImg" UriSource="Resources/AvantiVeloce.png"></BitmapImage>
<BitmapImage x:Key="IndietroVeloceImg" UriSource="Resources/IndietroVeloce.png"></BitmapImage>
<BitmapImage x:Key="MaxMoveImg" UriSource="Resources/MaxMove.png"></BitmapImage>
<BitmapImage x:Key="PauseImg" UriSource="Resources/Pause.png"></BitmapImage>
<BitmapImage x:Key="PlayImg" UriSource="Resources/Play.png"></BitmapImage>
<BitmapImage x:Key="PlayStepImg" UriSource="Resources/PlayStep.png"></BitmapImage>
<BitmapImage x:Key="StopImg" UriSource="Resources/Stop.png"></BitmapImage>
<BitmapImage x:Key="VacuumImg" UriSource="Resources/Manual.png"></BitmapImage>
<!--Empty Border-->
<FontFamily x:Key="OmagCut_Font">./Resources/Fonts/#Century Gothic</FontFamily>
<SolidColorBrush x:Key="OmagCut_TreeViewBackGroundColor" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="OmagCut_TreeViewTextColor" Color="#000000" />
<SolidColorBrush x:Key="OmagCut_TreeViewDelimiterColor" Color="Transparent" />
<!-- ______________________________________________________________________________________________________________________ -->
<Style x:Key="OmagCut_TreeViewSelection" TargetType="{x:Type SolidColorBrush}">
<Setter Property="Color" Value="Yellow"/>
<Setter Property="Opacity" Value="0"/>
</Style>
<!--Empty Border-->
<Style x:Key="OmagCut_EmptyBorder" TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
<Setter Property="CornerRadius" Value="{StaticResource EmptyBorder_CornerRadius}"/>
@@ -197,7 +261,14 @@
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
</Style>
<!--GradientBlueOmagCutButton-->
<!--OmagCut_GradientBlueTextButtonPrjMgr-->
<Style x:Key="OmagCut_GradientBlueTextButtonPrjMgr" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button_Wrap}">
<Setter Property="Background" Value="{StaticResource OmagCut_GradientBlue}"/>
<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Blue}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
</Style>
<!--GradientBlueOmagCutButton-->
<Style x:Key="OmagCut_GradientBlueIconButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<Setter Property="Background" Value="{StaticResource OmagCut_GradientBlue}"/>
<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Blue}"/>
@@ -1081,7 +1152,11 @@
<Setter Property="ToggleButton.BorderBrush" Value="#FFADB2B5"/>
<Setter Property="ToggleButton.Foreground" Value="#FF838383"/>
</Trigger>
</Style.Triggers>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="#FFC4E5F6"/>
<Setter Property="BorderBrush" Value="#FF2C628B"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_ToggleButton_Wrap" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OmagCut_ToggleButton}">
@@ -1179,7 +1254,19 @@
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_DisabledYellowToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Style x:Key="OmagCut_ModifiedGradientYellowIconToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OmagCut_ToggleButton}">
<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Yellow}"/>
<Setter Property="Background" Value="{StaticResource OmagCut_GradientYellow}"/>
<Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="ToggleButton.Background" Value="{StaticResource OmagCut_Blue}" />
<Setter Property="ToggleButton.Foreground" Value="{StaticResource OmagCut_Yellow}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_DisabledYellowToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
<Setter Property="ControlExtensions:ToggleButtonExtensions.CornerRadius" Value="{StaticResource Button_CornerRadius}"/>
<Setter Property="Margin" Value="{StaticResource Button_MarginThickness}"/>
@@ -2361,6 +2448,7 @@
<PathGeometry x:Key="TreeArrow" Figures="M0,0 L0,6 L6,0 z"/>
<SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Fill" Color="Transparent"/>
<SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Stroke" Color="#FF989898"/>
<Style x:Key="ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
<Setter Property="Focusable" Value="False"/>
<Setter Property="Width" Value="16"/>
OmagCUTTestDictionary.xaml
+502 -2
View File
@@ -23,9 +23,79 @@
<system:Double x:Key="Button_CornerRadius">9.5</system:Double>
<!--2.5mm-->
<Thickness x:Key="BorderThickness">3.3</Thickness>
<!--<Thickness x:Key="BorderThickness">3.3</Thickness>-->
<Thickness x:Key="BorderThickness">0.5</Thickness>
<Thickness x:Key="MachLeftTextBoxInBorder_Margin">4,0,8,0</Thickness>
<SolidColorBrush x:Key="OmagCut_Gray" Color="Azure" />
<SolidColorBrush x:Key="OmagCut_Gray" Color="#484D55" />
<BitmapImage x:Key="AlignPiecesImg" UriSource="Resources/NewIcons/ruota-oggetto-inclinato.png"></BitmapImage>
<BitmapImage x:Key="BarCodeImg" UriSource="Resources/NewIcons/BarCode.png"></BitmapImage>
<BitmapImage x:Key="BottomLeftImg" UriSource="Resources/NewIcons/1-BottomLeft.png"></BitmapImage>
<BitmapImage x:Key="BottomRightImg" UriSource="Resources/NewIcons/1-BottomRight.png"></BitmapImage>
<BitmapImage x:Key="ClockwiseRotateImg" UriSource="Resources/NewIcons/ruota-oggetto-dx.png"></BitmapImage>
<BitmapImage x:Key="CounterClockwiseRotateImg" UriSource="Resources/NewIcons/ruota-oggetto-sx.png"></BitmapImage>
<BitmapImage x:Key="CsvMinusImg" UriSource="Resources/NewIcons/CsvMinus.png"></BitmapImage>
<BitmapImage x:Key="CsvNewImg" UriSource="Resources/NewIcons/CsvNew.png"></BitmapImage>
<BitmapImage x:Key="CsvOpenImg" UriSource="Resources/NewIcons/CsvOpen.png"></BitmapImage>
<BitmapImage x:Key="CsvPlusImg" UriSource="Resources/NewIcons/CsvPlus.png"></BitmapImage>
<BitmapImage x:Key="CsvRuinedPartsImg" UriSource="Resources/NewIcons/CsvRuinedParts.png"></BitmapImage>
<BitmapImage x:Key="DownArrowImg" UriSource="Resources/NewIcons/DownArrow.png"></BitmapImage>
<BitmapImage x:Key="DrawImg" UriSource="Resources/NewIcons/icone-tagli-3.png"></BitmapImage>
<BitmapImage x:Key="FrameMachiningImg" UriSource="Resources/NewIcons/FrameMachining.png"></BitmapImage>
<BitmapImage x:Key="GenericViewImg" UriSource="Resources/NewIcons/GenericView.png"></BitmapImage>
<BitmapImage x:Key="HalfTurnRotateImg" UriSource="Resources/Negative/HalfTurnRotate.png"></BitmapImage>
<BitmapImage x:Key="ImportImg" UriSource="Resources/NewIcons/icone-tagli-6.png"></BitmapImage>
<BitmapImage x:Key="LeftArrowImg" UriSource="Resources/NewIcons/LeftArrow.png"></BitmapImage>
<BitmapImage x:Key="LookFromTOPImg" UriSource="Resources/NewIcons/ico-3D.png"></BitmapImage>
<BitmapImage x:Key="ManualImg" UriSource="Resources/NewIcons/Manual.png"></BitmapImage>
<BitmapImage x:Key="MeasureImg" UriSource="Resources/NewIcons/ico-righello.png"></BitmapImage>
<BitmapImage x:Key="MHTImg" UriSource="Resources/NewIcons/MHT.png"></BitmapImage>
<BitmapImage x:Key="NestImg" UriSource="Resources/NewIcons/Nest.png"></BitmapImage>
<BitmapImage x:Key="NumericKeyboardArrowImg" UriSource="Resources/NewIcons/NumericKeyboardArrow.png"></BitmapImage>
<BitmapImage x:Key="OptionsImg" UriSource="Resources/NewIcons/Options.png"></BitmapImage>
<BitmapImage x:Key="PanImg" UriSource="Resources/NewIcons/ico-mano.png"></BitmapImage>
<BitmapImage x:Key="PhotoImg" UriSource="Resources/NewIcons/icone-tagli-1.png"></BitmapImage>
<BitmapImage x:Key="RawPartImg" UriSource="Resources/NewIcons/icone-tagli-5.png"></BitmapImage>
<BitmapImage x:Key="RawProbeImg" UriSource="Resources/NewIcons/RawProbe.png"></BitmapImage>
<BitmapImage x:Key="RightArrowImg" UriSource="Resources/NewIcons/RightArrow.png"></BitmapImage>
<BitmapImage x:Key="SawProbeImg" UriSource="Resources/NewIcons/SawProbe.png"></BitmapImage>
<BitmapImage x:Key="SendImg" UriSource="Resources/NewIcons/Send.png"></BitmapImage>
<BitmapImage x:Key="SplitImg" UriSource="Resources/NewIcons/Split.png"></BitmapImage>
<!--<BitmapImage x:Key="SplitImg" UriSource="Resources/NewIcons/icone-tagli-2.png"></BitmapImage>-->
<BitmapImage x:Key="ToolChangerPosImg" UriSource="Resources/NewIcons/ToolChengerPos.png"></BitmapImage>
<BitmapImage x:Key="TopLeftImg" UriSource="Resources/NewIcons/4-TopLeft.png"></BitmapImage>
<BitmapImage x:Key="TopRightImg" UriSource="Resources/NewIcons/3-TopRight.png"></BitmapImage>
<BitmapImage x:Key="UpArrowImg" UriSource="Resources/NewIcons/UpArrow.png"></BitmapImage>
<BitmapImage x:Key="VImg" UriSource="Resources/NewIcons/V.png"></BitmapImage>
<BitmapImage x:Key="XImg" UriSource="Resources/NewIcons/X.png"></BitmapImage>
<BitmapImage x:Key="ZoomAllImg" UriSource="Resources/NewIcons/ZoomAll.png"></BitmapImage>
<BitmapImage x:Key="ZoomInImg" UriSource="Resources/NewIcons/Zoom+.png"></BitmapImage>
<BitmapImage x:Key="ZoomOutImg" UriSource="Resources/NewIcons/Zoom-.png"></BitmapImage>
<BitmapImage x:Key="ZoomWinImg" UriSource="Resources/NewIcons/ZoomWIn.png"></BitmapImage>
<BitmapImage x:Key="LogoOmagImg" UriSource="Resources/NewIcons/logo-OmCut.png"></BitmapImage>
<!--Nuove icone da sistemare-->
<BitmapImage x:Key="AvantiVeloceImg" UriSource="Resources/NewIcons/AvantiVeloce.png"></BitmapImage>
<BitmapImage x:Key="IndietroVeloceImg" UriSource="Resources/NewIcons/IndietroVeloce.png"></BitmapImage>
<BitmapImage x:Key="MaxMoveImg" UriSource="Resources/NewIcons/MaxMove.png"></BitmapImage>
<BitmapImage x:Key="PauseImg" UriSource="Resources/NewIcons/Pause.png"></BitmapImage>
<BitmapImage x:Key="PlayImg" UriSource="Resources/NewIcons/Play.png"></BitmapImage>
<BitmapImage x:Key="PlayStepImg" UriSource="Resources/NewIcons/PlayStep.png"></BitmapImage>
<BitmapImage x:Key="StopImg" UriSource="Resources/NewIcons/Stop.png"></BitmapImage>
<BitmapImage x:Key="VacuumImg" UriSource="Resources/NewIcons/Vacuum.png"></BitmapImage>
<FontFamily x:Key="OmagCut_Font">./Resources/Fonts/#Roboto</FontFamily>
<SolidColorBrush x:Key="OmagCut_TreeViewBackGroundColor" Color="#636974" />
<SolidColorBrush x:Key="OmagCut_TreeViewTextColor" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="OmagCut_TreeViewDelimiterColor" Color="#FFFFFFFF" />
<Style TargetType="{x:Type ListBox}">
<Setter Property="Background" Value="#636974"/>
<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Blue}"/>
<Setter Property="BorderThickness" Value="2"/>
</Style>
<!--Button generico-->
<Style x:Key="OmagCut_Button2" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
@@ -51,4 +121,434 @@
</Style.Triggers>-->
</Style>
<Style x:Key="OmagCut_TreeViewSelection" TargetType="{x:Type SolidColorBrush}">
<Setter Property="Color" Value="Yellow"/>
<Setter Property="Opacity" Value="0.4"/>
</Style>
<Style x:Key="OmagCut_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource OmagCut_EmptyBorder}">
<!--<Setter Property="Background" Value="#636974"/>
<Setter Property="BorderBrush" Value="#636974"/>-->
<Setter Property="Background" Value="#3C3F48"/>
<Setter Property="BorderBrush" Value="#3C3F48"/>
</Style>
<Style x:Key="OmagCut_EmptyBorder" TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
<Setter Property="CornerRadius" Value="{DynamicResource EmptyBorder_CornerRadius}"/>
<Setter Property="Margin" Value="1" />
</Style>
<Style x:Key="OmagCut_Page2Border" TargetType="{x:Type Border}" BasedOn="{StaticResource OmagCut_EmptyBorder}">
<Setter Property="Background" Value="#636974"/>
<Setter Property="BorderBrush" Value="#636974"/>
</Style>
<Style x:Key="OmagCut_FixedTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_TextBox}">
<Setter Property="Background" Value="#2D3036"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="IsReadOnly" Value="True"/>
<Setter Property="IsEnabled" Value="False"/>
<Setter Property="Template" Value="{StaticResource FixedTextBoxTemplate}" />
</Style>
<Style x:Key="OmagCut_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
<Setter Property="project:ButtonExtensions.CornerRadius" Value="{DynamicResource Button_CornerRadius}"/>
<Setter Property="Margin" Value="{StaticResource Button_MarginThickness}"/>
<Setter Property="Padding" Value="5"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="TextBlock.TextAlignment" Value="Center"/>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<!--<Setter Property="Background" Value="#FFB8C3CD"/>
<Setter Property="BorderBrush" Value="#FFB8C3CD"/>-->
<Setter Property="Background" Value="#008BFF"/>
<Setter Property="BorderBrush" Value="#008BFF"/>
</Trigger>
<Trigger Property="IsPressed" Value="True">
<!--<Setter Property="OpacityMask" Value="#33FF0000"/>-->
<Setter Property="Background" Value="#E1B957"/>
<Setter Property="BorderBrush" Value="#E1B957"/>
</Trigger>
<Trigger Property="ToggleButton.IsChecked" Value="True">
<Setter Property="Background" Value="Transparent"/>
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="#FFF4F4F4"/>
<Setter Property="BorderBrush" Value="#FFADB2B5"/>
<Setter Property="TextElement.Foreground" Value="#FF838383"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_Button_Wrap" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<Setter Property="ContentTemplate" Value="{StaticResource Button_DataTemplate_Wrap}" />
<Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}" />
</Style>
<Style x:Key="OmagCut_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
<Setter Property="ControlExtensions:ToggleButtonExtensions.CornerRadius" Value="{DynamicResource Button_CornerRadius}"/>
<Setter Property="Margin" Value="{StaticResource Button_MarginThickness}"/>
<Setter Property="Padding" Value="5"/>
<Setter Property="TextBlock.TextAlignment" Value="Center"/>
<Style.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="ToggleButton.Background" Value="#FFF4F4F4"/>
<Setter Property="ToggleButton.BorderBrush" Value="#FFADB2B5"/>
<Setter Property="ToggleButton.Foreground" Value="#FF838383"/>
</Trigger>
<Trigger Property="IsChecked" Value="True">
<Setter Property="ToggleButton.BorderBrush" Value="{StaticResource OmagCut_Blue}" />
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#008BFF"/>
<Setter Property="BorderBrush" Value="#008BFF"/>
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="#E1B957"/>
<Setter Property="BorderBrush" Value="#E1B957"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_ToggleButton_Wrap" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OmagCut_ToggleButton}">
<Setter Property="ContentTemplate" Value="{StaticResource ToggleButton_DataTemplate_Wrap}" />
</Style>
<Style x:Key="OmagCut_TopGrayGradientYellowButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="BorderBrush" Value="#1C1D22"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_BottomGrayGradientYellowButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="BorderBrush" Value="#1C1D22"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_LeftGrayGradientYellowButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="BorderBrush" Value="#1C1D22"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_RightGrayGradientYellowButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="BorderBrush" Value="#1C1D22"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_RightGrayGradientYellowTextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button_Wrap}">
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="BorderBrush" Value="#1C1D22"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_YellowIconToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OmagCut_ToggleButton}">
<Setter Property="Background" Value="#636974"/>
<Setter Property="BorderBrush" Value="#636974"/>
<Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="ToggleButton.Background" Value="#145993" />
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_CalculatorTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_TextBox}">
<Setter Property="Keyboard" Value="Calculator"/>
<Setter Property="KeyboardDimension" Value="300"/>
<Setter Property="Background" Value="#636974"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_MachToolCalculatorTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource MachToolLeftTextBoxNoBorder_Margin}"/>
<Setter Property="Background" Value="#636974"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_YellowTextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button_Wrap}">
<Setter Property="Background" Value="#2D3036"/>
<Setter Property="BorderBrush" Value="#2D3036"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_YellowToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OmagCut_ToggleButton_Wrap}">
<Setter Property="Background" Value="#2D3036"/>
<Setter Property="BorderBrush" Value="#2D3036"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="ToggleButton.Background" Value="{StaticResource OmagCut_Blue}" />
<Setter Property="ToggleButton.BorderBrush" Value="{StaticResource OmagCut_Blue}" />
<Setter Property="ToggleButton.Foreground" Value="{StaticResource OmagCut_Yellow}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_YellowGradientYellowTextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button_Wrap}">
<Setter Property="Background" Value="#2D3036"/>
<Setter Property="BorderBrush" Value="#2D3036"/>
<!--<Setter Property="BorderBrush" Value="#636974"/>-->
<Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_GradientBlueTextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button_Wrap}">
<!--<Setter Property="Background" Value= "#2D3036"/>-->
<Setter Property="Background" Value= "{StaticResource OmagCut_BottomGradientGray}"/>
<Setter Property="BorderBrush" Value="#636974"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_GradientBlueTextButtonPrjMgr" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button_Wrap}">
<Setter Property="Background" Value= "#2D3036"/>
<Setter Property="BorderBrush" Value="#636974"/>
<Setter Property="BorderThickness" Value="2"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_BlueToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OmagCut_ToggleButton_Wrap}">
<Setter Property="Background" Value="#636974"/>
<Setter Property="BorderBrush" Value="#636974"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="ToggleButton.Background" Value="{StaticResource OmagCut_Blue}" />
<Setter Property="ToggleButton.BorderBrush" Value="{StaticResource OmagCut_Blue}" />
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_BlueIconToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OmagCut_ToggleButton}">
<Setter Property="Background" Value="#636974"/>
<Setter Property="BorderBrush" Value="#636974"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="ToggleButton.Background" Value="{StaticResource OmagCut_Blue}" />
<Setter Property="ToggleButton.BorderBrush" Value="{StaticResource OmagCut_Blue}" />
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_BlueIconButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<Setter Property="Background" Value="#636974"/>
<Setter Property="BorderBrush" Value="#636974"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_RightGrayYellowIconToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OmagCut_ToggleButton}">
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="BorderBrush" Value="#1C1D22"/>
<!--<Setter Property="BorderBrush" Value="#636974"/>-->
<Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="ToggleButton.Background" Value="{StaticResource OmagCut_Blue}" />
<Setter Property="ToggleButton.BorderBrush" Value="{StaticResource OmagCut_Blue}" />
<Setter Property="ToggleButton.Foreground" Value="{StaticResource OmagCut_Yellow}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_CurrProjSummeryTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_LowerCaseCharacterTextBlock}">
<Setter Property="Foreground" Value="White"/>
<Setter Property="TextWrapping" Value="NoWrap"/>
<Setter Property="Margin" Value="6,0,0,0"/>
</Style>
<Style x:Key="OmagCut_PageBorder" TargetType="{x:Type Border}" >
<Setter Property="CornerRadius" Value="{StaticResource Page_CornerRadius}"/>
<Setter Property="Background" Value="{StaticResource OmagCut_Gray}"/>
</Style>
<Style x:Key="OmagCut_YellowGradientYellowIconButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="BorderBrush" Value="#1C1D22"/>
<!--<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Yellow}"/>-->
</Style>
<Style x:Key="OmagCut_GradientYellowIconToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OmagCut_ToggleButton}">
<!--<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Yellow}"/>-->
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="BorderBrush" Value="#1C1D22"/>
<Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="ToggleButton.Background" Value="{StaticResource OmagCut_Blue}" />
<Setter Property="ToggleButton.Foreground" Value="{StaticResource OmagCut_Yellow}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_MachineCommandsYellowGradientYellowIconButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
<Setter Property="project:ButtonExtensions.CornerRadius" Value="{DynamicResource Button_CornerRadius}"/>
<Setter Property="Margin" Value="{StaticResource Button_MarginThickness}"/>
<Setter Property="Padding" Value="5"/>
<Setter Property="TextBlock.TextAlignment" Value="Center"/>
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="BorderBrush" Value="#1C1D22"/>
<Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
<Style.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="ToggleButton.Background" Value="#FFF4F4F4"/>
<Setter Property="ToggleButton.BorderBrush" Value="#FFADB2B5"/>
<Setter Property="ToggleButton.Foreground" Value="#FF838383"/>
</Trigger>
<Trigger Property="ToggleButton.IsChecked" Value="True">
<Setter Property="ToggleButton.BorderBrush" Value="{StaticResource OmagCut_Blue}" />
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#008BFF"/>
<Setter Property="BorderBrush" Value="#008BFF"/>
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="#E1B957"/>
<Setter Property="BorderBrush" Value="#E1B957"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_ModifiedGradientYellowIconToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OmagCut_ToggleButton}">
<Setter Property="BorderBrush" Value="#1C1D22"/>
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="ToggleButton.Background" Value="{StaticResource OmagCut_Blue}" />
<Setter Property="ToggleButton.Foreground" Value="{StaticResource OmagCut_Yellow}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_YellowIconButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="BorderBrush" Value="#1C1D22"/>
<!--<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Yellow}"/>-->
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_RightGrayYellowTextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource OmagCut_ToggleButton_Wrap}">
<!--<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Yellow}"/>-->
<Setter Property="Background" Value="#1C1D22"/>
<Setter Property="BorderBrush" Value="#1C1D22"/>
<Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="ToggleButton.Background" Value="{StaticResource OmagCut_Blue}" />
<Setter Property="ToggleButton.Foreground" Value="{StaticResource OmagCut_Yellow}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="OmagCut_GradientBlueIconButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<Setter Property="Background" Value="#2D3036"/>
<Setter Property="BorderBrush" Value="#2D3036"/>
<!--<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Blue}"/>-->
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
</Style>
<Style x:Key="OmagCut_CenteredLowerCaseCharacterTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_UpperCaseCharacterTextBlock}">
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_KeyboardTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_TextBox}">
<Setter Property="Keyboard" Value="Alphanumeric"/>
<Setter Property="KeyboardDimension" Value="600"/>
<Setter Property="Background" Value="#636974"/>
<Setter Property="Foreground" Value="Black"/>
</Style>
<Style x:Key="OmagCut_LowerCaseCharacterTextBlock" TargetType="{x:Type TextBlock}">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<DataTemplate x:Key="GroupBoxHeaderTemplate">
<TextBlock Text="{Binding}" FontSize="{DynamicResource FontSize_GroupBoxHeader}" Foreground="White"/>
</DataTemplate>
<Style x:Key="OmagCut_GroupBox" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource {x:Type GroupBox}}">
<Setter Property="BorderBrush" Value="LightGray"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}" />
<Setter Property="HeaderTemplate" Value="{StaticResource GroupBoxHeaderTemplate}"/>
<Setter Property="ControlExtensions:GroupBoxExtensions.CornerRadius" Value="{DynamicResource GroupBox_CornerRadius}" />
<Setter Property="ControlExtensions:GroupBoxExtensions.FirstColumn" Value="{StaticResource GroupBox_FirstColumn}" />
</Style>
<Style x:Key="OmagCut_ToolsDBTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_LowerCaseCharacterTextBlock}">
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="Margin" Value="10,0,0,0"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_NoNameGroupBorder" TargetType="{x:Type Border}" BasedOn="{StaticResource OmagCut_EmptyBorder}">
<Setter Property="BorderBrush" Value="LightGray"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
</Style>
<Style x:Key="OmagCut_LeftKeyboardTextBoxNoBorder" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_KeyboardTextBox}">
<Setter Property="Margin" Value="{DynamicResource LeftTextBoxNoBorder_Margin}"/>
<Setter Property="Background" Value="#636974"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_LeftCalculatorTextBoxNoBorder" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource LeftTextBoxNoBorder_Margin}"/>
<Setter Property="Background" Value="#636974"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_RightCalculatorTextBoxInBorder" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource RightTextBoxInBorder_Margin}"/>
<Setter Property="Background" Value="#636974"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_LeftCalculatorTextBoxInBorder" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource LeftTextBoxInBorder_Margin}"/>
<Setter Property="Background" Value="#636974"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style x:Key="OmagCut_CalculatorTextBoxInGroupBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Background" Value="#636974"/>
</Style>
<Style x:Key="OmagCut_MachLeftCalculatorTextBoxInBorder" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource MachLeftTextBoxInBorder_Margin}"/>
</Style>
<Style x:Key="OmagCut_MachRightCalculatorTextBoxInBorder" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
<Setter Property="Margin" Value="{DynamicResource MachRightTextBoxInBorder_Margin}"/>
</Style>
<Style x:Key="OmagCut_WindowGrayTextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button_Wrap}">
<Setter Property="Background" Value="LightGray"/>
<!--<Setter Property="BorderBrush" Value="LightGray"/>-->
<Setter Property="BorderBrush" Value="{StaticResource OmagCut_DarkGray}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
</Style>
<Style x:Key="OmagCut_WindowBorder" TargetType="{x:Type Border}" BasedOn="{StaticResource OmagCut_EmptyBorder}">
<Setter Property="CornerRadius" Value="{StaticResource Page_CornerRadius}"/>
<Setter Property="BorderBrush" Value="{StaticResource OmagCut_DarkGray}"/>
<Setter Property="Background" Value="LightGray"/>
</Style>
</ResourceDictionary>
OpenFileWD.xaml
+6 -6
View File
@@ -2,10 +2,10 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
FontFamily="./Resources/Fonts/#Century Gothic"
FontFamily="{DynamicResource OmagCut_Font}"
Title="OpenFile" Height="682.6" Width="426.6" WindowStyle="None" ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" Background="Transparent">
<Border Style="{StaticResource OmagCut_Border}">
<Border Style="{DynamicResource OmagCut_Border}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
@@ -34,11 +34,11 @@
<ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions>
<Button Name="OkBtn" Grid.Column="1" Style="{StaticResource OmagCut_GradientBlueIconButton}" IsDefault="True">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="ExitBtn" Grid.Column="3" Style="{StaticResource OmagCut_GradientBlueIconButton}" IsCancel="True">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
OpenPageUC.xaml
+8 -8
View File
@@ -29,13 +29,13 @@
</Grid>
<TextBlock Name="FilePathTxBl" Foreground="White" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
<TextBlock Name="FilePathTxBl" Foreground="White" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
<ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
ItemsSource="{Binding ItemList}"/>
<Border Name="MessageBrd" Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
<TextBlock Name="MessageTxBx" TextAlignment="Center"
Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
</Border>
<!-- Definizione della Grid Inferiore per i Button V e X -->
@@ -48,16 +48,16 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="BarCodeBtn" Grid.Column="0" Style="{StaticResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="Resources/BarCode.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="BarCodeBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="{DynamicResource BarCodeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="OkBtn" Grid.Column="3" Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/V.png" Width="65" Height="65" HorizontalAlignment="Center"
<Button Name="OkBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource VImg}" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
<Button Name="ExitBtn" Grid.Column="4" Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/X.png" Width="65" Height="65" HorizontalAlignment="Center"
<Button Name="ExitBtn" Grid.Column="4" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource XImg}" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
OptionsPageUC.xaml
+46 -46
View File
@@ -25,7 +25,7 @@
<RowDefinition Height="2*"/>
</Grid.RowDefinitions>
<GroupBox Name="LanguageGpBx" Grid.RowSpan="3" Style="{StaticResource OmagCut_GroupBox}">
<GroupBox Name="LanguageGpBx" Grid.RowSpan="3" Style="{DynamicResource OmagCut_GroupBox}">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
@@ -50,7 +50,7 @@
</ComboBox>
<TextBlock Name="LanguageMsgTxBl" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
</Grid>
</GroupBox>
@@ -58,7 +58,7 @@
<GroupBox Name="UnitsOfMeasureGpBx"
Grid.Column="1"
Grid.RowSpan="3"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
@@ -85,7 +85,7 @@
<GroupBox Name="TextColorGpBx"
Grid.Column="2" Grid.RowSpan="3" Grid.ColumnSpan="1"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.25*"/>
@@ -107,7 +107,7 @@
<GroupBox Name="FastGridGpBx"
Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.25*"/>
@@ -123,19 +123,19 @@
<ToggleButton Name="EnableFastGridBtn"
Grid.Row="1" Grid.Column="2"
Style="{StaticResource OmagCut_YellowToggleButton}" />
Style="{DynamicResource OmagCut_YellowToggleButton}" />
<TextBlock Name="FastGridTxBl"
Grid.Column="1" Grid.Row="1"
Margin="0,0,5,0"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left" />
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left" />
</Grid>
</GroupBox>
<GroupBox Name="SlabGpBx" Grid.RowSpan="1"
Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
@@ -149,35 +149,35 @@
</Grid.RowDefinitions>
<TextBlock Name="SlabLayerMsgTxBl" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<TextBlock Name="PartsLayerMsgTxBl" Grid.Column="0" Grid.Row="1"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<TextBlock Name="ScrapLayerMsgTxBl" Grid.Column="0" Grid.Row="2"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<TextBlock Name="StdThickMsgTxBl" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="SlabLayerMsgTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
Style="{StaticResource OmagCut_LeftKeyboardTextBoxNoBorder}" />
Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}" />
<EgtWPFLib:EgtTextBox Name="PartsLayerMsgTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
Style="{StaticResource OmagCut_LeftKeyboardTextBoxNoBorder}" />
Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}" />
<EgtWPFLib:EgtTextBox Name="ScrapLayerMsgTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
Style="{StaticResource OmagCut_LeftKeyboardTextBoxNoBorder}" />
Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}" />
<EgtWPFLib:EgtTextBox Name="StdThickMsgTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
</Grid>
</GroupBox>
<GroupBox Name="ColorToSideAngGpBx" Grid.RowSpan="3"
Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -217,19 +217,19 @@
<CheckBox Name="CTSAboxEnableChBx" Grid.Column="0" Grid.Row="0"
Style="{StaticResource OmagCut_CheckBox_Single}" Margin="0,0,10,0"/>
<TextBlock Name="CTSAboxEnableMsgTxBl" Grid.Column="1" Grid.Row="0"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left" />
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left" />
<TextBlock Name="ToleranceMsgTxBl" Grid.Column="3" Grid.Row="0"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="ToleranceMsgTxBx" Grid.Column="4" Grid.Row="0" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
</Grid>
<TextBlock Name="TalloneMsgTxBl" Grid.Column="5" Grid.Row="1" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<TextBlock Name="InclinazioneMsgTxBl" Grid.Column="3" Grid.Row="1"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<CheckBox Name="CTSA1EnableChBx" Grid.Column="0" Grid.Row="2"
@@ -237,27 +237,27 @@
<Button Name="CTSA1Btn" Grid.Row="2" Grid.Column="1"
Style="{StaticResource OmagCut_Button}" />
<EgtWPFLib:EgtTextBox Name="CTSA1TalloneTxBx" Grid.Column="5" Grid.Row="2" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="CTSA1InclinazioneTxBx" Grid.Column="3" Grid.Row="2" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<CheckBox Name="CTSA2EnableChBx" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OmagCut_CheckBox_Single}" Margin="0,0,10,0"/>
<Button Name="CTSA2Btn" Grid.Row="3" Grid.Column="1"
Style="{StaticResource OmagCut_Button}" />
<EgtWPFLib:EgtTextBox Name="CTSA2TalloneTxBx" Grid.Column="5" Grid.Row="3" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="CTSA2InclinazioneTxBx" Grid.Column="3" Grid.Row="3" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<CheckBox Name="CTSA3EnableChBx" Grid.Column="0" Grid.Row="4"
Style="{StaticResource OmagCut_CheckBox_Single}" Margin="0,0,10,0"/>
<Button Name="CTSA3Btn" Grid.Row="4" Grid.Column="1"
Style="{StaticResource OmagCut_Button}" />
<EgtWPFLib:EgtTextBox Name="CTSA3TalloneTxBx" Grid.Column="5" Grid.Row="4" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<EgtWPFLib:EgtTextBox Name="CTSA3InclinazioneTxBx" Grid.Column="3" Grid.Row="4" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<CheckBox Name="CTSA4EnableChBx" Grid.Column="0" Grid.Row="5"
Style="{StaticResource OmagCut_CheckBox_Single}" Margin="0,0,10,0"/>
@@ -266,11 +266,11 @@
<TextBlock Name="CTSA4TalloneMsgTxBl" Grid.Column="2" Grid.Row="5"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA4TalloneTxBx" Grid.Column="5" Grid.Row="5" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="CTSA4InclinazioneMsgTxBl" Grid.Column="4" Grid.Row="5"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA4InclinazioneTxBx" Grid.Column="3" Grid.Row="5" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<CheckBox Name="CTSA5EnableChBx" Grid.Column="0" Grid.Row="6"
Style="{StaticResource OmagCut_CheckBox_Single}" Margin="0,0,10,0"/>
@@ -279,11 +279,11 @@
<TextBlock Name="CTSA5TalloneMsgTxBl" Grid.Column="2" Grid.Row="6"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA5TalloneTxBx" Grid.Column="5" Grid.Row="6" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="CTSA5InclinazioneMsgTxBl" Grid.Column="4" Grid.Row="6"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA5InclinazioneTxBx" Grid.Column="3" Grid.Row="6" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<CheckBox Name="CTSA6EnableChBx" Grid.Column="0" Grid.Row="7"
Style="{StaticResource OmagCut_CheckBox_Single}" Margin="0,0,10,0"/>
@@ -292,11 +292,11 @@
<TextBlock Name="CTSA6TalloneMsgTxBl" Grid.Column="2" Grid.Row="7"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA6TalloneTxBx" Grid.Column="5" Grid.Row="7" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="CTSA6InclinazioneMsgTxBl" Grid.Column="4" Grid.Row="7"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA6InclinazioneTxBx" Grid.Column="3" Grid.Row="7" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<CheckBox Name="CTSA7EnableChBx" Grid.Column="0" Grid.Row="8"
Style="{StaticResource OmagCut_CheckBox_Single}" Margin="0,0,10,0"/>
@@ -305,11 +305,11 @@
<TextBlock Name="CTSA7TalloneMsgTxBl" Grid.Column="2" Grid.Row="8"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA7TalloneTxBx" Grid.Column="5" Grid.Row="8" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="CTSA7InclinazioneMsgTxBl" Grid.Column="4" Grid.Row="8"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA7InclinazioneTxBx" Grid.Column="3" Grid.Row="8" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<CheckBox Name="CTSA8EnableChBx" Grid.Column="0" Grid.Row="9"
Style="{StaticResource OmagCut_CheckBox_Single}" Margin="0,0,10,0"/>
@@ -318,11 +318,11 @@
<TextBlock Name="CTSA8TalloneMsgTxBl" Grid.Column="2" Grid.Row="9"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA8TalloneTxBx" Grid.Column="5" Grid.Row="9" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="CTSA8InclinazioneMsgTxBl" Grid.Column="4" Grid.Row="9"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA8InclinazioneTxBx" Grid.Column="3" Grid.Row="9" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<CheckBox Name="CTSA9EnableChBx" Grid.Column="0" Grid.Row="10"
Style="{StaticResource OmagCut_CheckBox_Single}" Margin="0,0,10,0"/>
@@ -331,11 +331,11 @@
<TextBlock Name="CTSA9TalloneMsgTxBl" Grid.Column="2" Grid.Row="10"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA9TalloneTxBx" Grid.Column="5" Grid.Row="10" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="CTSA9InclinazioneMsgTxBl" Grid.Column="4" Grid.Row="10"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA9InclinazioneTxBx" Grid.Column="3" Grid.Row="10" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<CheckBox Name="CTSA10EnableChBx" Grid.Column="0" Grid.Row="11"
Style="{StaticResource OmagCut_CheckBox_Single}" Margin="0,0,10,0"/>
@@ -344,11 +344,11 @@
<TextBlock Name="CTSA10TalloneMsgTxBl" Grid.Column="2" Grid.Row="11"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA10TalloneTxBx" Grid.Column="5" Grid.Row="11" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
<TextBlock Name="CTSA10InclinazioneMsgTxBl" Grid.Column="4" Grid.Row="11"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
<EgtWPFLib:EgtTextBox Name="CTSA10InclinazioneTxBx" Grid.Column="3" Grid.Row="11" Margin="10,0,10,0"
Style="{StaticResource OmagCut_CalculatorTextBox}" />
Style="{DynamicResource OmagCut_CalculatorTextBox}" />
</Grid>
</GroupBox>
@@ -357,7 +357,7 @@
Grid.Column="1"
Grid.Row="5"
Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
@@ -384,7 +384,7 @@
<GroupBox Name="FeedbackGpBx"
Grid.Column="4" Grid.RowSpan="3" Grid.ColumnSpan="1"
Style="{StaticResource OmagCut_GroupBox}">
Style="{DynamicResource OmagCut_GroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.25*"/>
@@ -399,8 +399,8 @@
<Button Name="FeedbackBtn"
Grid.Row="1" Grid.Column="1"
Style="{StaticResource OmagCut_YellowIconButton}">
<Image Source="Resources/Send.png" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
Style="{DynamicResource OmagCut_YellowIconButton}">
<Image Source="{DynamicResource SendImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
</Button>
</Grid>
OptionsPageUC.xaml.vb
+32 -6
View File
@@ -7,7 +7,7 @@ Public Class OptionsPageUC
Dim m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
Private UnitsList() As String = {"inch", "mm"}
Private ThemesList() As String = {"OmagCUT Classic", "OmagCUT Alternative", "OmagCUT Test"}
Private ThemesList() As String = {"OmagCUT Classic", "OmagCUT Test"}
Private Sub OptionsPageUC_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
@@ -25,10 +25,11 @@ Public Class OptionsPageUC
UnitsOfMeasureCmBx.SelectedIndex = If(EgtUiUnitsAreMM(), 1, 0)
' Imposto il tema corrente
ThemesCmBx.SelectedIndex = 0
ThemesCmBx.SelectedIndex = GetPrivateProfileInt(S_GENERAL, K_THEME, 0, m_MainWindow.GetIniFile())
Themes_StartUp()
' Rendo invisibile il GroupBox dei Temi la versione corrente
ThemesGpBx.Visibility = Windows.Visibility.Collapsed
' ThemesGpBx.Visibility = Windows.Visibility.Collapsed
' Leggo se la modalità FastGrid è abilitata, e controllo bit su chiave
If GetPrivateProfileInt(S_FASTGRID, K_FG_ENABLE, 0, m_MainWindow.GetIniFile()) <> 0 Then
@@ -208,9 +209,34 @@ Public Class OptionsPageUC
Private Sub ThemesCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles ThemesCmBx.SelectionChanged
Dim app As Application = Application.Current
If (ThemesCmBx.SelectedIndex = 0) Then app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTClassicDictionary.xaml", UriKind.Relative))
If (ThemesCmBx.SelectedIndex = 1) Then app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTAlternativeDictionary.xaml", UriKind.Relative))
If (ThemesCmBx.SelectedIndex = 2) Then app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTTestDictionary.xaml", UriKind.Relative))
If (ThemesCmBx.SelectedIndex = 0) Then
'app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTClassicDictionary.xaml", UriKind.Relative))
'm_MainWindow.EgtWPFInit()
WritePrivateProfileString(S_GENERAL, K_THEME, 0, m_MainWindow.GetIniFile())
End If
If (ThemesCmBx.SelectedIndex = 1) Then
'app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTTestDictionary.xaml", UriKind.Relative))
'Application.Current.Resources("GroupBox_CornerRadius") = 3
'Application.Current.Resources("Button_CornerRadius") = 3
'Application.Current.Resources("EmptyBorder_CornerRadius") = New CornerRadius(3)
'm_MainWindow.EgtWPFInit()
WritePrivateProfileString(S_GENERAL, K_THEME, 1, m_MainWindow.GetIniFile())
End If
End Sub
Private Sub Themes_StartUp()
Dim app As Application = Application.Current
If (ThemesCmBx.SelectedIndex = 0) Then
app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTClassicDictionary.xaml", UriKind.Relative))
m_MainWindow.EgtWPFInit()
End If
If (ThemesCmBx.SelectedIndex = 1) Then
app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTTestDictionary.xaml", UriKind.Relative))
Application.Current.Resources("GroupBox_CornerRadius") = 3
Application.Current.Resources("Button_CornerRadius") = 3
Application.Current.Resources("EmptyBorder_CornerRadius") = New CornerRadius(3)
m_MainWindow.EgtWPFInit()
End If
End Sub
Private Sub EnableFastGridBtn_Checked(sender As Object, e As RoutedEventArgs) Handles EnableFastGridBtn.Checked
PhotoPageUC.xaml
+5 -5
View File
@@ -19,7 +19,7 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Name="FilePathTxBl" Foreground="White" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
<TextBlock Name="FilePathTxBl" Foreground="White" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
<ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
ItemsSource="{Binding ItemList}"/>
@@ -42,11 +42,11 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="OkBtn" Grid.Column="1" Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/V.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="ExitBtn" Grid.Column="2" Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/X.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
</Grid>
ProjectMgrUC.xaml
+10 -10
View File
@@ -22,25 +22,25 @@
</Grid.ColumnDefinitions>
<Button Name="NewBtn" Grid.Column="0"
Style="{StaticResource OmagCut_YellowGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
<Button Name="LoadBtn" Grid.Column="1"
Style="{StaticResource OmagCut_YellowGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
<Button Name="SaveBtn" Grid.Column="2"
Style="{StaticResource OmagCut_YellowGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
<Button Name="SaveNameBtn" Grid.Column="3"
Style="{StaticResource OmagCut_YellowGradientYellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
<Button Name="CSVBtn" Grid.Column="4"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<ToggleButton Name="VeinMatchingBtn" Grid.Column="5"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="RegisterBtn" Grid.Column="6"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<Button Name="ResetCutBtn" Grid.Column="7"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
<Button Name="SimulateBtn" Grid.Column="8" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
<Button Name="WorkBtn" Grid.Column="9" Style="{StaticResource OmagCut_GradientBlueTextButton}"/>
<Button Name="SimulateBtn" Grid.Column="8" Style="{DynamicResource OmagCut_GradientBlueTextButtonPrjMgr}"/>
<Button Name="WorkBtn" Grid.Column="9" Style="{DynamicResource OmagCut_GradientBlueTextButtonPrjMgr}"/>
</Grid>
RawPartPageUC.xaml
+29 -29
View File
@@ -45,9 +45,9 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<RadioButton Name="OutlineBtn" Style="{StaticResource OmagCut_YellowToggleButton}"
<RadioButton Name="OutlineBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
GroupName="DefinitionMethod_GrezzoUC"/>
<RadioButton Name="DamagedBtn" Style="{StaticResource OmagCut_YellowToggleButton}"
<RadioButton Name="DamagedBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
Grid.Column="1" GroupName="DefinitionMethod_GrezzoUC"/>
<!-- Definizione della Grid per definizione grezzo -->
@@ -75,29 +75,29 @@
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock Name="LengthTxBl" Grid.Row="1" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
<TextBlock Name="LengthTxBl" Grid.Row="1" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="LengthTxBx" Grid.Column="1" Grid.Row="1" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="WidthTxBl" Grid.Row="2" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="WidthTxBl" Grid.Row="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="2" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="HeightTxBl" Grid.Row="3" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="HeightTxBl" Grid.Row="3" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="3" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="OffsetXTxBl" Grid.Row="4" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="OffsetXTxBl" Grid.Row="4" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="OffsetXTxBx" Grid.Column="1" Grid.Row="4" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="OffsetYTxBl" Grid.Row="5" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="OffsetYTxBl" Grid.Row="5" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="OffsetYTxBx" Grid.Column="1" Grid.Row="5" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="KerfTxBl" Grid.Row="6" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
<TextBlock Name="KerfTxBl" Grid.Row="6" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
<EgtWPFLib:EgtTextBox Name="KerfTxBx" Grid.Column="1" Grid.Row="6" Margin="13,0,6,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
</Grid>
<!-- Definizione della Grid per il materiale -->
<GroupBox Name="MaterialGpBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_GroupBox}">
<GroupBox Name="MaterialGpBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
<ComboBox Name="MaterialsCmbx" Style="{StaticResource OmagCut_ComboBox}"
MaxDropDownHeight="600">
@@ -111,7 +111,7 @@
</GroupBox>
<!-- Definizione della Grid per Punti -->
<GroupBox Name="PointsGpBx" Grid.Row="3" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_GroupBox}" >
<GroupBox Name="PointsGpBx" Grid.Row="3" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}" >
<Grid >
<Grid.ColumnDefinitions>
@@ -124,17 +124,17 @@
</Grid.RowDefinitions>
<ToggleButton Name="AddBtn"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="RemoveBtn" Grid.Column="1"
Style="{StaticResource OmagCut_YellowToggleButton}"/>
Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<Button Name="CloseBtn" Grid.Row="1" Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
</Grid>
</GroupBox>
<!-- Definizione della Grid per Zona rovinata -->
<GroupBox Name="DamagedAreaGpBx" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" Style="{StaticResource OmagCut_GroupBox}">
<GroupBox Name="DamagedAreaGpBx" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
<Grid>
<Grid.ColumnDefinitions>
@@ -142,14 +142,14 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<ToggleButton Name="NewBtn" Style="{StaticResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="DeleteBtn" Grid.Column="1" Style="{StaticResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="NewBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
<ToggleButton Name="DeleteBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
</Grid>
</GroupBox>
<Button Name="ConfirmPhotoBtn" Grid.Row="4" Grid.ColumnSpan="2" Visibility="Hidden"
Style="{StaticResource OmagCut_YellowTextButton}"/>
Style="{DynamicResource OmagCut_YellowTextButton}"/>
</Grid>
@@ -164,16 +164,16 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Name="RawProbingBtn" Style="{StaticResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="Resources/RawProbe.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="RawProbingBtn" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="{DynamicResource RawProbeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="BarCodeBtn" Grid.Column="2" Style="{StaticResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="Resources/BarCode.png" Style="{StaticResource OmagCut_ButtonIcon}"/>
<Button Name="BarCodeBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
<Image Source="{DynamicResource BarCodeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
</Button>
<Button Name="OkBtn" Grid.Column="5" Style="{StaticResource OmagCut_GradientBlueIconButton}">
<Image Source="Resources/V.png" Width="65" Height="65" HorizontalAlignment="Center"
<Button Name="OkBtn" Grid.Column="5" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
<Image Source="{DynamicResource VImg}" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
Resources/Fonts/Roboto-Regular.ttf
BIN
View File
Binary file not shown.
Resources/Negative/AlignPieces.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

Resources/Negative/BarCode.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 244 B

Resources/Negative/BottomLeft.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

Resources/Negative/BottomRight.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

Resources/Negative/ClockwiseRotate.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

Resources/Negative/CounterClockwiseRotate.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

Resources/Negative/CsvMinus.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 713 B

Resources/Negative/CsvNew.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 426 B

Resources/Negative/CsvOpen.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

Resources/Negative/CsvPlus.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 965 B

Resources/Negative/CsvRuinedParts.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

Resources/Negative/DownArrow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

Resources/Negative/Draw.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 891 B

Resources/Negative/FrameMachining.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

Resources/Negative/GenericView.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

Resources/Negative/HalfTurnRotate.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

Resources/Negative/Import.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

Resources/Negative/LeftArrow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

Resources/Negative/LookFromTOP.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 831 B

Resources/Negative/MHT.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

Resources/Negative/Manual.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

Resources/Negative/Measure.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 532 B

Resources/Negative/Nest.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 805 B

Resources/Negative/NumericKeyboardArrow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 905 B

Resources/Negative/Options.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

Resources/Negative/Pan.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

Resources/Negative/Photo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 752 B

Resources/Negative/RawPart.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 682 B

Resources/Negative/RawProbe.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

Resources/Negative/RightArrow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

Resources/Negative/SawProbe.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

Resources/Negative/Split.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

Resources/Negative/ToolChangerPos.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 766 B

Resources/Negative/TopLeft.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

Resources/Negative/TopRight.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

Resources/Negative/UpArrow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

Resources/Negative/V.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 833 B

Resources/Negative/X.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 736 B

Resources/Negative/ZoomAll.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

Resources/Negative/ZoomIn.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 962 B

Resources/Negative/ZoomOut.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 975 B

Resources/Negative/ZoomWin.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

Resources/NewIcons/1-BottomLeft.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

Resources/NewIcons/2-BottomRight.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

Resources/NewIcons/3-TopRight.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

Some files were not shown because too many files have changed in this diff Show More