diff --git a/AboutBoxWD.xaml b/AboutBoxWD.xaml index 9476cff..dee4446 100644 --- a/AboutBoxWD.xaml +++ b/AboutBoxWD.xaml @@ -1,12 +1,12 @@  - + @@ -51,7 +51,7 @@ diff --git a/Application.xaml b/Application.xaml index a7df288..3cbad01 100644 --- a/Application.xaml +++ b/Application.xaml @@ -10,9 +10,7 @@ - - diff --git a/BarCodeWD.xaml b/BarCodeWD.xaml index 492a853..83b402c 100644 --- a/BarCodeWD.xaml +++ b/BarCodeWD.xaml @@ -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"> - + @@ -23,9 +23,9 @@ + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_KeyboardTextBox}"/> @@ -37,14 +37,13 @@ diff --git a/CSVPage.xaml b/CSVPage.xaml index 6b3e23c..a503d7d 100644 --- a/CSVPage.xaml +++ b/CSVPage.xaml @@ -27,7 +27,7 @@ - + @@ -49,7 +49,7 @@ - + + Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/> @@ -48,16 +48,16 @@ - - - diff --git a/OptionsPageUC.xaml b/OptionsPageUC.xaml index c2775de..9cd72f2 100644 --- a/OptionsPageUC.xaml +++ b/OptionsPageUC.xaml @@ -25,7 +25,7 @@ - + @@ -50,7 +50,7 @@ + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" /> @@ -58,7 +58,7 @@ + Style="{DynamicResource OmagCut_GroupBox}"> @@ -85,7 +85,7 @@ + Style="{DynamicResource OmagCut_GroupBox}"> @@ -107,7 +107,7 @@ + Style="{DynamicResource OmagCut_GroupBox}"> @@ -123,19 +123,19 @@ + Style="{DynamicResource OmagCut_YellowToggleButton}" /> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left" /> + Style="{DynamicResource OmagCut_GroupBox}"> @@ -149,35 +149,35 @@ + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" /> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" /> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" /> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" /> + Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}" /> + Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}" /> + Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}" /> + Style="{DynamicResource OmagCut_CalculatorTextBox}" /> + Style="{DynamicResource OmagCut_GroupBox}"> @@ -217,19 +217,19 @@ + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left" /> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" /> + Style="{DynamicResource OmagCut_CalculatorTextBox}" /> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" /> + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" /> + Style="{DynamicResource OmagCut_CalculatorTextBox}" /> + Style="{DynamicResource OmagCut_CalculatorTextBox}" /> diff --git a/OptionsPageUC.xaml.vb b/OptionsPageUC.xaml.vb index 2e10c93..11cfb4e 100644 --- a/OptionsPageUC.xaml.vb +++ b/OptionsPageUC.xaml.vb @@ -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 diff --git a/PhotoPageUC.xaml b/PhotoPageUC.xaml index 3a59d52..b99bd8c 100644 --- a/PhotoPageUC.xaml +++ b/PhotoPageUC.xaml @@ -19,7 +19,7 @@ - + @@ -42,11 +42,11 @@ - - diff --git a/ProjectMgrUC.xaml b/ProjectMgrUC.xaml index 4624682..a10ca1b 100644 --- a/ProjectMgrUC.xaml +++ b/ProjectMgrUC.xaml @@ -22,25 +22,25 @@ - - diff --git a/Resources/Fonts/Roboto-Regular.ttf b/Resources/Fonts/Roboto-Regular.ttf new file mode 100644 index 0000000..7d9a6c4 Binary files /dev/null and b/Resources/Fonts/Roboto-Regular.ttf differ diff --git a/Resources/Negative/AlignPieces.png b/Resources/Negative/AlignPieces.png new file mode 100644 index 0000000..ce7fc48 Binary files /dev/null and b/Resources/Negative/AlignPieces.png differ diff --git a/Resources/Negative/BarCode.png b/Resources/Negative/BarCode.png new file mode 100644 index 0000000..d4b3119 Binary files /dev/null and b/Resources/Negative/BarCode.png differ diff --git a/Resources/Negative/BottomLeft.png b/Resources/Negative/BottomLeft.png new file mode 100644 index 0000000..298fbe4 Binary files /dev/null and b/Resources/Negative/BottomLeft.png differ diff --git a/Resources/Negative/BottomRight.png b/Resources/Negative/BottomRight.png new file mode 100644 index 0000000..04993cf Binary files /dev/null and b/Resources/Negative/BottomRight.png differ diff --git a/Resources/Negative/ClockwiseRotate.png b/Resources/Negative/ClockwiseRotate.png new file mode 100644 index 0000000..3e1ad83 Binary files /dev/null and b/Resources/Negative/ClockwiseRotate.png differ diff --git a/Resources/Negative/CounterClockwiseRotate.png b/Resources/Negative/CounterClockwiseRotate.png new file mode 100644 index 0000000..ecd4a7a Binary files /dev/null and b/Resources/Negative/CounterClockwiseRotate.png differ diff --git a/Resources/Negative/CsvMinus.png b/Resources/Negative/CsvMinus.png new file mode 100644 index 0000000..9c566fd Binary files /dev/null and b/Resources/Negative/CsvMinus.png differ diff --git a/Resources/Negative/CsvNew.png b/Resources/Negative/CsvNew.png new file mode 100644 index 0000000..9548d76 Binary files /dev/null and b/Resources/Negative/CsvNew.png differ diff --git a/Resources/Negative/CsvOpen.png b/Resources/Negative/CsvOpen.png new file mode 100644 index 0000000..b4ec1ce Binary files /dev/null and b/Resources/Negative/CsvOpen.png differ diff --git a/Resources/Negative/CsvPlus.png b/Resources/Negative/CsvPlus.png new file mode 100644 index 0000000..9367050 Binary files /dev/null and b/Resources/Negative/CsvPlus.png differ diff --git a/Resources/Negative/CsvRuinedParts.png b/Resources/Negative/CsvRuinedParts.png new file mode 100644 index 0000000..2cc4244 Binary files /dev/null and b/Resources/Negative/CsvRuinedParts.png differ diff --git a/Resources/Negative/DownArrow.png b/Resources/Negative/DownArrow.png new file mode 100644 index 0000000..336a1d4 Binary files /dev/null and b/Resources/Negative/DownArrow.png differ diff --git a/Resources/Negative/Draw.png b/Resources/Negative/Draw.png new file mode 100644 index 0000000..45fff07 Binary files /dev/null and b/Resources/Negative/Draw.png differ diff --git a/Resources/Negative/FrameMachining.png b/Resources/Negative/FrameMachining.png new file mode 100644 index 0000000..b6c8251 Binary files /dev/null and b/Resources/Negative/FrameMachining.png differ diff --git a/Resources/Negative/GenericView.png b/Resources/Negative/GenericView.png new file mode 100644 index 0000000..c4247e6 Binary files /dev/null and b/Resources/Negative/GenericView.png differ diff --git a/Resources/Negative/HalfTurnRotate.png b/Resources/Negative/HalfTurnRotate.png new file mode 100644 index 0000000..c58cd65 Binary files /dev/null and b/Resources/Negative/HalfTurnRotate.png differ diff --git a/Resources/Negative/Import.png b/Resources/Negative/Import.png new file mode 100644 index 0000000..a62b128 Binary files /dev/null and b/Resources/Negative/Import.png differ diff --git a/Resources/Negative/LeftArrow.png b/Resources/Negative/LeftArrow.png new file mode 100644 index 0000000..9b6bf93 Binary files /dev/null and b/Resources/Negative/LeftArrow.png differ diff --git a/Resources/Negative/LookFromTOP.png b/Resources/Negative/LookFromTOP.png new file mode 100644 index 0000000..a548ca8 Binary files /dev/null and b/Resources/Negative/LookFromTOP.png differ diff --git a/Resources/Negative/MHT.png b/Resources/Negative/MHT.png new file mode 100644 index 0000000..f119649 Binary files /dev/null and b/Resources/Negative/MHT.png differ diff --git a/Resources/Negative/Manual.png b/Resources/Negative/Manual.png new file mode 100644 index 0000000..42a2930 Binary files /dev/null and b/Resources/Negative/Manual.png differ diff --git a/Resources/Negative/Measure.png b/Resources/Negative/Measure.png new file mode 100644 index 0000000..1ca1114 Binary files /dev/null and b/Resources/Negative/Measure.png differ diff --git a/Resources/Negative/Nest.png b/Resources/Negative/Nest.png new file mode 100644 index 0000000..7e25a0d Binary files /dev/null and b/Resources/Negative/Nest.png differ diff --git a/Resources/Negative/NumericKeyboardArrow.png b/Resources/Negative/NumericKeyboardArrow.png new file mode 100644 index 0000000..6bfcdbe Binary files /dev/null and b/Resources/Negative/NumericKeyboardArrow.png differ diff --git a/Resources/Negative/Options.png b/Resources/Negative/Options.png new file mode 100644 index 0000000..c300dee Binary files /dev/null and b/Resources/Negative/Options.png differ diff --git a/Resources/Negative/Pan.png b/Resources/Negative/Pan.png new file mode 100644 index 0000000..814145c Binary files /dev/null and b/Resources/Negative/Pan.png differ diff --git a/Resources/Negative/Photo.png b/Resources/Negative/Photo.png new file mode 100644 index 0000000..139c701 Binary files /dev/null and b/Resources/Negative/Photo.png differ diff --git a/Resources/Negative/RawPart.png b/Resources/Negative/RawPart.png new file mode 100644 index 0000000..2bbde56 Binary files /dev/null and b/Resources/Negative/RawPart.png differ diff --git a/Resources/Negative/RawProbe.png b/Resources/Negative/RawProbe.png new file mode 100644 index 0000000..337285f Binary files /dev/null and b/Resources/Negative/RawProbe.png differ diff --git a/Resources/Negative/RightArrow.png b/Resources/Negative/RightArrow.png new file mode 100644 index 0000000..048ac2b Binary files /dev/null and b/Resources/Negative/RightArrow.png differ diff --git a/Resources/Negative/SawProbe.png b/Resources/Negative/SawProbe.png new file mode 100644 index 0000000..11a01f4 Binary files /dev/null and b/Resources/Negative/SawProbe.png differ diff --git a/Resources/Negative/Split.png b/Resources/Negative/Split.png new file mode 100644 index 0000000..1d18443 Binary files /dev/null and b/Resources/Negative/Split.png differ diff --git a/Resources/Negative/ToolChangerPos.png b/Resources/Negative/ToolChangerPos.png new file mode 100644 index 0000000..205fa56 Binary files /dev/null and b/Resources/Negative/ToolChangerPos.png differ diff --git a/Resources/Negative/TopLeft.png b/Resources/Negative/TopLeft.png new file mode 100644 index 0000000..2f7f2c8 Binary files /dev/null and b/Resources/Negative/TopLeft.png differ diff --git a/Resources/Negative/TopRight.png b/Resources/Negative/TopRight.png new file mode 100644 index 0000000..4f41269 Binary files /dev/null and b/Resources/Negative/TopRight.png differ diff --git a/Resources/Negative/UpArrow.png b/Resources/Negative/UpArrow.png new file mode 100644 index 0000000..a996781 Binary files /dev/null and b/Resources/Negative/UpArrow.png differ diff --git a/Resources/Negative/V.png b/Resources/Negative/V.png new file mode 100644 index 0000000..4fa0c3b Binary files /dev/null and b/Resources/Negative/V.png differ diff --git a/Resources/Negative/X.png b/Resources/Negative/X.png new file mode 100644 index 0000000..309609e Binary files /dev/null and b/Resources/Negative/X.png differ diff --git a/Resources/Negative/ZoomAll.png b/Resources/Negative/ZoomAll.png new file mode 100644 index 0000000..fa2e3d5 Binary files /dev/null and b/Resources/Negative/ZoomAll.png differ diff --git a/Resources/Negative/ZoomIn.png b/Resources/Negative/ZoomIn.png new file mode 100644 index 0000000..d664357 Binary files /dev/null and b/Resources/Negative/ZoomIn.png differ diff --git a/Resources/Negative/ZoomOut.png b/Resources/Negative/ZoomOut.png new file mode 100644 index 0000000..e27c211 Binary files /dev/null and b/Resources/Negative/ZoomOut.png differ diff --git a/Resources/Negative/ZoomWin.png b/Resources/Negative/ZoomWin.png new file mode 100644 index 0000000..2f0ee7e Binary files /dev/null and b/Resources/Negative/ZoomWin.png differ diff --git a/Resources/NewIcons/1-BottomLeft.png b/Resources/NewIcons/1-BottomLeft.png new file mode 100644 index 0000000..cfb1c92 Binary files /dev/null and b/Resources/NewIcons/1-BottomLeft.png differ diff --git a/Resources/NewIcons/2-BottomRight.png b/Resources/NewIcons/2-BottomRight.png new file mode 100644 index 0000000..f74da7d Binary files /dev/null and b/Resources/NewIcons/2-BottomRight.png differ diff --git a/Resources/NewIcons/3-TopRight.png b/Resources/NewIcons/3-TopRight.png new file mode 100644 index 0000000..35ac856 Binary files /dev/null and b/Resources/NewIcons/3-TopRight.png differ diff --git a/Resources/NewIcons/4-TopLeft.png b/Resources/NewIcons/4-TopLeft.png new file mode 100644 index 0000000..dccc963 Binary files /dev/null and b/Resources/NewIcons/4-TopLeft.png differ diff --git a/Resources/NewIcons/AvantiVeloce.png b/Resources/NewIcons/AvantiVeloce.png new file mode 100644 index 0000000..47f2b3a Binary files /dev/null and b/Resources/NewIcons/AvantiVeloce.png differ diff --git a/Resources/NewIcons/BarCode.png b/Resources/NewIcons/BarCode.png new file mode 100644 index 0000000..e3b91d4 Binary files /dev/null and b/Resources/NewIcons/BarCode.png differ diff --git a/Resources/NewIcons/CsvMinus.png b/Resources/NewIcons/CsvMinus.png new file mode 100644 index 0000000..3c9013e Binary files /dev/null and b/Resources/NewIcons/CsvMinus.png differ diff --git a/Resources/NewIcons/CsvNew.png b/Resources/NewIcons/CsvNew.png new file mode 100644 index 0000000..0a1d78a Binary files /dev/null and b/Resources/NewIcons/CsvNew.png differ diff --git a/Resources/NewIcons/CsvOpen.png b/Resources/NewIcons/CsvOpen.png new file mode 100644 index 0000000..b01563c Binary files /dev/null and b/Resources/NewIcons/CsvOpen.png differ diff --git a/Resources/NewIcons/CsvPlus.png b/Resources/NewIcons/CsvPlus.png new file mode 100644 index 0000000..0d1222c Binary files /dev/null and b/Resources/NewIcons/CsvPlus.png differ diff --git a/Resources/NewIcons/CsvRuinedParts.png b/Resources/NewIcons/CsvRuinedParts.png new file mode 100644 index 0000000..16fc6e3 Binary files /dev/null and b/Resources/NewIcons/CsvRuinedParts.png differ diff --git a/Resources/NewIcons/DownArrow.png b/Resources/NewIcons/DownArrow.png new file mode 100644 index 0000000..26da328 Binary files /dev/null and b/Resources/NewIcons/DownArrow.png differ diff --git a/Resources/NewIcons/FrameMachining.png b/Resources/NewIcons/FrameMachining.png new file mode 100644 index 0000000..0ffe225 Binary files /dev/null and b/Resources/NewIcons/FrameMachining.png differ diff --git a/Resources/NewIcons/GenericView-hover.png b/Resources/NewIcons/GenericView-hover.png new file mode 100644 index 0000000..a0f29eb Binary files /dev/null and b/Resources/NewIcons/GenericView-hover.png differ diff --git a/Resources/NewIcons/GenericView.png b/Resources/NewIcons/GenericView.png new file mode 100644 index 0000000..fed8231 Binary files /dev/null and b/Resources/NewIcons/GenericView.png differ diff --git a/Resources/NewIcons/IndietroVeloce.png b/Resources/NewIcons/IndietroVeloce.png new file mode 100644 index 0000000..8c36be6 Binary files /dev/null and b/Resources/NewIcons/IndietroVeloce.png differ diff --git a/Resources/NewIcons/LeftArrow.png b/Resources/NewIcons/LeftArrow.png new file mode 100644 index 0000000..bb4c383 Binary files /dev/null and b/Resources/NewIcons/LeftArrow.png differ diff --git a/Resources/NewIcons/MHT.png b/Resources/NewIcons/MHT.png new file mode 100644 index 0000000..bc8538a Binary files /dev/null and b/Resources/NewIcons/MHT.png differ diff --git a/Resources/NewIcons/Manual.png b/Resources/NewIcons/Manual.png new file mode 100644 index 0000000..899be9a Binary files /dev/null and b/Resources/NewIcons/Manual.png differ diff --git a/Resources/NewIcons/MaxMove.png b/Resources/NewIcons/MaxMove.png new file mode 100644 index 0000000..0d5e950 Binary files /dev/null and b/Resources/NewIcons/MaxMove.png differ diff --git a/Resources/NewIcons/Nest.png b/Resources/NewIcons/Nest.png new file mode 100644 index 0000000..04aa8c9 Binary files /dev/null and b/Resources/NewIcons/Nest.png differ diff --git a/Resources/NewIcons/NumericKeyboardArrow.png b/Resources/NewIcons/NumericKeyboardArrow.png new file mode 100644 index 0000000..153110a Binary files /dev/null and b/Resources/NewIcons/NumericKeyboardArrow.png differ diff --git a/Resources/NewIcons/Options.png b/Resources/NewIcons/Options.png new file mode 100644 index 0000000..736a2bb Binary files /dev/null and b/Resources/NewIcons/Options.png differ diff --git a/Resources/NewIcons/Pause.png b/Resources/NewIcons/Pause.png new file mode 100644 index 0000000..2cdd04c Binary files /dev/null and b/Resources/NewIcons/Pause.png differ diff --git a/Resources/NewIcons/Play.png b/Resources/NewIcons/Play.png new file mode 100644 index 0000000..3da546c Binary files /dev/null and b/Resources/NewIcons/Play.png differ diff --git a/Resources/NewIcons/PlayStep.png b/Resources/NewIcons/PlayStep.png new file mode 100644 index 0000000..eec2d1d Binary files /dev/null and b/Resources/NewIcons/PlayStep.png differ diff --git a/Resources/NewIcons/RawProbe.png b/Resources/NewIcons/RawProbe.png new file mode 100644 index 0000000..90b7f2c Binary files /dev/null and b/Resources/NewIcons/RawProbe.png differ diff --git a/Resources/NewIcons/RightArrow.png b/Resources/NewIcons/RightArrow.png new file mode 100644 index 0000000..4708d6f Binary files /dev/null and b/Resources/NewIcons/RightArrow.png differ diff --git a/Resources/NewIcons/SawProbe.png b/Resources/NewIcons/SawProbe.png new file mode 100644 index 0000000..dfc96d6 Binary files /dev/null and b/Resources/NewIcons/SawProbe.png differ diff --git a/Resources/NewIcons/Send.png b/Resources/NewIcons/Send.png new file mode 100644 index 0000000..edf9fd3 Binary files /dev/null and b/Resources/NewIcons/Send.png differ diff --git a/Resources/NewIcons/Split.png b/Resources/NewIcons/Split.png new file mode 100644 index 0000000..c8edd33 Binary files /dev/null and b/Resources/NewIcons/Split.png differ diff --git a/Resources/NewIcons/Stop.png b/Resources/NewIcons/Stop.png new file mode 100644 index 0000000..86e1ba8 Binary files /dev/null and b/Resources/NewIcons/Stop.png differ diff --git a/Resources/NewIcons/ToolChangerPos.png b/Resources/NewIcons/ToolChangerPos.png new file mode 100644 index 0000000..4478aad Binary files /dev/null and b/Resources/NewIcons/ToolChangerPos.png differ diff --git a/Resources/NewIcons/UpArrow.png b/Resources/NewIcons/UpArrow.png new file mode 100644 index 0000000..3a444d3 Binary files /dev/null and b/Resources/NewIcons/UpArrow.png differ diff --git a/Resources/NewIcons/V.png b/Resources/NewIcons/V.png new file mode 100644 index 0000000..442f00d Binary files /dev/null and b/Resources/NewIcons/V.png differ diff --git a/Resources/NewIcons/Vacuum.png b/Resources/NewIcons/Vacuum.png new file mode 100644 index 0000000..6e7ee73 Binary files /dev/null and b/Resources/NewIcons/Vacuum.png differ diff --git a/Resources/NewIcons/X.png b/Resources/NewIcons/X.png new file mode 100644 index 0000000..f5297e8 Binary files /dev/null and b/Resources/NewIcons/X.png differ diff --git a/Resources/NewIcons/ZoomAll-hover.png b/Resources/NewIcons/ZoomAll-hover.png new file mode 100644 index 0000000..16e7056 Binary files /dev/null and b/Resources/NewIcons/ZoomAll-hover.png differ diff --git a/Resources/NewIcons/ZoomAll.png b/Resources/NewIcons/ZoomAll.png new file mode 100644 index 0000000..7e2c819 Binary files /dev/null and b/Resources/NewIcons/ZoomAll.png differ diff --git a/Resources/NewIcons/ZoomWin.png b/Resources/NewIcons/ZoomWin.png new file mode 100644 index 0000000..f7c4d74 Binary files /dev/null and b/Resources/NewIcons/ZoomWin.png differ diff --git a/Resources/NewIcons/centro.png b/Resources/NewIcons/centro.png new file mode 100644 index 0000000..10d5b1c Binary files /dev/null and b/Resources/NewIcons/centro.png differ diff --git a/Resources/NewIcons/freccia-dx.png b/Resources/NewIcons/freccia-dx.png new file mode 100644 index 0000000..4fbe1c1 Binary files /dev/null and b/Resources/NewIcons/freccia-dx.png differ diff --git a/Resources/NewIcons/freccia-giu.png b/Resources/NewIcons/freccia-giu.png new file mode 100644 index 0000000..3c84761 Binary files /dev/null and b/Resources/NewIcons/freccia-giu.png differ diff --git a/Resources/NewIcons/freccia-nera.png b/Resources/NewIcons/freccia-nera.png new file mode 100644 index 0000000..502a99b Binary files /dev/null and b/Resources/NewIcons/freccia-nera.png differ diff --git a/Resources/NewIcons/freccia-small.png b/Resources/NewIcons/freccia-small.png new file mode 100644 index 0000000..e288674 Binary files /dev/null and b/Resources/NewIcons/freccia-small.png differ diff --git a/Resources/NewIcons/freccia-su.png b/Resources/NewIcons/freccia-su.png new file mode 100644 index 0000000..2da4839 Binary files /dev/null and b/Resources/NewIcons/freccia-su.png differ diff --git a/Resources/NewIcons/freccia-sx.png b/Resources/NewIcons/freccia-sx.png new file mode 100644 index 0000000..7312ef1 Binary files /dev/null and b/Resources/NewIcons/freccia-sx.png differ diff --git a/Resources/NewIcons/freccia.png b/Resources/NewIcons/freccia.png new file mode 100644 index 0000000..a7e8c48 Binary files /dev/null and b/Resources/NewIcons/freccia.png differ diff --git a/Resources/NewIcons/ico-3D.png b/Resources/NewIcons/ico-3D.png new file mode 100644 index 0000000..04866f4 Binary files /dev/null and b/Resources/NewIcons/ico-3D.png differ diff --git a/Resources/NewIcons/ico-cursore.png b/Resources/NewIcons/ico-cursore.png new file mode 100644 index 0000000..3e938b4 Binary files /dev/null and b/Resources/NewIcons/ico-cursore.png differ diff --git a/Resources/NewIcons/ico-cut.png b/Resources/NewIcons/ico-cut.png new file mode 100644 index 0000000..4c52f8f Binary files /dev/null and b/Resources/NewIcons/ico-cut.png differ diff --git a/Resources/NewIcons/ico-deseleziona.png b/Resources/NewIcons/ico-deseleziona.png new file mode 100644 index 0000000..2125b24 Binary files /dev/null and b/Resources/NewIcons/ico-deseleziona.png differ diff --git a/Resources/NewIcons/ico-elimina.png b/Resources/NewIcons/ico-elimina.png new file mode 100644 index 0000000..257a358 Binary files /dev/null and b/Resources/NewIcons/ico-elimina.png differ diff --git a/Resources/NewIcons/ico-hover-3D.png b/Resources/NewIcons/ico-hover-3D.png new file mode 100644 index 0000000..3ef4951 Binary files /dev/null and b/Resources/NewIcons/ico-hover-3D.png differ diff --git a/Resources/NewIcons/ico-hover-cursore.png b/Resources/NewIcons/ico-hover-cursore.png new file mode 100644 index 0000000..371be5d Binary files /dev/null and b/Resources/NewIcons/ico-hover-cursore.png differ diff --git a/Resources/NewIcons/ico-hover-magnete.png b/Resources/NewIcons/ico-hover-magnete.png new file mode 100644 index 0000000..0e7cc52 Binary files /dev/null and b/Resources/NewIcons/ico-hover-magnete.png differ diff --git a/Resources/NewIcons/ico-hover-mano.png b/Resources/NewIcons/ico-hover-mano.png new file mode 100644 index 0000000..9fbaf0d Binary files /dev/null and b/Resources/NewIcons/ico-hover-mano.png differ diff --git a/Resources/NewIcons/ico-hover-puntatore.png b/Resources/NewIcons/ico-hover-puntatore.png new file mode 100644 index 0000000..d250e41 Binary files /dev/null and b/Resources/NewIcons/ico-hover-puntatore.png differ diff --git a/Resources/NewIcons/ico-hover-righello.png b/Resources/NewIcons/ico-hover-righello.png new file mode 100644 index 0000000..52c3acc Binary files /dev/null and b/Resources/NewIcons/ico-hover-righello.png differ diff --git a/Resources/NewIcons/ico-hover-zoom+.png b/Resources/NewIcons/ico-hover-zoom+.png new file mode 100644 index 0000000..6712560 Binary files /dev/null and b/Resources/NewIcons/ico-hover-zoom+.png differ diff --git a/Resources/NewIcons/ico-hover-zoom-.png b/Resources/NewIcons/ico-hover-zoom-.png new file mode 100644 index 0000000..03d53f2 Binary files /dev/null and b/Resources/NewIcons/ico-hover-zoom-.png differ diff --git a/Resources/NewIcons/ico-impostazioni.png b/Resources/NewIcons/ico-impostazioni.png new file mode 100644 index 0000000..968abbc Binary files /dev/null and b/Resources/NewIcons/ico-impostazioni.png differ diff --git a/Resources/NewIcons/ico-inserisci-prezzo.png b/Resources/NewIcons/ico-inserisci-prezzo.png new file mode 100644 index 0000000..61efd44 Binary files /dev/null and b/Resources/NewIcons/ico-inserisci-prezzo.png differ diff --git a/Resources/NewIcons/ico-magnete.png b/Resources/NewIcons/ico-magnete.png new file mode 100644 index 0000000..328e0ab Binary files /dev/null and b/Resources/NewIcons/ico-magnete.png differ diff --git a/Resources/NewIcons/ico-mano.png b/Resources/NewIcons/ico-mano.png new file mode 100644 index 0000000..8a1415f Binary files /dev/null and b/Resources/NewIcons/ico-mano.png differ diff --git a/Resources/NewIcons/ico-parcheggia.png b/Resources/NewIcons/ico-parcheggia.png new file mode 100644 index 0000000..fd9aabf Binary files /dev/null and b/Resources/NewIcons/ico-parcheggia.png differ diff --git a/Resources/NewIcons/ico-puntatore.png b/Resources/NewIcons/ico-puntatore.png new file mode 100644 index 0000000..94343cc Binary files /dev/null and b/Resources/NewIcons/ico-puntatore.png differ diff --git a/Resources/NewIcons/ico-righello.png b/Resources/NewIcons/ico-righello.png new file mode 100644 index 0000000..e9d8877 Binary files /dev/null and b/Resources/NewIcons/ico-righello.png differ diff --git a/Resources/NewIcons/ico-salva.png b/Resources/NewIcons/ico-salva.png new file mode 100644 index 0000000..634c2b7 Binary files /dev/null and b/Resources/NewIcons/ico-salva.png differ diff --git a/Resources/NewIcons/ico-seleziona-tutto.png b/Resources/NewIcons/ico-seleziona-tutto.png new file mode 100644 index 0000000..ac6c310 Binary files /dev/null and b/Resources/NewIcons/ico-seleziona-tutto.png differ diff --git a/Resources/NewIcons/icone-tagli-1.png b/Resources/NewIcons/icone-tagli-1.png new file mode 100644 index 0000000..ab8e933 Binary files /dev/null and b/Resources/NewIcons/icone-tagli-1.png differ diff --git a/Resources/NewIcons/icone-tagli-2.png b/Resources/NewIcons/icone-tagli-2.png new file mode 100644 index 0000000..665ab41 Binary files /dev/null and b/Resources/NewIcons/icone-tagli-2.png differ diff --git a/Resources/NewIcons/icone-tagli-3.png b/Resources/NewIcons/icone-tagli-3.png new file mode 100644 index 0000000..9af195b Binary files /dev/null and b/Resources/NewIcons/icone-tagli-3.png differ diff --git a/Resources/NewIcons/icone-tagli-4.png b/Resources/NewIcons/icone-tagli-4.png new file mode 100644 index 0000000..457e143 Binary files /dev/null and b/Resources/NewIcons/icone-tagli-4.png differ diff --git a/Resources/NewIcons/icone-tagli-5.png b/Resources/NewIcons/icone-tagli-5.png new file mode 100644 index 0000000..1a4ae1e Binary files /dev/null and b/Resources/NewIcons/icone-tagli-5.png differ diff --git a/Resources/NewIcons/icone-tagli-6.png b/Resources/NewIcons/icone-tagli-6.png new file mode 100644 index 0000000..0525954 Binary files /dev/null and b/Resources/NewIcons/icone-tagli-6.png differ diff --git a/Resources/NewIcons/logo-OmCut.png b/Resources/NewIcons/logo-OmCut.png new file mode 100644 index 0000000..348bd76 Binary files /dev/null and b/Resources/NewIcons/logo-OmCut.png differ diff --git a/Resources/NewIcons/ruota-oggetto-dx.png b/Resources/NewIcons/ruota-oggetto-dx.png new file mode 100644 index 0000000..c3a491f Binary files /dev/null and b/Resources/NewIcons/ruota-oggetto-dx.png differ diff --git a/Resources/NewIcons/ruota-oggetto-inclinato.png b/Resources/NewIcons/ruota-oggetto-inclinato.png new file mode 100644 index 0000000..6929947 Binary files /dev/null and b/Resources/NewIcons/ruota-oggetto-inclinato.png differ diff --git a/Resources/NewIcons/ruota-oggetto-sx.png b/Resources/NewIcons/ruota-oggetto-sx.png new file mode 100644 index 0000000..e39bcc9 Binary files /dev/null and b/Resources/NewIcons/ruota-oggetto-sx.png differ diff --git a/Resources/NewIcons/zoom+.png b/Resources/NewIcons/zoom+.png new file mode 100644 index 0000000..2165f6d Binary files /dev/null and b/Resources/NewIcons/zoom+.png differ diff --git a/Resources/NewIcons/zoom-.png b/Resources/NewIcons/zoom-.png new file mode 100644 index 0000000..b8d9693 Binary files /dev/null and b/Resources/NewIcons/zoom-.png differ diff --git a/SaveNameWD.xaml b/SaveNameWD.xaml index d0565ac..b655268 100644 --- a/SaveNameWD.xaml +++ b/SaveNameWD.xaml @@ -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"> - + @@ -23,9 +23,9 @@ + Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/> + Style="{DynamicResource OmagCut_KeyboardTextBox}"/> @@ -36,12 +36,11 @@ - - diff --git a/SawTestUC.xaml b/SawTestUC.xaml index 3817a30..3023af0 100644 --- a/SawTestUC.xaml +++ b/SawTestUC.xaml @@ -7,7 +7,7 @@ mc:Ignorable="d" d:DesignHeight="597.3" d:DesignWidth="256"> - + @@ -37,9 +37,9 @@ + Style="{DynamicResource OmagCut_YellowToggleButton}"/> + Style="{DynamicResource OmagCut_YellowToggleButton}"/> @@ -74,10 +74,10 @@ - diff --git a/SceneButtonsUC.xaml b/SceneButtonsUC.xaml index c0b37ee..a19bc53 100644 --- a/SceneButtonsUC.xaml +++ b/SceneButtonsUC.xaml @@ -18,29 +18,29 @@ - - + + - - - - - - diff --git a/SecondaryComponentPageUC.xaml b/SecondaryComponentPageUC.xaml index b6afec9..e0cc32c 100644 --- a/SecondaryComponentPageUC.xaml +++ b/SecondaryComponentPageUC.xaml @@ -22,7 +22,7 @@ - - - - - - - - - @@ -137,8 +137,8 @@ - diff --git a/SetUpPage.xaml b/SetUpPage.xaml index 4d50cb6..051a6c9 100644 --- a/SetUpPage.xaml +++ b/SetUpPage.xaml @@ -511,12 +511,12 @@ - - diff --git a/SimulationPageUC.xaml b/SimulationPageUC.xaml index 11075e4..8c85264 100644 --- a/SimulationPageUC.xaml +++ b/SimulationPageUC.xaml @@ -28,8 +28,8 @@ @@ -52,7 +52,7 @@ - + @@ -66,27 +66,27 @@ + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_FixedTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> - + Style="{DynamicResource OmagCut_FixedTextBox}"/> + + Style="{DynamicResource OmagCut_FixedTextBox}"/> + Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/> + Style="{DynamicResource OmagCut_FixedTextBox}"/> - + @@ -96,7 +96,7 @@ + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -106,7 +106,7 @@ + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -116,7 +116,7 @@ + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -126,7 +126,7 @@ + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -136,7 +136,7 @@ + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -146,7 +146,7 @@ + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -156,7 +156,7 @@ + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -166,7 +166,7 @@ + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -176,7 +176,7 @@ + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -186,7 +186,7 @@ + Width="120" Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/> @@ -213,18 +213,18 @@ - - - @@ -240,8 +240,8 @@ - diff --git a/SimulationPageUC.xaml.vb b/SimulationPageUC.xaml.vb index 104c1f5..1d2a6c7 100644 --- a/SimulationPageUC.xaml.vb +++ b/SimulationPageUC.xaml.vb @@ -180,6 +180,11 @@ Public Class SimulationPageUC LoadCurrTools() EgtDraw() ShowCncData() + If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then + PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Play.png", UriKind.Relative)) + Else + PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Play.png", UriKind.Relative)) + End If End Sub Private Sub StepBtn_Click(sender As Object, e As RoutedEventArgs) Handles StepBtn.Click @@ -225,12 +230,22 @@ Public Class SimulationPageUC Private Sub SetPlayPauseBtnToPlay() m_bPlay = True - PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Play.png", UriKind.Relative)) + If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then + PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Play.png", UriKind.Relative)) + Else + PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Play.png", UriKind.Relative)) + End If + 'PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Play.png", UriKind.Relative)) End Sub Private Sub SetPlayPauseBtnToPause() m_bPlay = False - PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Pause.png", UriKind.Relative)) + If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then + PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Pause.png", UriKind.Relative)) + Else + PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Pause.png", UriKind.Relative)) + End If + 'PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Pause.png", UriKind.Relative)) End Sub Private Sub StopBtn_Click(sender As Object, e As RoutedEventArgs) Handles StopBtn.Click diff --git a/SingleCutUC.xaml b/SingleCutUC.xaml index 27de85e..11370a7 100644 --- a/SingleCutUC.xaml +++ b/SingleCutUC.xaml @@ -7,7 +7,7 @@ mc:Ignorable="d" d:DesignHeight="597.3" d:DesignWidth="256"> - + @@ -37,9 +37,9 @@ + Style="{DynamicResource OmagCut_YellowToggleButton}"/> + Style="{DynamicResource OmagCut_YellowToggleButton}"/> @@ -100,10 +100,10 @@ - diff --git a/SplitPageUC.xaml b/SplitPageUC.xaml index 7e0b5db..bac921a 100644 --- a/SplitPageUC.xaml +++ b/SplitPageUC.xaml @@ -26,7 +26,7 @@ - + @@ -34,11 +34,11 @@ - - - - @@ -100,9 +100,9 @@ -