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

-piccole modifiche e pulizia codice

Browse Source
This commit is contained in:
Demetrio Cassarino
2025-01-27 10:12:09 +01:00
parent 7e647a1552
commit 0d0e24494a
19 changed files with 103 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Constants/ConstEgtStone3D.vb
+20 -3
View File
@@ -2,14 +2,29 @@
Public Const EGT_ROTATE As String = "Rotate"
Public Const EGT_AUTOPAIR As String = "AutoPair"
Public Const EGT_PAIR As String = "Pair"
Public Const EGT_UNPAIR As String = "Unpair"
Public Const EGT_RESET_INTERS As String = "ResetInters"
Public Const EGT_UNDO As String = "Undo"
Public Const EGT_REDO As String = "Redo"
Public Const EGT_SEL_TYPE As String = "SelType"
Public Const EGT_IMPORT_LOOP As String = "ImportLoop"
Public Const EGT_CREATE_SOLID_LOOP As String = "CreateSolidFromLoop"
Public Const EGT_MOVE As String = "Move"
Public Const EGT_ALZ As String = "AddSplashTop"
Public Const EGT_FRO As String = "AddWaterfall"
Public Const EGT_X As String = "X"
Public Const EGT_Y As String = "Y"
Public Const EGT_Z As String = "Z"
Public Const EGT_XY As String = "XY"
Public Const EGT_YX As String = "YX"
Public Const EGT_YZ As String = "YZ"
Public Const EGT_ZY As String = "ZY"
Public Const EGT_ZX As String = "ZX"
Public Const EGT_XZ As String = "XZ"
Public Const ASSEMBLER_FILENAME As String = "AssemblerLog.txt"
Public Const TERNA_FILENAME As String = "TernaVeinMatch.nge"
Public Const CREATESOLID_FILENAME As String = "CreateSOLID_FromPartsInPark.lua"
@@ -49,6 +64,8 @@
Public Const TABLE = "Table"
Public Const SUBTITLE = "SubTitle"
' nome file cn in progetto
Public Const KEY_ISOFILE_PATH = "IsoFilePath"
Constants/ConstGen.vb
+2
View File
@@ -34,6 +34,8 @@
' Sottodirettorio del Vein 3D
Public Const VEIND3D_DIR As String = "Vein3D_Dir"
' Sottodirettorio delle risorse
Public Const RESOURCES_DIR As String = "Resources"
' Sottodirettorio del Create Solid
Public Const CREATESOLID_DIR As String = "CreateSolid"
' Sottodirettorio dell'Operation Solid
EgtColorPicker/EgtColorPickerV.xaml
+3 -18
View File
@@ -29,6 +29,7 @@
</Grid.RowDefinitions>
<ListBox ItemsSource="{Binding BasicColors}"
SelectedItem="{Binding SelColor}"
ItemContainerStyle="{StaticResource BasicColorsItem_ListBox}"
Style="{StaticResource BasicColors_ListBox}">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
@@ -41,12 +42,6 @@
Style="{StaticResource EgtColorPicker_Rect}"/>
</DataTemplate>
</ListBox.ItemTemplate>
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Setter Property="Margin" Value="0"/>
<Setter Property="Padding" Value="0"/>
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
</Grid>
</TabItem>
@@ -80,6 +75,7 @@
</Grid.RowDefinitions>
<ListBox ItemsSource="{Binding BasicColorsTheme}"
SelectedItem="{Binding SelColorTheme}"
ItemContainerStyle="{StaticResource BasicColorsItem_ListBox}"
Style="{StaticResource BasicColorsTheme_ListBox}">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
@@ -92,12 +88,6 @@
Style="{StaticResource EgtColorPicker_Rect}"/>
</DataTemplate>
</ListBox.ItemTemplate>
<ListBox.ItemContainerStyle>
<Style TargetType="{x:Type ListBoxItem}">
<Setter Property="Margin" Value="0"/>
<Setter Property="Padding" Value="0"/>
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
</Grid>
</TabItem>
@@ -119,6 +109,7 @@
</Grid.RowDefinitions>
<ListBox ItemsSource="{Binding CustomColors}"
SelectedItem="{Binding SelCustomColor}"
ItemContainerStyle="{StaticResource BasicColorsItem_ListBox}"
Style="{StaticResource BasicColors_ListBox}">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
@@ -131,12 +122,6 @@
Style="{StaticResource EgtColorPicker_Rect}"/>
</DataTemplate>
</ListBox.ItemTemplate>
<ListBox.ItemContainerStyle>
<Style TargetType="{x:Type ListBoxItem}">
<Setter Property="Margin" Value="0"/>
<Setter Property="Padding" Value="0"/>
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
</Grid>
<Grid Grid.Row="2"
EgtManageFileDialog/EgtManageFileDialogV.xaml.vb
+1 -2
View File
@@ -1,5 +1,4 @@
Imports EgtWPFLib5
Imports System.Windows.Forms
Imports System.Windows.Forms
Public Class EgtManageFileDialogV
EgtManageFileDialog/EgtManageFileDialogVM.vb
-15
View File
@@ -397,11 +397,6 @@ Public Class EgtManageFileDialogVM
Dim IndexTemplete As Integer = GetMainPrivateProfileInt(S_TEMPLETESEL, K_CURRTEMPLETESEL, VisualizationContainerType.DATAGRID)
SelViewMode = m_ViewModeList.FirstOrDefault(Function(x) x.Id = IndexTemplete)
'If IndexTemplete = 3 Then
' m_nSelTab = VisualizationContainerType.DATAGRID
'Else
' nSelTempleteListView = IndexTemplete
'End If
NotifyPropertyChanged(NameOf(RootList))
NotifyPropertyChanged(NameOf(FilterList))
@@ -415,10 +410,6 @@ Public Class EgtManageFileDialogVM
#Region "METHODS"
'Private Function RootListFilter(CurrItem As Object) As Boolean
' Return TypeOf CurrItem Is EgtFolder
'End Function
''' <summary>
''' Inizializza la ComboBox per la scelta dei template
''' </summary>
@@ -440,12 +431,6 @@ Public Class EgtManageFileDialogVM
m_ViewModeList.Add(ItemVisualization)
End Sub
'Private Sub Directory_PropertyChanged(sender As Object, e As PropertyChangedEventArgs)
' If e.PropertyName = "IsSelected" Then
' 'UpdateSelRoot()
' End If
'End Sub
#End Region
#Region "COMMANDS"
EgtMessageBox/EgtMessageBoxV.xaml
+1
View File
@@ -2,6 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:EgtStone3D="clr-namespace:EgtStone3D"
Title="{Binding sTitle}"
SizeToContent="WidthAndHeight"
WindowStartupLocation="CenterOwner"
MainWindow/MainWindowM.vb
+9
View File
@@ -41,6 +41,13 @@ Public Class MainWindowM
End Get
End Property
Private m_sResourcesDir As String = String.Empty
Friend ReadOnly Property sResourcesDir As String
Get
Return m_sResourcesDir
End Get
End Property
Private m_sCreateSolidPath As String = String.Empty
Friend ReadOnly Property sCreateSolidPath As String
Get
@@ -277,6 +284,8 @@ Public Class MainWindowM
' Leggo tema corrente
Dim sThema As String = String.Empty
GetMainPrivateProfileString(S_GENERAL, K_THEMA, "", sThema)
' Impostazione direttorio delle risorse
m_sResourcesDir = m_sDataRoot & "\" & RESOURCES_DIR
' Info su opzioni chiave
EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString())
End Sub
Pair/PairVM.vb
+1 -2
View File
@@ -1,5 +1,4 @@
Imports System.Windows.Threading
Imports EgtUILib
Imports EgtUILib
Public Class PairVM
Inherits SceneUserControlVM
Rotate/RotateVM.vb
-1
View File
@@ -1,5 +1,4 @@
Imports EgtUILib
Imports EgtWPFLib5
Public Class RotateVM
Inherits SceneUserControlVM
SceneButton/SceneButtonV.xaml.vb
-17
View File
@@ -93,23 +93,6 @@
m_MoveUC = Nothing
End Sub
Public Sub LoadSceneUserControl()
If IsNothing(m_SceneUserControlV) Then
m_SceneUserControlV = New SceneUserControlV
Grid.SetColumn(m_SceneUserControlV, 0)
Grid.SetRow(m_SceneUserControlV, 0)
Grid.SetColumnSpan(m_SceneUserControlV, 2)
Grid.SetRowSpan(m_SceneUserControlV, 2)
MainGrid.Children.Add(m_SceneUserControlV)
End If
End Sub
Public Sub RemoveSceneUserControlV()
MainGrid.Children.Remove(m_SceneUserControlV)
m_SceneUserControlV = Nothing
End Sub
#End Region ' Methods
End Class
SceneButton/SceneButtonVM.vb
+12 -14
View File
@@ -98,7 +98,7 @@ Public Class SceneButtonVM
Dim Index As Integer = 1
Dim SubTitle As String = String.Empty
Dim sKeyTitle As String = TOPPANELLIST_BTN & "_" & Index.ToString()
While GetMainPrivateProfileString(sKeyTitle, "SubTitle", "", SubTitle) > 0
While GetMainPrivateProfileString(sKeyTitle, ConstEgtStone3D.SUBTITLE, "", SubTitle) > 0
SetGroupButtonsLocation(sKeyTitle, m_TopPanelListGroupBtn)
Index += 1
sKeyTitle = TOPPANELLIST_BTN & "_" & Index.ToString()
@@ -131,7 +131,7 @@ Public Class SceneButtonVM
ListBtn.Add(New _ButtonComboBox(sItems(1), sItems(2), sItems(3), sItems(4)))
End If
End If
Index = Index + 1
Index += 1
sBtnString = String.Empty
End While
End Sub
@@ -140,7 +140,7 @@ Public Class SceneButtonVM
Dim LocalListSceneBtn As New List(Of SceneBtn)
Dim SubTitle As String = String.Empty
SetButtonsLocation(PositionList, LocalListSceneBtn)
GetMainPrivateProfileString(PositionList, "SubTitle", "", SubTitle)
GetMainPrivateProfileString(PositionList, ConstEgtStone3D.SUBTITLE, "", SubTitle)
ListGroupBtn.Add(New GroupSceneBtn(LocalListSceneBtn, SubTitle))
End Sub
@@ -221,8 +221,6 @@ Public Class SceneBtn
#Region "FIELDS & PROPETIES"
Private m_ResourcesDir As String = "C:\EgtData\EgtSTONE3D\Resources\"
Private m_Name As String = String.Empty
Public Property Name As String
Get
@@ -269,7 +267,7 @@ Public Class SceneBtn
Sub New(_Name As String, _Img As String, _Flag As String)
m_Name = _Name
m_Img = m_ResourcesDir & _Img
m_Img = Map.refMainWindowVM.MainWindowM.sResourcesDir & "\" & _Img
m_Flag = _Flag
End Sub
@@ -379,36 +377,36 @@ Module SceneCmd
Dim _SceneHostVM As SceneHostVM = DirectCast(Map.refSceneHostV.DataContext, SceneHostVM)
Dim nVeinCtx As Integer = _SceneHostVM.MainScene.GetCtx()
Select Case Flag
Case "AutoPair"
Case EGT_AUTOPAIR
EgtSetCurrentContext(nVeinCtx)
EgtLuaSetGlobIntVar("ASS.nVeinCtx", nVeinCtx)
EgtLuaCallFunction("ASS.PairAll")
Case "Unpair"
Case EGT_UNPAIR
SolidManagerM.Unpair(Map.refSceneHostV.m_nIdPart)
Case EGT_PAIR
Map.refSceneButtonV.LoadPairUC()
Case "ResetInters"
Case EGT_RESET_INTERS
SolidManagerM.ResetInters()
Case EGT_ROTATE
Map.refSceneButtonV.LoadRotateUC()
Case EGT_MOVE
Map.refSceneButtonV.LoadMoveUC()
Case "Undo"
Case EGT_UNDO
' se con questa operazione torno all'inizio disattivo il bottone undo
SolidManagerM.UndoEvent()
SolidManagerM.ManageUndoRedo()
EgtDraw()
Case "Redo"
Case EGT_REDO
' se con questa operazione ho finito la storia disponibile disattivo il bottone redo
SolidManagerM.RedoEvent()
SolidManagerM.ManageUndoRedo()
EgtDraw()
Case "SelType"
Case EGT_SEL_TYPE
Map.refSceneButtonV.MenuSelType.IsOpen = True
Case "ImportLoop"
Case EGT_IMPORT_LOOP
'ImportLoop()
EgtInsertFile("D:\Temp\marmo\Vein3D\OutLoop.nge")
Case "CreateSolidFromLoop"
Case EGT_CREATE_SOLID_LOOP
SolidManagerM.CreateSolidFromLoop(Map.refSceneHostV.m_nIdPart)
Case EGT_ALZ
Map.refSceneHostV.m_SelType = GDB_TY.CRV_LINE
SceneHost/MySceneHostVM.vb
+6 -4
View File
@@ -194,10 +194,12 @@ Public Class MySceneHostVM
End If
Dim OpenFileDialog As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
.Title = EgtMsg(110015),
.Filter = "Icarus project(*.icrs)|*.icrs" &
"|New geometry EgalTech(*.nge)|*.nge",
.FilterIndex = 1,
.InitialDirectory = sDir
.Filter = "nge files (*.nge)|*.nge" &
"|vme files (*.vme)|*.vme",
.FileName = "New.vme",
.FilterIndex = 2,
.InitialDirectory = sDir,
.Mode = 1
}
If Not OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then Return False
sFilePath = OpenFileDialog.FileName
SceneHost/SceneHostV.xaml.vb
+11 -13
View File
@@ -92,7 +92,7 @@ Public Class SceneHostV
'debug
'EgtOpenFile("D:\\Temp\\marmo\\Vein3D\\piano_PREassemlbaggio.vme")
EgtOpenFile("D:\\Temp\\marmo\\Vein3D\\prima paretina.nge")
'EgtOpenFile("D:\\Temp\\marmo\\Vein3D\\prima paretina.nge")
'EgtOpenFile("D:\\Temp\\marmo\\Vein3D\\FOO.nge")
'debug
@@ -256,35 +256,35 @@ Public Class SceneHostV
Dim nPartId As Integer = EgtGetParent(EgtGetParent(nId))
Dim sName As String = String.Empty
EgtGetName(nPartId, sName)
If sName = "Terna" Then
If sName = TERNA Then
Dim sNameAx As String = String.Empty
EgtGetName(EgtGetParent(nId), sNameAx)
Dim PartSolidIdTempSel As PartSolidM = GetPartSolid(m_nIdPart)
If IsNothing(PartSolidIdTempSel) Then Return
'PartSolidIdTempSel.Unpair()
Select Case sNameAx
Case "X"
Case EGT_X
Dim vtDir As New Vector3d
Dim nLay As Integer = EgtGetFirstNameInGroup(PartSolidIdTempSel.TernaId, "AxisX")
EgtStartVector(EgtGetFirstInGroup(nLay), GDB_RT.GLOB, vtDir)
PartSolidIdTempSel.vtDrag = vtDir
m_bDrag = True
'wnd_RotationInputDataV.Testo.Text = "α°"
Case "Y"
Case EGT_Y
Dim vtDir As New Vector3d
Dim nLay As Integer = EgtGetFirstNameInGroup(PartSolidIdTempSel.TernaId, "AxisY")
EgtStartVector(EgtGetFirstInGroup(nLay), GDB_RT.GLOB, vtDir)
PartSolidIdTempSel.vtDrag = vtDir
m_bDrag = True
'wnd_RotationInputDataV.Testo.Text = "𝛃°"
Case "Z"
Case EGT_Z
Dim vtDir As New Vector3d
Dim nLay As Integer = EgtGetFirstNameInGroup(PartSolidIdTempSel.TernaId, "AxisZ")
EgtStartVector(EgtGetFirstInGroup(nLay), GDB_RT.GLOB, vtDir)
PartSolidIdTempSel.vtDrag = vtDir
m_bDrag = True
'wnd_RotationInputDataV.Testo.Text = "𝛄°"
Case "XY", "YX"
Case EGT_XY, EGT_YX
If (Keyboard.Modifiers And ModifierKeys.Shift) > 0 Then
PartSolidIdTempSel.vtDrag = Vector3d.Z_AX
m_bDrag = True
@@ -295,7 +295,7 @@ Public Class SceneHostV
nId = EgtGetNextObjInSelWin()
Continue While
End If
Case "YZ", "ZY"
Case EGT_YZ, EGT_ZY
If (Keyboard.Modifiers And ModifierKeys.Shift) > 0 Then
PartSolidIdTempSel.vtDrag = Vector3d.X_AX
m_bDrag = True
@@ -306,7 +306,7 @@ Public Class SceneHostV
nId = EgtGetNextObjInSelWin()
Continue While
End If
Case "ZX", "XZ"
Case EGT_ZX, EGT_XZ
If (Keyboard.Modifiers And ModifierKeys.Shift) > 0 Then
PartSolidIdTempSel.vtDrag = Vector3d.Y_AX
m_bDrag = True
@@ -318,13 +318,13 @@ Public Class SceneHostV
Continue While
End If
' sennò procedo ad esseguire la rotazione attorno al segmento selezionato...
Case "AxisX"
Case AXISX
'wnd_RotationInputDataV.Testo.Text = "α°"
GoTo Line1
Case "AxisY"
Case AXISY
'wnd_RotationInputDataV.Testo.Text = "𝛃°"
GoTo Line1
Case "AxisZ"
Case AXISZ
'wnd_RotationInputDataV.Testo.Text = "𝛄°"
GoTo Line1
Case Else
@@ -670,8 +670,6 @@ Line1:
If m_nIdPart = GDB_ID.NULL Then Return
Dim ptCurr As Point3d
EgtUnProjectPoint(e.Location, ptCurr)
Dim PartSolidSel As PartSolidM = GetPartSolid(m_nIdPart)
If IsNothing(PartSolidSel) Then Return
If Not m_bRotate Then
TopPanel/TopPanelVM.vb
+15 -14
View File
@@ -121,7 +121,7 @@ Public Class TopPanelVM
Public ReadOnly Property FileSourceSVG As String
Get
Return "C:\EgtData\EgtStone3D\Resources\test.svg"
Return Map.refMainWindowVM.MainWindowM.sResourcesDir & "\test.svg"
End Get
End Property
@@ -259,21 +259,22 @@ Public Class TopPanelVM
End Property
Private Sub OpenFile()
Dim OpenFileDialog As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
.Title = EgtMsg(110015),
.Filter = "nge files (*.nge)|*.nge" &
"|vme files (*.vme)|*.vme",
.FileName = "New.vme",
.FilterIndex = 2,
.InitialDirectory = "C:\EgtData\EgtStone3D\Temp",
.Mode = 1
}
'Dim OpenFileDialog As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
' .Title = EgtMsg(110015),
' .Filter = "nge files (*.nge)|*.nge" &
' "|vme files (*.vme)|*.vme",
' .FileName = "New.vme",
' .FilterIndex = 2,
' .InitialDirectory = "C:\EgtData\EgtStone3D\Temp",
' .Mode = 1
'}
If Not OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then Return
If String.IsNullOrEmpty(OpenFileDialog.FileName) Then Return
'If Not OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then Return
'If String.IsNullOrEmpty(OpenFileDialog.FileName) Then Return
Dim sFilePath As String = OpenFileDialog.FileName
EgtOpenFile(sFilePath)
'Dim sFilePath As String = OpenFileDialog.FileName
'EgtOpenFile(sFilePath)
OpenProject("")
SolidManagerM.CreatePartSolid()
EgtDraw()
End Sub
TopPanel/TopPanelViewProspectiveV.xaml
+2 -1
View File
@@ -15,7 +15,8 @@
</Button>
<Popup IsOpen="{Binding IsOpenProspective}"
AllowsTransparency="True"
PopupAnimation="Scroll"
PopupAnimation="Scroll"
StaysOpen="False"
PlacementTarget="{Binding ElementName=ViewProspective}">
<Border Style="{StaticResource View_Border}">
<EgtStone3D:ViewPanelProspectiveV DataContext="{StaticResource ViewPanelProspectiveVM}"/>
TopPanel/TopPanelViewV.xaml
+1
View File
@@ -16,6 +16,7 @@
<Popup IsOpen="{Binding IsOpen}"
AllowsTransparency="True"
PopupAnimation="Scroll"
StaysOpen="False"
PlacementTarget="{Binding ElementName=View}">
<Border Style="{StaticResource View_Border}">
<EgtStone3D:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
Utility/EgtStone3DDarkDictionary.xaml
+3 -2
View File
@@ -18,7 +18,7 @@
<SolidColorBrush x:Key="Button.Static.Border" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
<SolidColorBrush x:Key="Button.MouseOver.Background" Color="{StaticResource EgtStone3D_Spindle_Color}"/>
<SolidColorBrush x:Key="Button.MouseOver.Border" Color="{StaticResource EgtStone3D_BostonBlue_Color}"/>
<SolidColorBrush x:Key="Button.Pressed.Background" Color="{StaticResource EgtStone3D_CottonSeed_Color}"/>
<SolidColorBrush x:Key="Button.Pressed.Background" Color="{StaticResource EgtStone3D_CornflowerBlue_Color}"/>
<SolidColorBrush x:Key="Button.Pressed.Border" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
<SolidColorBrush x:Key="Button.Disabled.Background" Color="{StaticResource EgtStone3D_WildSand_Color}"/>
<SolidColorBrush x:Key="Button.Disabled.Border" Color="{StaticResource EgtStone3D_Bombay_Color}"/>
@@ -81,7 +81,8 @@
<!--#region TabControlColor-->
<SolidColorBrush x:Key="TabControl.Static.Backgroung" Color="{StaticResource EgalwareTransparent_Color}"/>
<SolidColorBrush x:Key="TabControlTreeView.Static.Backgroung" Color="{StaticResource EgalwareWhite_Color}"/>
<SolidColorBrush x:Key="TabControl.Static.Backgroung" Color="{StaticResource EgtStone3D_CornflowerBlue_Color}"/>
<!--#endregion TabControlColor-->
Utility/EgtStone3DDefaultStyle.xaml
+13 -9
View File
@@ -336,7 +336,7 @@
<Setter Property="HorizontalAlignment" Value="Right"/>
<Setter Property="Height" Value="24"/>
<Setter Property="Width" Value="64"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="FontSize" Value="12"/>
<Setter Property="Margin" Value="2.5,0,5,0"/>
</Style>
@@ -412,7 +412,6 @@
</Setter>
</Style>
<Style x:Key="SceneToggleButton" TargetType="{x:Type ToggleButton}">
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="Margin" Value="1"/>
@@ -451,8 +450,8 @@
<Setter Property="Height" Value="24"/>
<Setter Property="Width" Value="64"/>
<Setter Property="IsChecked" Value="True"/>
<Setter Property="BorderThickness" Value="1,1,1,0"/>
<Setter Property="Margin" Value="5,0,5,0"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="Margin" Value="5,5,5,0"/>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="TextBlock.FontWeight" Value="ExtraBold"/>
@@ -463,8 +462,8 @@
<Style x:Key="Parametrico_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource General_ToogleButton}">
<Setter Property="Height" Value="24"/>
<Setter Property="Width" Value="100"/>
<Setter Property="BorderThickness" Value="1,1,1,0"/>
<Setter Property="Margin" Value="5,0,5,0"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="Margin" Value="5,5,5,0"/>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="TextBlock.FontWeight" Value="ExtraBold"/>
@@ -1889,12 +1888,12 @@
<Style x:Key="TopPanel_TabControl" TargetType="{x:Type TabControl}">
<Setter Property="Background" Value="{DynamicResource TabControl.Static.Backgroung}"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="Height" Value="100"/>
<Setter Property="Height" Value="103"/>
<Setter Property="Margin" Value="0,-2.5,0,0"/>
</Style>
<Style x:Key="TreeView_TC" TargetType="{x:Type TabControl}">
<Setter Property="Background" Value="{DynamicResource TabControl.Static.Backgroung}"/>
<Setter Property="BorderBrush" Value="{StaticResource EgalwareWhite}"/>
<Setter Property="Background" Value="{DynamicResource TabControlTreeView.Static.Backgroung}"/>
<Setter Property="BorderThickness" Value="0"/>
</Style>
@@ -2116,6 +2115,11 @@
<Setter Property="BorderThickness" Value="0"/>
</Style>
<Style x:Key="BasicColorsItem_ListBox" TargetType="{x:Type ListBoxItem}">
<Setter Property="Margin" Value="0"/>
<Setter Property="Padding" Value="0"/>
</Style>
<!--#endregion ListBoxStyle-->
<!-- ______________________________________________________________________________________________________________________________________________ -->
Utility/EgtStone3DDictionary.xaml
+3 -2
View File
@@ -18,7 +18,7 @@
<SolidColorBrush x:Key="Button.Static.Border" Color="{StaticResource EgtStone3D_DoveGray_Color}"/>
<SolidColorBrush x:Key="Button.MouseOver.Background" Color="{StaticResource EgtStone3D_Spindle_Color}"/>
<SolidColorBrush x:Key="Button.MouseOver.Border" Color="{StaticResource EgtStone3D_BostonBlue_Color}"/>
<SolidColorBrush x:Key="Button.Pressed.Background" Color="{StaticResource EgtStone3D_CottonSeed_Color}"/>
<SolidColorBrush x:Key="Button.Pressed.Background" Color="{StaticResource EgtStone3D_Alto_Color}"/>
<SolidColorBrush x:Key="Button.Pressed.Border" Color="{StaticResource EgtStone3D_Calypso_Color}"/>
<SolidColorBrush x:Key="Button.Disabled.Background" Color="{StaticResource EgtStone3D_WildSand_Color}"/>
<SolidColorBrush x:Key="Button.Disabled.Border" Color="{StaticResource EgtStone3D_Bombay_Color}"/>
@@ -81,7 +81,8 @@
<!--#region TabControlColor-->
<SolidColorBrush x:Key="TabControl.Static.Backgroung" Color="{StaticResource EgalwareTransparent_Color}"/>
<SolidColorBrush x:Key="TabControl.Static.Backgroung" Color="{StaticResource EgtStone3D_Alto_Color}"/>
<SolidColorBrush x:Key="TabControlTreeView.Static.Backgroung" Color="{StaticResource EgalwareWhite_Color}"/>
<!--#endregion TabControlColor-->