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

OmagCUT 2.1i2 :

Browse Source 
- TestDictionary rinominato DarkDictionary
- corretta scelta lavorazione WJ alla fine della definizione del grezzo.
This commit is contained in:
Dario Sassi
2019-09-25 06:11:46 +00:00
parent 5043d54802
commit c034188c41
7 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Application.xaml
+1 -1
View File
@@ -9,7 +9,7 @@
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary x:Name="ThemeDictionary"> <ResourceDictionary x:Name="ThemeDictionary">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="OmagCUTTestDictionary.xaml"/> <ResourceDictionary Source="OmagCUTDarkDictionary.xaml"/>
<ResourceDictionary Source="OmagCUTDictionary.xaml"/> <ResourceDictionary Source="OmagCUTDictionary.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
ChooseMachining.xaml.vb
+6 -1
View File
@@ -248,6 +248,7 @@ Public Class ChooseMachining
ButtonsGrid.SetValue(Grid.RowProperty, 5) ButtonsGrid.SetValue(Grid.RowProperty, 5)
m_MainWindow.m_CurrentMachine.sCurrDrilling = String.Empty m_MainWindow.m_CurrentMachine.sCurrDrilling = String.Empty
m_MainWindow.m_CurrentMachine.sCurrMilling = String.Empty m_MainWindow.m_CurrentMachine.sCurrMilling = String.Empty
m_MainWindow.m_CurrentMachine.sCurrWaterJetting = String.Empty
Me.Height = 341.2 Me.Height = 341.2
Case 1 ' Foratura Case 1 ' Foratura
' Definizione di due righe della tabella con la giusta altezza ' Definizione di due righe della tabella con la giusta altezza
@@ -266,6 +267,7 @@ Public Class ChooseMachining
CurrDrillingCmBx.SelectedItem = m_CurrentMachine.sCurrDrilling CurrDrillingCmBx.SelectedItem = m_CurrentMachine.sCurrDrilling
End If End If
m_MainWindow.m_CurrentMachine.sCurrMilling = String.Empty m_MainWindow.m_CurrentMachine.sCurrMilling = String.Empty
m_MainWindow.m_CurrentMachine.sCurrWaterJetting = String.Empty
CurrDrillingTxBl.Visibility = Windows.Visibility.Visible CurrDrillingTxBl.Visibility = Windows.Visibility.Visible
CurrDrillingCmBx.Visibility = Windows.Visibility.Visible CurrDrillingCmBx.Visibility = Windows.Visibility.Visible
Me.Height = 426.5 Me.Height = 426.5
@@ -286,6 +288,7 @@ Public Class ChooseMachining
CurrMillingCmBx.SelectedItem = m_CurrentMachine.sCurrMilling CurrMillingCmBx.SelectedItem = m_CurrentMachine.sCurrMilling
End If End If
m_MainWindow.m_CurrentMachine.sCurrDrilling = String.Empty m_MainWindow.m_CurrentMachine.sCurrDrilling = String.Empty
m_MainWindow.m_CurrentMachine.sCurrWaterJetting = String.Empty
CurrMillingTxBl.Visibility = Windows.Visibility.Visible CurrMillingTxBl.Visibility = Windows.Visibility.Visible
CurrMillingCmBx.Visibility = Windows.Visibility.Visible CurrMillingCmBx.Visibility = Windows.Visibility.Visible
Me.Height = 426.5 Me.Height = 426.5
@@ -305,6 +308,7 @@ Public Class ChooseMachining
If m_CurrentMachine.sCurrMilling <> String.Empty Then If m_CurrentMachine.sCurrMilling <> String.Empty Then
CurrMillingCmBx.SelectedItem = m_CurrentMachine.sCurrMilling CurrMillingCmBx.SelectedItem = m_CurrentMachine.sCurrMilling
End If End If
m_MainWindow.m_CurrentMachine.sCurrWaterJetting = String.Empty
CurrDrillingTxBl.SetValue(Grid.RowProperty, 4) CurrDrillingTxBl.SetValue(Grid.RowProperty, 4)
CurrDrillingCmBx.SetValue(Grid.RowProperty, 5) CurrDrillingCmBx.SetValue(Grid.RowProperty, 5)
CurrMillingTxBl.SetValue(Grid.RowProperty, 6) CurrMillingTxBl.SetValue(Grid.RowProperty, 6)
@@ -331,7 +335,8 @@ Public Class ChooseMachining
If m_CurrentMachine.sCurrWaterJetting <> String.Empty Then If m_CurrentMachine.sCurrWaterJetting <> String.Empty Then
CurrWJettingCmBx.SelectedItem = m_CurrentMachine.sCurrWaterJetting CurrWJettingCmBx.SelectedItem = m_CurrentMachine.sCurrWaterJetting
End If End If
m_MainWindow.m_CurrentMachine.sCurrWaterJetting = String.Empty m_MainWindow.m_CurrentMachine.sCurrDrilling = String.Empty
m_MainWindow.m_CurrentMachine.sCurrMilling = String.Empty
CurrWJettingTxBl.Visibility = Windows.Visibility.Visible CurrWJettingTxBl.Visibility = Windows.Visibility.Visible
CurrWJettingCmBx.Visibility = Windows.Visibility.Visible CurrWJettingCmBx.Visibility = Windows.Visibility.Visible
Me.Height = 426.5 Me.Height = 426.5
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -62,5 +62,5 @@ Imports System.Windows
' by using the '*' as shown below: ' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.1.9.1")> <Assembly: AssemblyVersion("2.1.9.2")>
<Assembly: AssemblyFileVersion("2.1.9.1")> <Assembly: AssemblyFileVersion("2.1.9.2")>
OmagCUT.sln
-9
View File
@@ -7,24 +7,15 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "OmagCUT", "OmagCUT.vbproj",
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86 Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86 Release|x86 = Release|x86
Trial|Any CPU = Trial|Any CPU
Trial|x86 = Trial|x86 Trial|x86 = Trial|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Debug|x86.ActiveCfg = Debug|x86 {AC6C1390-231E-401C-89DD-AE0844B524E7}.Debug|x86.ActiveCfg = Debug|x86
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Debug|x86.Build.0 = Debug|x86 {AC6C1390-231E-401C-89DD-AE0844B524E7}.Debug|x86.Build.0 = Debug|x86
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Release|Any CPU.Build.0 = Release|Any CPU
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Release|x86.ActiveCfg = Release|x86 {AC6C1390-231E-401C-89DD-AE0844B524E7}.Release|x86.ActiveCfg = Release|x86
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Release|x86.Build.0 = Release|x86 {AC6C1390-231E-401C-89DD-AE0844B524E7}.Release|x86.Build.0 = Release|x86
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Trial|Any CPU.ActiveCfg = Trial|Any CPU
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Trial|Any CPU.Build.0 = Trial|Any CPU
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Trial|x86.ActiveCfg = Trial|x86 {AC6C1390-231E-401C-89DD-AE0844B524E7}.Trial|x86.ActiveCfg = Trial|x86
{AC6C1390-231E-401C-89DD-AE0844B524E7}.Trial|x86.Build.0 = Trial|x86 {AC6C1390-231E-401C-89DD-AE0844B524E7}.Trial|x86.Build.0 = Trial|x86
EndGlobalSection EndGlobalSection
OmagCUT.vbproj
+1 -1
View File
@@ -428,7 +428,7 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator> <Generator>XamlIntelliSenseFileGenerator</Generator>
</Page> </Page>
<Page Include="OmagCUTTestDictionary.xaml"> <Page Include="OmagCUTDarkDictionary.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator> <Generator>XamlIntelliSenseFileGenerator</Generator>
</Page> </Page>
OmagCUTTestDictionary.xaml → OmagCUTDarkDictionary.xaml
+1 -1
View File
@@ -8,7 +8,7 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero" xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
xmlns:local="clr-namespace:OmagCUT.ArithmeticConverterNameSpace" xmlns:local="clr-namespace:OmagCUT.ArithmeticConverterNameSpace"
x:Class="OmagCUTTestDictionary"> x:Class="OmagCUTDarkDictionary">
<!--Importo EgtDictionary--><!-- <!--Importo EgtDictionary--><!--
OptionsPageUC.xaml.vb
+4 -4
View File
@@ -215,7 +215,7 @@ Public Class OptionsPageUC
WritePrivateProfileString(S_GENERAL, K_THEME, 0, m_MainWindow.GetIniFile()) WritePrivateProfileString(S_GENERAL, K_THEME, 0, m_MainWindow.GetIniFile())
End If End If
If (ThemesCmBx.SelectedIndex = 1) Then If (ThemesCmBx.SelectedIndex = 1) Then
'app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTTestDictionary.xaml", UriKind.Relative)) 'app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTDarkDictionary.xaml", UriKind.Relative))
'Application.Current.Resources("GroupBox_CornerRadius") = 3 'Application.Current.Resources("GroupBox_CornerRadius") = 3
'Application.Current.Resources("Button_CornerRadius") = 3 'Application.Current.Resources("Button_CornerRadius") = 3
'Application.Current.Resources("EmptyBorder_CornerRadius") = New CornerRadius(3) 'Application.Current.Resources("EmptyBorder_CornerRadius") = New CornerRadius(3)
@@ -226,12 +226,12 @@ Public Class OptionsPageUC
Private Sub Themes_StartUp() Private Sub Themes_StartUp()
Dim app As Application = Application.Current Dim app As Application = Application.Current
If (ThemesCmBx.SelectedIndex = 0) Then If ThemesCmBx.SelectedIndex = 0 Then
app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTClassicDictionary.xaml", UriKind.Relative)) app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTClassicDictionary.xaml", UriKind.Relative))
m_MainWindow.EgtWPFInit() m_MainWindow.EgtWPFInit()
End If End If
If (ThemesCmBx.SelectedIndex = 1) Then If ThemesCmBx.SelectedIndex = 1 Then
app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTTestDictionary.xaml", UriKind.Relative)) app.ChangeTheme(New Uri("/OmagCUT;component/OmagCUTDarkDictionary.xaml", UriKind.Relative))
Application.Current.Resources("GroupBox_CornerRadius") = 3 Application.Current.Resources("GroupBox_CornerRadius") = 3
Application.Current.Resources("Button_CornerRadius") = 3 Application.Current.Resources("Button_CornerRadius") = 3
Application.Current.Resources("EmptyBorder_CornerRadius") = New CornerRadius(3) Application.Current.Resources("EmptyBorder_CornerRadius") = New CornerRadius(3)