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

OmagCUT 2.1h1 :

Browse Source 
- Aggiunti Dizionari per i temi e ComboBox in OptionsPageUC per il cambio dei temi. Questa versione di OmagCUT funziona esattamente come la precedente, come se non ci fossero i temi, perché la scelta dei temi è nascosta (ThemesGpBx.Visibility = Windows.Visibility.Collapsed in OptionsPageUC.xaml.vb)
This commit is contained in:
Renzo Lanza
2019-08-01 08:44:35 +00:00
parent 5ea20f2db5
commit bfd3f21e25
11 changed files with 3112 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Application.xaml
+12
View File
@@ -4,7 +4,19 @@
StartupUri="MainWindow.xaml" ShutdownMode="OnMainWindowClose" >
<Application.Resources>
<!--<ResourceDictionary Source="OmagCUTDictionary.xaml"/>-->
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<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>
</ResourceDictionary>
</Application.Resources>
</Application>
Application.xaml.vb
+16
View File
@@ -44,4 +44,20 @@ Class Application
' thisDpiHeightFactor = m.M22
'End Sub
Public Property ThemeDictionary As ResourceDictionary
' You could probably get it via its name with some query logic as well.
Get
Return Resources.MergedDictionaries(0)
End Get
Set(value As ResourceDictionary)
End Set
End Property
Public Sub ChangeTheme(uri As Uri)
ThemeDictionary.MergedDictionaries.Clear()
Dim rd As ResourceDictionary = New ResourceDictionary()
rd.Source = uri
ThemeDictionary.MergedDictionaries.Add(rd) ' New ResourceDictionary()) ' Source:=uri))
End Sub
End Class
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -62,5 +62,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.1.7.4")>
<Assembly: AssemblyFileVersion("2.1.7.4")>
<Assembly: AssemblyVersion("2.1.8.1")>
<Assembly: AssemblyFileVersion("2.1.8.1")>
OmagCUT.vbproj
+15
View File
@@ -226,6 +226,9 @@
<Compile Include="FrameMachiningUC.xaml.vb">
<DependentUpon>FrameMachiningUC.xaml</DependentUpon>
</Compile>
<Compile Include="OmagCUTAlternativeDictionary.xaml.vb">
<DependentUpon>OmagCUTAlternativeDictionary.xaml</DependentUpon>
</Compile>
<Compile Include="SideAngle.vb" />
<Compile Include="UnderDrillUC.xaml.vb">
<DependentUpon>UnderDrillUC.xaml</DependentUpon>
@@ -420,6 +423,18 @@
<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="OmagCUTTestDictionary.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UnderDrillUC.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
OmagCUTAlternativeDictionary.xaml
+2524
View File
File diff suppressed because it is too large Load Diff
OmagCUTAlternativeDictionary.xaml.vb
+310
View File
@@ -0,0 +1,310 @@
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
OmagCUTClassicDictionary.xaml
+22
View File
@@ -0,0 +1,22 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
xmlns:project="clr-namespace:OmagCUT"
xmlns:ControlExtensions="clr-namespace:OmagCUT.ControlExtensions"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
xmlns:local="clr-namespace:OmagCUT.ArithmeticConverterNameSpace"
x:Class="OmagCUTClassicDictionary">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="OmagCUTDictionary.xaml" />
</ResourceDictionary.MergedDictionaries>
<!--Button generico-->
<Style x:Key="OmagCut_Button2" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<!--<Setter Property="Background" Value="ForestGreen"/>-->
</Style>
</ResourceDictionary>
OmagCUTTestDictionary.xaml
+54
View File
@@ -0,0 +1,54 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
xmlns:project="clr-namespace:OmagCUT"
xmlns:ControlExtensions="clr-namespace:OmagCUT.ControlExtensions"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
xmlns:local="clr-namespace:OmagCUT.ArithmeticConverterNameSpace"
x:Class="OmagCUTTestDictionary">
<!--Importo EgtDictionary--><!--
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="EgtDictionary.xaml" />
</ResourceDictionary.MergedDictionaries>-->
<!--Importo EgtDictionary-->
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="OmagCUTDictionary.xaml" />
</ResourceDictionary.MergedDictionaries>
<system:Double x:Key="Button_CornerRadius">9.5</system:Double>
<!--2.5mm-->
<Thickness x:Key="BorderThickness">3.3</Thickness>
<SolidColorBrush x:Key="OmagCut_Gray" Color="Azure" />
<!--Button generico-->
<Style x:Key="OmagCut_Button2" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
<!--<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
<Setter Property="ControlExtensions:ToggleButtonExtensions.CornerRadius" Value="{StaticResource Button_CornerRadius}"/>-->
<!--<Setter Property="BorderBrush" Value="Yellow" />-->
<!--<Setter Property="Background" Value="#4A4F55"/>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#145994"/>
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="#E1B957"/>
</Trigger>
<Trigger Property="ToggleButton.IsChecked" Value="True">
<Setter Property="Background" Value="#656975"/>
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="#3C3F48"/>
<Setter Property="BorderBrush" Value="#FFADB2B5"/>
<Setter Property="TextElement.Foreground" Value="#FF838383"/>
</Trigger>
</Style.Triggers>-->
</Style>
</ResourceDictionary>
OptionsPageUC.xaml
+29
View File
@@ -353,6 +353,35 @@
</GroupBox>
<GroupBox Name="ThemesGpBx"
Grid.Column="1"
Grid.Row="5"
Grid.ColumnSpan="2"
Style="{StaticResource OmagCut_GroupBox}">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="4*"/>
<ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="0.25*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.25*"/>
</Grid.RowDefinitions>
<ComboBox Name="ThemesCmBx" Grid.Column="1" Grid.Row="1" Style="{StaticResource OmagCut_ComboBox}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</Grid>
</GroupBox>
<GroupBox Name="FeedbackGpBx"
Grid.Column="4" Grid.RowSpan="3" Grid.ColumnSpan="1"
Style="{StaticResource OmagCut_GroupBox}">
OptionsPageUC.xaml.vb
+19 -2
View File
@@ -7,6 +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 Sub OptionsPageUC_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
@@ -14,6 +15,8 @@ Public Class OptionsPageUC
LanguageCmBx.ItemsSource = m_MainWindow.m_LanguagesList
' Associazione della lista unità di misura alla combobox
UnitsOfMeasureCmBx.ItemsSource = UnitsList
' Associazione della lista temi alla combobox
ThemesCmBx.ItemsSource = ThemesList
' Imposto la lingua corrente
LanguageCmBx.SelectedItem = m_MainWindow.m_CurrLanguage
@@ -21,6 +24,12 @@ Public Class OptionsPageUC
' Imposto l'unità di misura corrente
UnitsOfMeasureCmBx.SelectedIndex = If(EgtUiUnitsAreMM(), 1, 0)
' Imposto il tema corrente
ThemesCmBx.SelectedIndex = 0
' Rendo invisibile il GroupBox dei Temi la versione corrente
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
FastGridGpBx.Visibility = Windows.Visibility.Visible
@@ -82,6 +91,7 @@ Public Class OptionsPageUC
TalloneMsgTxBl.Text = EgtMsg(MSG_OPTIONSPAGEUC + 22)
InclinazioneMsgTxBl.Text = EgtMsg(MSG_OPTIONSPAGEUC + 23)
FeedbackGpBx.Header = "Feedback"
ThemesGpBx.Header = "Temi"
End Sub
@@ -196,6 +206,13 @@ Public Class OptionsPageUC
UpdateAllCSTA()
End Sub
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))
End Sub
Private Sub EnableFastGridBtn_Checked(sender As Object, e As RoutedEventArgs) Handles EnableFastGridBtn.Checked
WritePrivateProfileString(S_FASTGRID, K_FG_ACTIVE, 1, m_MainWindow.GetIniFile())
' Disattivo importazione Dxf e pezzi parametrici
@@ -538,7 +555,7 @@ Public Class OptionsPageUC
Private Sub ToleranceMsgTxBx_TextChanged(sender As Object, e As TextChangedEventArgs) Handles ToleranceMsgTxBx.TextChanged
Dim nToler As Integer
if Not StringToInt( ToleranceMsgTxBx.Text, nToler) Then
If Not StringToInt(ToleranceMsgTxBx.Text, nToler) Then
nToler = 25
ToleranceMsgTxBx.Text = nToler.ToString()
End If
@@ -559,7 +576,7 @@ Public Class OptionsPageUC
Private Sub StdThickMsgTxBx_TextChanged(sender As Object, e As TextChangedEventArgs) Handles StdThickMsgTxBx.TextChanged
Dim dThick As Double
if Not StringToLen( StdThickMsgTxBx.Text, dThick) Then
If Not StringToLen(StdThickMsgTxBx.Text, dThick) Then
dThick = 25.4
StdThickMsgTxBx.Text = LenToString(dThick, 3)
End If