From e433c064614d2f531b88849e52ffd17a6cd87ee7 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Mon, 13 Jan 2025 15:42:39 +0100
Subject: [PATCH] -creato usercontrol generico

---
 EgtManageFileDialog/EgtManageFileDialogV.xaml |   9 +-
 EgtStone3D.vbproj                             |   8 +
 Move/MoveV.xaml                               |   8 +-
 Move/MoveVM.vb                                | 160 ++++------
 OptionsWindow/OptionWindowV.xaml              |  70 +++--
 Pair/PairV.xaml                               |   1 +
 Rotate/RotateV.xaml                           |  10 +-
 SceneButton/SceneButtonV.xaml.vb              |  33 +-
 SceneButton/SceneButtonVM.vb                  |   5 +
 SceneUserControl/SceneUserControlV.xaml       |  98 ++++++
 SceneUserControl/SceneUserControlV.xaml.vb    |   3 +
 SceneUserControl/SceneUserControlVM.vb        | 276 +++++++++++++++++
 TopPanel/TopPanelV.xaml                       |  12 +
 Utility/EgtStone3DDarkDictionary.xaml         | 109 +++++++
 Utility/EgtStone3DDefaultStyle.xaml           | 293 ++++++++++++++++++
 Utility/EgtStone3DDictionary.xaml             | 110 +++++++
 16 files changed, 1056 insertions(+), 149 deletions(-)
 create mode 100644 SceneUserControl/SceneUserControlV.xaml
 create mode 100644 SceneUserControl/SceneUserControlV.xaml.vb
 create mode 100644 SceneUserControl/SceneUserControlVM.vb

diff --git a/EgtManageFileDialog/EgtManageFileDialogV.xaml b/EgtManageFileDialog/EgtManageFileDialogV.xaml
index 258da61..2bbcced 100644
--- a/EgtManageFileDialog/EgtManageFileDialogV.xaml
+++ b/EgtManageFileDialog/EgtManageFileDialogV.xaml
@@ -3,8 +3,8 @@
                           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                           xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"                 
                           Title="{Binding sTitle}"
-                          Height="500"
-                          Width="800"
+                          Height="600"
+                          Width="1000"
                           WindowStartupLocation="CenterOwner"
                           Style="{StaticResource Dialog_Window}">
 
@@ -37,10 +37,10 @@
       <Grid Grid.Row="1"
             Style="{StaticResource TopPanel_Grid}">
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1.5*"/>
             <ColumnDefinition Width="4*"/>
          </Grid.ColumnDefinitions>
-         <TreeView x:Name="FileTree" 
+         <TreeView x:Name="FileTree"
                    ItemsSource="{Binding RootList}"                   
                    Style="{StaticResource FileTree_TV}">
             <TreeView.Resources>
@@ -320,6 +320,7 @@
                    Style="{StaticResource Button_UniformGrid}">
          <Button IsDefault="True"
                  Content="OK"
+                 IsCancel="True"
                  Command="{Binding Ok_Command}"
                  Style="{StaticResource Ok_Btn}"/>
          <Button Content="Cancel"
diff --git a/EgtStone3D.vbproj b/EgtStone3D.vbproj
index b5b890b..4637c81 100644
--- a/EgtStone3D.vbproj
+++ b/EgtStone3D.vbproj
@@ -138,6 +138,10 @@
     <Compile Include="SceneHost\SceneHostV.xaml.vb">
       <DependentUpon>SceneHostV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SceneUserControl\SceneUserControlV.xaml.vb">
+      <DependentUpon>SceneUserControlV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="SceneUserControl\SceneUserControlVM.vb" />
     <Compile Include="SecondaryWindow\SecondaryWindowV.xaml.vb">
       <DependentUpon>SecondaryWindowV.xaml</DependentUpon>
     </Compile>
@@ -205,6 +209,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="SceneUserControl\SceneUserControlV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SecondaryWindow\SecondaryWindowV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Move/MoveV.xaml b/Move/MoveV.xaml
index 0513f77..93baf5c 100644
--- a/Move/MoveV.xaml
+++ b/Move/MoveV.xaml
@@ -1,10 +1,6 @@
 <UserControl x:Class="MoveV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:EgtStone3D"
-             mc:Ignorable="d"
              Width="150" 
              Height="140">
    <StackPanel Name ="WinRotate" 
@@ -52,11 +48,13 @@
          </Grid.ColumnDefinitions>
          <Button Grid.Column="0"
                  Name="Conferma"
+                 IsDefault="True"
+                 IsCancel="True"
                  Content="{Binding Conferma_Msg}"
                  Command="{Binding ConfermaCmd}"/>
          <Button Grid.Column="1"
                  Name="Preview"
-                 Content="Preview"
+                 Content="Preview" 
                  Command="{Binding PreviewCmd}"/>
          <Button Grid.Column="2"
                  Name="Annulla"
diff --git a/Move/MoveVM.vb b/Move/MoveVM.vb
index 8eac5a3..1344fb0 100644
--- a/Move/MoveVM.vb
+++ b/Move/MoveVM.vb
@@ -1,81 +1,42 @@
 Imports EgtUILib
-Imports EgtWPFLib5
 
 Public Class MoveVM
+   Inherits SceneUserControlVM
 
-#Region "FIELDS & PROPERTIES"
+#Region "CONTRUCTOR"
 
-#Region "Messages"
+   Public Sub New()
+      MyBase.New()
 
-   Public ReadOnly Property Conferma_Msg As String
-      Get
-         Return EgtMsg(110003)
-      End Get
-   End Property
+      LoadParamList()
+   End Sub
 
-   Public ReadOnly Property Annulla_Msg As String
-      Get
-         Return EgtMsg(110004)
-      End Get
-   End Property
-
-   Public ReadOnly Property TopBar_Msg As String
-      Get
-         Return EgtMsg(110005)
-      End Get
-   End Property
-
-   Public ReadOnly Property Testo_Msg As String
-      Get
-         Return EgtMsg(110006)
-      End Get
-   End Property
-
-#End Region    ' Messages
-
-   Private m_ConfermaCmd As ICommand
-   Public ReadOnly Property ConfermaCmd As ICommand
-      Get
-         If m_ConfermaCmd Is Nothing Then
-            m_ConfermaCmd = New Command(AddressOf Conferma)
-         End If
-         Return m_ConfermaCmd
-      End Get
-   End Property
-
-   Private m_PreviewCmd As ICommand
-   Public ReadOnly Property PreviewCmd As ICommand
-      Get
-         If m_PreviewCmd Is Nothing Then
-            m_PreviewCmd = New Command(AddressOf ShowPreview)
-         End If
-         Return m_PreviewCmd
-      End Get
-   End Property
-
-   Private m_AnnullaCmd As ICommand
-   Public ReadOnly Property AnnullaCmd As ICommand
-      Get
-         If m_AnnullaCmd Is Nothing Then
-            m_AnnullaCmd = New Command(AddressOf Annulla)
-         End If
-         Return m_AnnullaCmd
-      End Get
-   End Property
-
-#End Region    ' Fields & Properties
+#End Region    ' Contructor
 
 #Region "METHODS"
 
-   Public Sub Conferma()
+   Public Overrides Sub LoadParamList()
+      Title = EgtMsg(110018).ToUpper()
+      ParamList.Add(New _TextBlockParam("Messaggio", EgtMsg(110005)))
+      ParamList.Add(New _TextBoxParam("X", "0"))
+      ParamList.Add(New _TextBoxParam("Y", "0"))
+      ParamList.Add(New _TextBoxParam("Z", "0"))
+   End Sub
+
+   Public Overrides Sub Conferma()
       ' se non avevo visualizzato la preview allora sposto il/i pezzo/i
       If Not Map.refSceneHostV.m_bPreviewShown Then
-         If String.IsNullOrEmpty(Map.refSceneButtonV.m_MoveUC.TextX.Text) Then Map.refSceneButtonV.m_MoveUC.TextX.Text = "0"
-         If String.IsNullOrEmpty(Map.refSceneButtonV.m_MoveUC.TextY.Text) Then Map.refSceneButtonV.m_MoveUC.TextY.Text = "0"
-         If String.IsNullOrEmpty(Map.refSceneButtonV.m_MoveUC.TextZ.Text) Then Map.refSceneButtonV.m_MoveUC.TextZ.Text = "0"
-         Dim vtMove As New Vector3d(CDbl(Map.refSceneButtonV.m_MoveUC.TextX.Text),
-                                    CDbl(Map.refSceneButtonV.m_MoveUC.TextY.Text),
-                                    CDbl(Map.refSceneButtonV.m_MoveUC.TextZ.Text))
+
+         Dim x_TextBox As _TextBoxParam = DirectCast(ParamList(1), _TextBoxParam)
+         Dim y_TextBox As _TextBoxParam = DirectCast(ParamList(2), _TextBoxParam)
+         Dim z_TextBox As _TextBoxParam = DirectCast(ParamList(3), _TextBoxParam)
+
+         If String.IsNullOrEmpty(x_TextBox.Value) Then x_TextBox.Value = "0"
+         If String.IsNullOrEmpty(y_TextBox.Value) Then y_TextBox.Value = "0"
+         If String.IsNullOrEmpty(z_TextBox.Value) Then z_TextBox.Value = "0"
+         Dim vtMove As New Vector3d(CDbl(x_TextBox.Value),
+                                    CDbl(y_TextBox.Value),
+                                    CDbl(z_TextBox.Value))
          '''' gestione dell'opzione 'AllSelected
          'If Not AreSameVectorExact(vtMove, New Vector3d) Then
          '   If Not AllOption_Move.IsChecked Then
@@ -128,7 +89,7 @@ Public Class MoveVM
       Close()
    End Sub
 
-   Public Sub Annulla()
+   Public Overrides Sub Annulla()
       ' faccio il reset del pairing
       If Map.refSceneHostV.m_nTransfNum > Map.refSceneHostV.m_MaxTempTime Then
          Map.refSceneHostV.m_nTransfNum = Map.refSceneHostV.m_MaxTempTime
@@ -139,30 +100,7 @@ Public Class MoveVM
       Close()
    End Sub
 
-   Private Sub Close()
-      SolidManagerM.ResetOperationMarks(Map.refSceneHostV.m_nIdPart)
-      EgtDraw()
-      Dim Btn As SceneBtn = Map.refSceneButtonVM.GetButton(EGT_MOVE)
-      If TypeOf (Btn) Is _ToggleButton Then
-         DirectCast(Btn, _ToggleButton).IsChecked = False
-      Else
-         EgtOutLog("CONFIG ERR: Il pulsante di Move è stato definito come Button anziché ToggleButton")
-      End If
-      ' resetto la storia temporanea
-      If EgtLuaCallFunction("ASS.ResetTempStory") Then AssLog("ASS.ResetTempStory()")
-      ' resetto il contatore per le operazioni temporanee e la variabile che indica se è stata visualizzata la preview
-      Map.refSceneHostV.m_nTransfNum = 0
-      Map.refSceneHostV.m_bPreviewShown = False
-      ' setto le variabili per il salvataggio della storia normale
-      Dim bSave As Boolean = True
-      If EgtLuaSetGlobBoolVar("ASS.bSaveHist", bSave) Then AssLog("ASS.bSaveHist = " & bSave.ToString)
-      Dim bSaveTemp As Boolean = False
-      If EgtLuaSetGlobBoolVar("ASS.bSaveTemp", bSaveTemp) Then AssLog("ASS.bSaveTemp = " & bSaveTemp.ToString)
-      ' rimuovo lo UC dalla griglia
-      Map.refSceneButtonV.RemoveMoveUC()
-   End Sub
-
-   Public Sub ShowPreview()
+   Public Overrides Sub ShowPreview()
       If Map.refSceneHostV.m_bPreviewShown = False Then
          Dim Btn As SceneBtn = DirectCast(Map.refSceneButtonV.DataContext, SceneButtonVM).GetButton(EGT_MOVE)
          If TypeOf (Btn) Is _ToggleButton Then
@@ -172,14 +110,18 @@ Public Class MoveVM
             Return
          End If
 
+         Dim x_TextBox As _TextBoxParam = DirectCast(ParamList(1), _TextBoxParam)
+         Dim y_TextBox As _TextBoxParam = DirectCast(ParamList(2), _TextBoxParam)
+         Dim z_TextBox As _TextBoxParam = DirectCast(ParamList(3), _TextBoxParam)
+
          ' leggo i dati del vettore di movimento dalle TextBox in m_MoveUC
          If Map.refSceneHostV.m_bPreviewShown Then Return
-         If String.IsNullOrEmpty(Map.refSceneButtonV.m_MoveUC.TextX.Text) Then Map.refSceneButtonV.m_MoveUC.TextX.Text = "0"
-         If String.IsNullOrEmpty(Map.refSceneButtonV.m_MoveUC.TextY.Text) Then Map.refSceneButtonV.m_MoveUC.TextY.Text = "0"
-         If String.IsNullOrEmpty(Map.refSceneButtonV.m_MoveUC.TextZ.Text) Then Map.refSceneButtonV.m_MoveUC.TextZ.Text = "0"
-         Dim vtMove As New Vector3d(CDbl(Map.refSceneButtonV.m_MoveUC.TextX.Text),
-                                    CDbl(Map.refSceneButtonV.m_MoveUC.TextY.Text),
-                                    CDbl(Map.refSceneButtonV.m_MoveUC.TextZ.Text))
+         If String.IsNullOrEmpty(x_TextBox.Value) Then x_TextBox.Value = "0"
+         If String.IsNullOrEmpty(y_TextBox.Value) Then y_TextBox.Value = "0"
+         If String.IsNullOrEmpty(z_TextBox.Value) Then z_TextBox.Value = "0"
+         Dim vtMove As New Vector3d(CDbl(x_TextBox.Value),
+                                    CDbl(y_TextBox.Value),
+                                    CDbl(z_TextBox.Value))
          '''' eventuale gestione di un'opzione 'All Selected
          'If Not AllOption_Move.IsChecked And m_nIdPart <> -1 Then
          '   Dim PartSolidSelected As PartSolid = GetPartSolid(m_nIdPart)
@@ -205,6 +147,30 @@ Public Class MoveVM
       End If
    End Sub
 
+   Private Sub Close()
+      SolidManagerM.ResetOperationMarks(Map.refSceneHostV.m_nIdPart)
+      EgtDraw()
+      Dim Btn As SceneBtn = Map.refSceneButtonVM.GetButton(EGT_MOVE)
+      If TypeOf (Btn) Is _ToggleButton Then
+         DirectCast(Btn, _ToggleButton).IsChecked = False
+      Else
+         EgtOutLog("CONFIG ERR: Il pulsante di Move è stato definito come Button anziché ToggleButton")
+      End If
+      ' resetto la storia temporanea
+      If EgtLuaCallFunction("ASS.ResetTempStory") Then AssLog("ASS.ResetTempStory()")
+      ' resetto il contatore per le operazioni temporanee e la variabile che indica se è stata visualizzata la preview
+      Map.refSceneHostV.m_nTransfNum = 0
+      Map.refSceneHostV.m_bPreviewShown = False
+      ' setto le variabili per il salvataggio della storia normale
+      Dim bSave As Boolean = True
+      If EgtLuaSetGlobBoolVar("ASS.bSaveHist", bSave) Then AssLog("ASS.bSaveHist = " & bSave.ToString)
+      Dim bSaveTemp As Boolean = False
+      If EgtLuaSetGlobBoolVar("ASS.bSaveTemp", bSaveTemp) Then AssLog("ASS.bSaveTemp = " & bSaveTemp.ToString)
+      ' rimuovo lo UC dalla griglia
+      Map.refSceneButtonV.RemoveMoveUC()
+   End Sub
+
 #End Region    ' Methods
 
+
 End Class
diff --git a/OptionsWindow/OptionWindowV.xaml b/OptionsWindow/OptionWindowV.xaml
index 7079cf1..720b122 100644
--- a/OptionsWindow/OptionWindowV.xaml
+++ b/OptionsWindow/OptionWindowV.xaml
@@ -18,9 +18,9 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <TabControl Margin="5,5,5,5">
+      <TabControl Style="{StaticResource OprtionWindow_TC}">
          <TabItem Header="{Binding GenericMsg}">
-            <Grid Margin="5,5,5,0">
+            <Grid Style="{StaticResource TopPanel_Grid}">
                <Grid.RowDefinitions>
                   <RowDefinition Height="1*"/>
                   <RowDefinition Height="Auto"/>
@@ -35,38 +35,36 @@
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
                <GroupBox Header="{Binding CurrentLanguageMsg}"
-                         Margin="0,0,0,5">
-                  <UniformGrid Rows="2" Margin="3,3,3,3">
-                     <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" 
-                               Height="25"
-                               DisplayMemberPath="Name" 
+                         Style="{StaticResource OptionWindow_GrBx}">
+                  <UniformGrid Rows="2" 
+                               Style="{StaticResource OptionWindow_UniformGrid}">
+                     <ComboBox DisplayMemberPath="Name"
+                               ItemsSource="{Binding LanguageList, Mode=OneWay}" 
                                SelectedItem="{Binding SelectedLanguage}"
-                               Margin="0,2,0,5"/>
+                               Style="{StaticResource OptionWindow_CmBx}"/>
                      <TextBlock Text="{Binding LanguageAdvertMsg}" 
-                                TextWrapping="Wrap"
-                                TextAlignment="Center"/>
+                                Style="{StaticResource OptionWindow_TxBl}"/>
                   </UniformGrid>
                </GroupBox>
                <GroupBox Grid.Column="1" 
                          Header="{Binding TemaMsg}"
-                         Margin="0,0,0,5">
-                  <UniformGrid Rows="2" Margin="3,3,3,3">
+                         Style="{StaticResource OptionWindow_GrBx}">
+                  <UniformGrid Rows="2" 
+                               Style="{StaticResource OptionWindow_UniformGrid}">
                   <ComboBox DisplayMemberPath="Name"
                             ItemsSource="{Binding Themes, Mode=OneWay}"  
                             SelectedItem="{Binding SelectedTheme}"
-                            Margin="0,2,0,5"
-                            Height="25"/>
+                            Style="{StaticResource OptionWindow_CmBx}"/>
                      <TextBlock Text="{Binding TemaAdvertMsg}" 
-                                TextWrapping="Wrap"
-                                TextAlignment="Center"/>
+                                Style="{StaticResource OptionWindow_TxBl}"/>
                   </UniformGrid>
                </GroupBox>
                <UniformGrid Grid.Row="1"
                             Grid.ColumnSpan="2"
                             Columns="2"
-                            Margin="5,2,0,5">
+                            Style="{StaticResource Background_UniformGrid}">
                   <TextBlock Text="{Binding TopSceneBackgroundMsg}" 
-                             VerticalAlignment="Center"/>
+                             Style="{StaticResource Background_TxBl}"/>
                   <Button Background="{Binding TopSceneBackground}"
                           Command="{Binding TopSceneBackground_Command}"
                           Style="{StaticResource EgtWPFLib5_InputButton}"/>
@@ -74,8 +72,9 @@
                <UniformGrid Grid.Row="2"
                             Grid.ColumnSpan="2"
                             Columns="2"
-                            Margin="5,0,0,5">
-                  <TextBlock Text="{Binding BotSceneBackgroundMsg}" VerticalAlignment="Center"/>
+                            Style="{StaticResource SceneBackground_UniformGrid}">
+                  <TextBlock Text="{Binding BotSceneBackgroundMsg}" 
+                             Style="{StaticResource Background_TxBl}"/>
                   <Button Background="{Binding BotSceneBackground}"
                           Command="{Binding BotSceneBackground_Command}"
                           Style="{StaticResource EgtWPFLib5_InputButton}"/>
@@ -83,8 +82,9 @@
                <UniformGrid Grid.Row="3"
                             Grid.ColumnSpan="2"
                             Columns="2"
-                            Margin="5,0,0,5">
-                  <TextBlock Text="{Binding GridColorMsg}" VerticalAlignment="Center"/>
+                            Style="{StaticResource SceneBackground_UniformGrid}">
+                  <TextBlock Text="{Binding GridColorMsg}" 
+                             Style="{StaticResource Background_TxBl}"/>
                   <Button Background="{Binding GridColor}"
                           Command="{Binding GridColor_Command}"
                           Style="{StaticResource EgtWPFLib5_InputButton}"/>
@@ -100,30 +100,32 @@
                      <RowDefinition Height="1*"/>
                      <RowDefinition Height="1*"/>
                   </Grid.RowDefinitions>
-                  <TextBlock Text="{Binding ThickLineMsg}" VerticalAlignment="Center"
-                             Grid.Row="0" Margin="5,5,0,5"/>
-                  <CheckBox IsChecked="{Binding ThickLine}"
-                             Grid.Column="1" Grid.Row="0" Margin="22,5,0,5" VerticalAlignment="Center"/>
-                  <TextBlock Text="{Binding SmoothTriMeshMsg}" VerticalAlignment="Center"
-                             Grid.Row="1" Margin="5,5,0,5"/>
-                  <CheckBox IsChecked="{Binding SmoothTriMesh}"
-                             Grid.Column="1" Grid.Row="1" Margin="22,5,0,5" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding ThickLineMsg}" 
+                             Style="{StaticResource ColorLine_TxBl}"/>
+                  <CheckBox Grid.Column="1"
+                            IsChecked="{Binding ThickLine}"   
+                            Style="{StaticResource ColorLine_ChBx}"/>
+                  <TextBlock Grid.Row="1"
+                             Text="{Binding SmoothTriMeshMsg}" 
+                             Style="{StaticResource ColorLine_TxBl}"/>
+                  <CheckBox Grid.Row="1"
+                            Grid.Column="1"
+                            IsChecked="{Binding SmoothTriMesh}"
+                            Style="{StaticResource ColorLine_ChBx}"/>
                </Grid>
 
                <Grid Grid.Row="6"
                      Grid.ColumnSpan="2"
-                     Margin="5,5,5,5">
+                     Style="{StaticResource Licence_Grid}">
                   <Button Content="{Binding UpdateLicenceMsg}" 
                           Command="{Binding UpdateLicence_Command}"  
-                          Height="26" Margin="100,1"/>
+                          Style="{StaticResource Licence_Btn}"/>
                </Grid>
             </Grid>
          </TabItem>
       </TabControl>
       <Button Grid.Row="1"
               Command="{Binding Ok_Command}"
-              IsCancel="True"
-              Margin="0,0,2.5,0"
               Style="{StaticResource RightPanel_HalfRound_Button}">
          <Image Source="\Resources\Common\Ok.png"
                 Style="{StaticResource Button_Image}"/>
diff --git a/Pair/PairV.xaml b/Pair/PairV.xaml
index 3c1a25c..14f488f 100644
--- a/Pair/PairV.xaml
+++ b/Pair/PairV.xaml
@@ -27,6 +27,7 @@
          </Grid.ColumnDefinitions>
          <Button Grid.Column="0"
                  Name="Conferma"
+                 IsCancel="True"
                  Content="{Binding Conferma_Msg}"
                  Command="{Binding ConfermaCmd}"/>
          <Button Grid.Column="1"
diff --git a/Rotate/RotateV.xaml b/Rotate/RotateV.xaml
index 3a82e80..45eeaea 100644
--- a/Rotate/RotateV.xaml
+++ b/Rotate/RotateV.xaml
@@ -3,10 +3,10 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
    <StackPanel Name ="WinRotate" 
-               Style="{DynamicResource WinRotate}">
+               Style="{StaticResource WinRotate}">
       <Label Name="TopBar"
              Content="{Binding TopBar_Msg}" 
-             Style="{DynamicResource TopBar}"/>
+             Style="{StaticResource TopBar}"/>
 
       <Grid>
          <Grid.ColumnDefinitions>
@@ -16,11 +16,11 @@
          <TextBlock Grid.Column="0"
                     Name="Testo" 
                     Text="{Binding Testo_Msg}"
-                    Style="{DynamicResource Testo_TxBl}"/>
+                    Style="{StaticResource Testo_TxBl}"/>
          <TextBox Grid.Column="1"
                   Name="RotInputData"
                   Text="0"
-                  Style="{DynamicResource RotInputData_TxBx}"/>
+                  Style="{StaticResource RotInputData_TxBx}"/>
       </Grid>
       <Grid>
          <Grid.ColumnDefinitions>
@@ -29,6 +29,8 @@
          </Grid.ColumnDefinitions>
          <Button Grid.Column="0"
                  Name="Conferma"
+                 IsDefault="True"
+                 IsCancel="True"
                  Content="{Binding Conferma_Msg}"
                  Command="{Binding ConfermaCmd}"/>
          <Button Grid.Column="1"
diff --git a/SceneButton/SceneButtonV.xaml.vb b/SceneButton/SceneButtonV.xaml.vb
index 001f4a3..bc1e324 100644
--- a/SceneButton/SceneButtonV.xaml.vb
+++ b/SceneButton/SceneButtonV.xaml.vb
@@ -1,4 +1,6 @@
-Public Class SceneButtonV
+Imports EgtUILib
+
+Public Class SceneButtonV
 
 #Region "FIELDS & PROPERTIES"
 
@@ -6,7 +8,8 @@
    Public m_PairUC As PairV
    Public m_RotateUC As RotateV
    Public m_SelOptionUC As SelOptionV
-   Public m_MoveUC As MoveV
+   Public m_MoveUC As SceneUserControlV
+   Public m_SceneUserControlV As SceneUserControlV
 
 #End Region    ' Fields & Properties
 
@@ -70,13 +73,16 @@
       MainGrid.Children.Remove(m_RotateUC)
       m_RotateUC = Nothing
    End Sub
+
    Public Sub LoadMoveUC()
       If IsNothing(m_MoveUC) Then
-         m_MoveUC = New MoveV
+         m_MoveUC = New SceneUserControlV
+         Dim m_MoveVM As New MoveVM()
+         m_MoveUC.DataContext = m_MoveVM
          Grid.SetColumn(m_MoveUC, 0)
          Grid.SetRow(m_MoveUC, 0)
-         Grid.SetColumnSpan(m_MoveUC, 1)
-         Grid.SetRowSpan(m_MoveUC, 2)
+         Grid.SetColumnSpan(m_MoveUC, 2)
+         Grid.SetRowSpan(m_MoveUC, 3)
          MainGrid.Children.Add(m_MoveUC)
       End If
    End Sub
@@ -86,6 +92,23 @@
       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
diff --git a/SceneButton/SceneButtonVM.vb b/SceneButton/SceneButtonVM.vb
index 5e01fa7..1e99966 100644
--- a/SceneButton/SceneButtonVM.vb
+++ b/SceneButton/SceneButtonVM.vb
@@ -76,6 +76,7 @@ Public Class SceneButtonVM
 #End Region ' Constructor
 
 #Region "METHODS"
+
    Private Sub SetButtonsLocation(PositionList As String, ListBtn As List(Of SceneBtn))
       Dim Index As Integer = 1
       Dim sBtnString As String = String.Empty
@@ -140,6 +141,7 @@ Public Class SceneBtn
    Implements INotifyPropertyChanged
 
 #Region "Fields & Properties"
+
    Private m_ResourcesDir As String = "C:\EgtData\EgtSTONE3D\Resources\"
 
    Private m_Name As String = String.Empty
@@ -216,6 +218,7 @@ Public Class _Button
    Inherits SceneBtn
 
 #Region "Constructor"
+
    Sub New(_Name As String, _Img As String, _Flag As String)
       MyBase.New(_Name, _Img, _Flag)
    End Sub
@@ -308,6 +311,8 @@ Module SceneCmd
             Map.refSceneButtonV.MenuSelType.IsOpen = True
          Case "ImportLoop"
             EgtInsertFile("D:\\Temp\\marmo\\Vein3D\\OutLoop.nge")
+         Case "qqq"
+            Map.refSceneButtonV.LoadSceneUserControl()
          Case Else
             Dim x As Boolean = False
       End Select
diff --git a/SceneUserControl/SceneUserControlV.xaml b/SceneUserControl/SceneUserControlV.xaml
new file mode 100644
index 0000000..e4ee98e
--- /dev/null
+++ b/SceneUserControl/SceneUserControlV.xaml
@@ -0,0 +1,98 @@
+<UserControl x:Class="SceneUserControlV"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtStone3D="clr-namespace:EgtStone3D"
+             Height="250"
+             Width="420"
+             Background="Transparent">
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <Border BorderBrush="Black" BorderThickness="0,0,3,3" CornerRadius="3">
+         <Border CornerRadius="3"
+                 Height="30"
+                 BorderBrush="{StaticResource EgalwareUltraLightGray}" 
+                 Background="{StaticResource EgalwareUltraLightGray}">
+            <TextBlock Text="{Binding Title}" 
+                       HorizontalAlignment="Center" 
+                       VerticalAlignment="Center" 
+                       FontSize="15" 
+                       FontWeight="Bold"/>
+         </Border>
+      </Border>
+
+      <Border Grid.Row="1" 
+              Margin="0,10,0,0" 
+              BorderBrush="Black" 
+              BorderThickness="0,0,3,3" 
+              CornerRadius="3">
+         <Border CornerRadius="3"
+                 BorderBrush="{StaticResource EgalwareUltraLightGray}" 
+                 Background="{StaticResource EgalwareUltraLightGray}">
+            <Grid>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="Auto"/>
+               </Grid.RowDefinitions>
+
+               <ItemsControl ItemsSource="{Binding ParamList}">
+                  <ItemsControl.ItemsPanel>
+                     <ItemsPanelTemplate>
+                        <StackPanel Orientation="Vertical"/>
+                     </ItemsPanelTemplate>
+                  </ItemsControl.ItemsPanel>
+                  <ItemsControl.Resources>
+                     <DataTemplate DataType="{x:Type EgtStone3D:_TextBlockParam}">
+                        <TextBlock Text="{Binding MsgValue}" Margin="10,10,10,0" HorizontalAlignment="Center"
+                                   VerticalAlignment="Center" TextWrapping="Wrap" FontWeight="SemiBold"
+                                   FontStyle="Italic"/>
+                     </DataTemplate>
+                     <DataTemplate DataType="{x:Type EgtStone3D:_TextBoxParam}">
+                        <UniformGrid Columns="2" Margin="0,20,10,0">
+                           <TextBlock Text="{Binding Name}" Margin="10,0,10,0"/>
+                           <TextBox Text="{Binding Value}"/>
+                        </UniformGrid>
+                     </DataTemplate>
+                     <DataTemplate DataType="{x:Type EgtStone3D:_ComboBoxParam}">
+                        <UniformGrid Columns="2" Margin="0,20,10,0">
+                           <TextBlock Text="{Binding Name}" Margin="10,0,10,0"/>
+                           <ComboBox ItemsSource="{Binding ParamCmBxList}"
+                                     SelectedItem="{Binding SelParamCmBx}"
+                                     DisplayMemberPath="Name"/>
+                        </UniformGrid>
+                     </DataTemplate>
+                  </ItemsControl.Resources>
+               </ItemsControl>
+               <Grid Grid.Row="1" HorizontalAlignment="Center">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <Button Name="Conferma"
+                          IsDefault="True"
+                          IsCancel="True"
+                          Content="{Binding Conferma_Msg}"
+                          Command="{Binding ConfermaCmd}"
+                          Style="{StaticResource Ok_Btn}"/>
+                  <Button Grid.Column="1"
+                          Name="Preview"
+                          IsCancel="True"
+                          Content="{Binding Preview_Msg}"
+                          Command="{Binding PreviewCmd}"
+                          Style="{StaticResource Cancel_Btn}" Margin="0"/>
+                  <Button Grid.Column="2"
+                          Name="Annulla"
+                          Content="{Binding Annulla_Msg}"
+                          Command="{Binding AnnullaCmd}"
+                          Style="{StaticResource Cancel_Btn}"/>
+               </Grid>
+            </Grid>
+         </Border>
+      </Border>
+   </Grid>
+</UserControl>
diff --git a/SceneUserControl/SceneUserControlV.xaml.vb b/SceneUserControl/SceneUserControlV.xaml.vb
new file mode 100644
index 0000000..fcedbd5
--- /dev/null
+++ b/SceneUserControl/SceneUserControlV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class SceneUserControlV
+
+End Class
diff --git a/SceneUserControl/SceneUserControlVM.vb b/SceneUserControl/SceneUserControlVM.vb
new file mode 100644
index 0000000..338658b
--- /dev/null
+++ b/SceneUserControl/SceneUserControlVM.vb
@@ -0,0 +1,276 @@
+Imports EgtWPFLib5
+Imports EgtUILib
+
+Public Class SceneUserControlVM
+
+#Region "FIELDS & PROPERTIES"
+
+   Private m_Title As String
+   Public Property Title As String
+      Get
+         Return m_Title
+      End Get
+      Set(value As String)
+         m_Title = value
+      End Set
+   End Property
+
+   Private m_ParamList As New List(Of GenericParam)
+   Public Property ParamList As List(Of GenericParam)
+      Get
+         Return m_ParamList
+      End Get
+      Set(value As List(Of GenericParam))
+         m_ParamList = value
+      End Set
+   End Property
+
+#Region "Messages"
+
+   Public ReadOnly Property Conferma_Msg As String
+      Get
+         Return EgtMsg(110003)
+      End Get
+   End Property
+
+   Public ReadOnly Property Preview_Msg As String
+      Get
+         Return EgtMsg(110017)
+      End Get
+   End Property
+
+   Public ReadOnly Property Annulla_Msg As String
+      Get
+         Return EgtMsg(110004)
+      End Get
+   End Property
+
+#End Region    ' Messages
+
+   ' Definisco i comandi
+   Private m_ConfermaCmd As ICommand
+   Private m_PreviewCmd As ICommand
+   Private m_AnnullaCmd As ICommand
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New()
+   End Sub
+
+#End Region ' Constructor
+
+#Region "METHODS"
+
+   Public Overridable Sub LoadParamList()
+   End Sub
+
+#End Region    ' Methods
+
+#Region "COMMANDS"
+
+#Region "ConfermCmd"
+
+   Public ReadOnly Property ConfermaCmd As ICommand
+      Get
+         If m_ConfermaCmd Is Nothing Then
+            m_ConfermaCmd = New Command(AddressOf Conferma)
+         End If
+         Return m_ConfermaCmd
+      End Get
+   End Property
+
+   Public Overridable Sub Conferma()
+   End Sub
+
+#End Region    ' ConfermaCmd
+
+#Region "PreviewCmd"
+
+   Public ReadOnly Property PreviewCmd As ICommand
+      Get
+         If m_PreviewCmd Is Nothing Then
+            m_PreviewCmd = New Command(AddressOf ShowPreview)
+         End If
+         Return m_PreviewCmd
+      End Get
+   End Property
+
+   Public Overridable Sub ShowPreview()
+   End Sub
+
+#End Region    ' PreviewCmd
+
+#Region "AnnullaCmd"
+
+   Public ReadOnly Property AnnullaCmd As ICommand
+      Get
+         If m_AnnullaCmd Is Nothing Then
+            m_AnnullaCmd = New Command(AddressOf Annulla)
+         End If
+         Return m_AnnullaCmd
+      End Get
+   End Property
+
+   Public Overridable Sub Annulla()
+   End Sub
+
+#End Region    ' AnnullaCmd
+
+#End Region    ' Commands
+
+End Class
+
+Public Class GenericParam
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Private m_Name As String = String.Empty
+   Public Property Name As String
+      Get
+         Return m_Name
+      End Get
+      Set(value As String)
+         m_Name = value
+         NotifyPropertyChanged(NameOf(Name))
+      End Set
+   End Property
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New(sName As String)
+      m_Name = sName
+   End Sub
+
+#End Region ' Constructor
+
+End Class
+
+Public Class _TextBoxParam
+   Inherits GenericParam
+
+#Region "FIELDS & PROPERTIES"
+
+   Private m_Value As String = String.Empty
+   Public Property Value As String
+      Get
+         Return m_Value
+      End Get
+      Set(value As String)
+         m_Value = value
+         NotifyPropertyChanged(NameOf(value))
+      End Set
+   End Property
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New(sName As String, sValue As String)
+      MyBase.New(sName)
+      m_Value = sValue
+   End Sub
+
+#End Region ' Constructor
+
+End Class
+
+Public Class _TextBlockParam
+   Inherits GenericParam
+
+#Region "FIELDS & PROPERTIES"
+
+   Private m_MsgValue As String = String.Empty
+   Public Property MsgValue As String
+      Get
+         Return m_MsgValue
+      End Get
+      Set(value As String)
+         m_MsgValue = value
+         NotifyPropertyChanged(NameOf(value))
+      End Set
+   End Property
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New(sName As String, sValue As String)
+      MyBase.New(sName)
+      m_MsgValue = sValue
+   End Sub
+
+#End Region ' Constructor
+
+End Class
+
+Public Class _ComboBoxParam
+   Inherits GenericParam
+
+#Region "FIELDS & PROPERTIES"
+
+   Private m_ParamCmBxList As New List(Of ParamCmBx)
+   Public Property ParamCmBxList As List(Of ParamCmBx)
+      Get
+         Return m_ParamCmBxList
+      End Get
+      Set(value As List(Of ParamCmBx))
+         m_ParamCmBxList = value
+         NotifyPropertyChanged(NameOf(ParamCmBxList))
+      End Set
+   End Property
+
+   Private m_SelParamCmBx As ParamCmBx
+   Public Property SelParamCmBx As ParamCmBx
+      Get
+         Return m_SelParamCmBx
+      End Get
+      Set(value As ParamCmBx)
+         m_SelParamCmBx = value
+         NotifyPropertyChanged(NameOf(SelParamCmBx))
+      End Set
+   End Property
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New(sName As String, _ParamCmBxList As List(Of ParamCmBx))
+      MyBase.New(sName)
+      m_ParamCmBxList = _ParamCmBxList
+      m_SelParamCmBx = m_ParamCmBxList(0)
+   End Sub
+
+#End Region ' Constructor
+
+End Class
+
+Public Class ParamCmBx
+
+#Region "FIELDS & PROPERTIES"
+
+   Private m_Name As String = String.Empty
+   Public Property Name As String
+      Get
+         Return m_Name
+      End Get
+      Set(value As String)
+         m_Name = value
+      End Set
+   End Property
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New(sName As String)
+      m_Name = sName
+   End Sub
+
+#End Region ' Constructor
+
+End Class
\ No newline at end of file
diff --git a/TopPanel/TopPanelV.xaml b/TopPanel/TopPanelV.xaml
index ade8c79..2856c5c 100644
--- a/TopPanel/TopPanelV.xaml
+++ b/TopPanel/TopPanelV.xaml
@@ -47,6 +47,18 @@
          <Button Grid.Column="3"
                  Command="{Binding OpenFileCmd}"
                  Style="{DynamicResource TopPanel_Btn}">
+            <!--<Button.ContextMenu>
+               <ContextMenu ItemsSource="{Binding MruFileNames}"
+                            Style="{StaticResource EgtStone3D_ContextMenu}">
+                  <ContextMenu.Resources>
+                     <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource EgtStone3D_MenuItem}">
+                        <Setter Property="Command"
+                                Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
+                        <Setter Property="CommandParameter" Value="{Binding}" />
+                     </Style>
+                  </ContextMenu.Resources>
+               </ContextMenu>
+            </Button.ContextMenu>-->
             <StackPanel Style="{StaticResource TopPanel_StackPanel}">
                <Image Source="/Resources/ProjManager/folder.png"
                       Style="{StaticResource TopPanel_Image}"/>
diff --git a/Utility/EgtStone3DDarkDictionary.xaml b/Utility/EgtStone3DDarkDictionary.xaml
index db9008e..b777e11 100644
--- a/Utility/EgtStone3DDarkDictionary.xaml
+++ b/Utility/EgtStone3DDarkDictionary.xaml
@@ -98,5 +98,114 @@
 
    <!--#endregion TabItemColor-->
 
+   <!--#region ContextMenuColor-->
+
+   <!--#region Fill Brushes-->
+
+   <LinearGradientBrush x:Key="NormalBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#CCC" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="HorizontalNormalBrush" StartPoint="0,0" EndPoint="1,0">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#CCC" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="LightBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#EEE" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="HorizontalLightBrush" StartPoint="0,0" EndPoint="1,0">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#EEE" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="DarkBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#AAA" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#BBB" Offset="0.0"/>
+            <GradientStop Color="#EEE" Offset="0.1"/>
+            <GradientStop Color="#EEE" Offset="0.9"/>
+            <GradientStop Color="#FFF" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888"/>
+   <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#EEE"/>
+   <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FFF"/>
+   <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#DDD"/>
+
+   <!--#endregion Fill Brushes-->
+
+   <!--#region Border Brushes-->
+
+   <LinearGradientBrush x:Key="NormalBorderBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#CCC" Offset="0.0"/>
+            <GradientStop Color="#444" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="HorizontalNormalBorderBrush" StartPoint="0,0" EndPoint="1,0">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#CCC" Offset="0.0"/>
+            <GradientStop Color="#444" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="DefaultedBorderBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#777" Offset="0.0"/>
+            <GradientStop Color="#000" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PressedBorderBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#444" Offset="0.0"/>
+            <GradientStop Color="#888" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA"/>
+   <SolidColorBrush x:Key="SolidBorderBrush" Color="#888"/>
+   <SolidColorBrush x:Key="LightBorderBrush" Color="#AAA"/>
+
+   <!--#endregion Border Brushes-->
+
+   <!--#region Miscellaneous Brushes-->
+
+   <SolidColorBrush x:Key="GlyphBrush" Color="#444"/>
+   <SolidColorBrush x:Key="LightColorBrush" Color="#DDD"/>
+
+   <!--#endregion Miscellaneous Brushes-->
+
+   <!--#endregion ContextMenuColor-->
 
 </ResourceDictionary>
diff --git a/Utility/EgtStone3DDefaultStyle.xaml b/Utility/EgtStone3DDefaultStyle.xaml
index 7126962..daa1c79 100644
--- a/Utility/EgtStone3DDefaultStyle.xaml
+++ b/Utility/EgtStone3DDefaultStyle.xaml
@@ -271,6 +271,8 @@
       <Setter Property="BorderBrush" Value="{DynamicResource Button.Static.Border}"/>
       <Setter Property="BorderThickness" Value="1,1,1,0"/>
       <Setter Property="Template" Value="{StaticResource Button.HalfRoundButton}"/>
+      <Setter Property="IsCancel" Value="True"/>
+      <Setter Property="Margin" Value="0,0,2.5,0"/>
    </Style>
 
    <Style x:Key="ProjManager_Btn" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
@@ -338,6 +340,11 @@
       <Setter Property="Template" Value="{StaticResource Button.HalfRoundButton}"/>
    </Style>
 
+   <Style x:Key="Licence_Btn" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="26"/>
+      <Setter Property="Margin" Value="100,1"/>
+   </Style>
+
    <!--#endregion ButtonStyle-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -905,6 +912,20 @@
       <Setter Property="IsEnabled" Value="True"/>
       <Setter Property="Margin" Value="1,0,1,0"/>
    </Style>
+
+   <Style x:Key="OptionWindow_TxBl" TargetType="{x:Type TextBlock}">
+      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+   </Style>
+   
+   <Style x:Key="Background_TxBl" TargetType="{x:Type TextBlock}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
+   <Style x:Key="ColorLine_TxBl" TargetType="{x:Type TextBlock}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="5,5,0,5"/>
+   </Style>
    
    <!--#endregion TextBlockStyle-->
 
@@ -994,6 +1015,11 @@
       <Setter Property="Margin" Value="2.5,5,2.5,5"/>
    </Style>
 
+   <Style x:Key="OptionWindow_CmBx" TargetType="{x:Type ComboBox}">
+      <Setter Property="Height" Value="25"/>
+      <Setter Property="Margin" Value="0,2,0,5"/>
+   </Style>
+
    <!--#endregion ComboBoxStyle-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -1006,6 +1032,11 @@
       <Setter Property="Margin" Value="1,5,1,0"/>
    </Style>
 
+   <Style x:Key="ColorLine_ChBx" TargetType="{x:Type CheckBox}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="22,5,0,5"/>
+   </Style>
+
    <!--#endregion CheckBoxStyle-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -1363,6 +1394,10 @@
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
+   <Style x:Key="OprtionWindow_TC" TargetType="{x:Type TabControl}">
+      <Setter Property="Margin" Value="5,5,5,5"/>
+   </Style>
+
    <!--#endregion TabControlStyle-->
 
    <!--#region TabItemStyle-->
@@ -1606,6 +1641,10 @@
       <Setter Property="Height" Value="50"/>
    </Style>
 
+   <Style x:Key="Licence_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+   
    <!--#endregion GridStyle-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -1664,6 +1703,18 @@
       <Setter Property="Margin" Value="0"/>
    </Style>
 
+   <Style x:Key="OptionWindow_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="Margin" Value="3,3,3,3"/>
+   </Style>
+
+   <Style x:Key="Background_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="Margin" Value="5,2,0,5"/>
+   </Style>
+
+   <Style x:Key="SceneBackground_UniformGrid" TargetType="{x:Type UniformGrid}">
+      <Setter Property="Margin" Value="5,0,0,5"/>
+   </Style>
+
    <!--#endregion UniformGridStyle-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -1681,13 +1732,19 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!--#region WrapPanelStyle-->
+   
    <Style x:Key="WrapLeftList_WrapPanel" TargetType="{x:Type WrapPanel}">
       <Setter Property="Orientation" Value="Horizontal"/>
       <Setter Property="Width" Value="80"/>
    </Style>
 
+   <!--#endregion WrapPanelStyle-->
+   
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!--#region PopUpStyle-->
+   
    <Style x:Key="MenuSelType_PopUp" TargetType="{x:Type Popup}">
       <Setter Property="AllowsTransparency" Value="True"/>
       <Setter Property="Focusable" Value="False"/>
@@ -1695,4 +1752,240 @@
       <Setter Property="IsOpen" Value="False"/>
    </Style>
 
+   <!--#endregion PopUpStyle-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region GroupBoxStyle-->
+
+   <Style x:Key="OptionWindow_GrBx" TargetType="{x:Type GroupBox}">
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+   
+   <!--#endregion GroupBoxStyle-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region ContextMenu-->
+
+   <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="Separator">
+      <Setter Property="Height" Value="1"/>
+      <Setter Property="Margin" Value="0,4,0,4"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Separator">
+               <Border BorderBrush="{StaticResource SolidBorderBrush}"
+                       BorderThickness="1"/>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- TopLevelHeader -->
+   <ControlTemplate x:Key="{x:Static MenuItem.TopLevelHeaderTemplateKey}" TargetType="MenuItem">
+      <Border Name="Border">
+         <Grid>
+            <ContentPresenter Margin="6,3,6,3" 
+                              ContentSource="Header"
+                              RecognizesAccessKey="True" />
+            <Popup Name="Popup"
+                   Placement="Bottom"
+                   IsOpen="{TemplateBinding IsSubmenuOpen}"
+                   AllowsTransparency="True" 
+                   Focusable="False"
+                   PopupAnimation="Fade">
+               <Border Name="SubmenuBorder"
+                       SnapsToDevicePixels="True"
+                       Background="{StaticResource WindowBackgroundBrush}"
+                       BorderBrush="{StaticResource SolidBorderBrush}"
+                       BorderThickness="1" >
+                  <StackPanel IsItemsHost="True" 
+                              KeyboardNavigation.DirectionalNavigation="Cycle" />
+               </Border>
+            </Popup>
+         </Grid>
+      </Border>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsSuspendingPopupAnimation" Value="true">
+            <Setter TargetName="Popup" Property="PopupAnimation" Value="None"/>
+         </Trigger>
+         <Trigger Property="IsHighlighted" Value="true">
+            <Setter TargetName="Border" Property="Background"  Value="{StaticResource NormalBrush}"/>
+            <Setter TargetName="Border" Property="BorderBrush" Value="Transparent"/>
+         </Trigger>
+         <Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="True">
+            <Setter TargetName="SubmenuBorder" Property="CornerRadius" Value="0,0,4,4"/>
+            <Setter TargetName="SubmenuBorder" Property="Padding" Value="0,0,0,3"/>
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="False">
+            <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <!-- TopLevelItem -->
+   <ControlTemplate x:Key="{x:Static MenuItem.TopLevelItemTemplateKey}" TargetType="MenuItem">
+      <Border Name="Border">
+         <Grid>
+            <ContentPresenter Margin="6,3,6,3" 
+                              ContentSource="Header"
+                              RecognizesAccessKey="True" />
+         </Grid>
+      </Border>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsHighlighted" Value="true">
+            <Setter TargetName="Border" Property="Background" Value="{StaticResource NormalBrush}"/>
+            <Setter TargetName="Border" Property="BorderBrush" Value="Transparent"/>
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="False">
+            <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <!-- SubmenuItem -->
+   <ControlTemplate x:Key="{x:Static MenuItem.SubmenuItemTemplateKey}" TargetType="MenuItem">
+      <Border Name="Border"
+              Padding="3,3,3,3">
+         <Grid>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="12"/>
+               <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Height="8"
+                    Width="8"
+                    Background="{StaticResource Icarus_Gray}"
+                    BorderThickness="0"
+                    HorizontalAlignment="Left"/>
+            <ContentPresenter Name="HeaderHost"
+                              Grid.Column="1"
+                              ContentSource="Header"
+                              RecognizesAccessKey="True"
+                              VerticalAlignment="Center"
+                              TextBlock.FontSize="12"/>
+         </Grid>
+      </Border>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsHighlighted" Value="true">
+            <Setter TargetName="Border" Property="Background" Value="{StaticResource SelectedBackgroundBrush}"/>
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <!-- SubmenuHeader -->
+   <ControlTemplate x:Key="{x:Static MenuItem.SubmenuHeaderTemplateKey}" TargetType="MenuItem">
+      <Border Name="Border">
+         <Grid>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" SharedSizeGroup="Icon"/>
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut"/>
+               <ColumnDefinition Width="13"/>
+            </Grid.ColumnDefinitions>
+            <ContentPresenter Name="Icon"
+                              Margin="6,0,6,0"
+                              VerticalAlignment="Center"
+                              ContentSource="Icon"/>
+            <ContentPresenter Name="HeaderHost"
+                              Grid.Column="1"
+                              ContentSource="Header"
+                              RecognizesAccessKey="True"/>
+            <TextBlock x:Name="InputGestureText"
+                       Grid.Column="2"
+                       Text="{TemplateBinding InputGestureText}"
+                       Margin="5,2,2,2"
+                       DockPanel.Dock="Right"/>
+            <Path Grid.Column="3"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Data="M 0 0 L 0 7 L 4 3.5 Z" 
+                  Fill="{StaticResource GlyphBrush}"/>
+            <Popup Name="Popup"
+                   Placement="Right"
+                   HorizontalOffset="-4" 
+                   IsOpen="{TemplateBinding IsSubmenuOpen}"
+                   AllowsTransparency="True" 
+                   Focusable="False"
+                   PopupAnimation="Fade">
+               <Border Name="SubmenuBorder"
+                       SnapsToDevicePixels="True"
+                       Background="{StaticResource WindowBackgroundBrush}"
+                       BorderBrush="{StaticResource SolidBorderBrush}"
+                       BorderThickness="1" >
+                  <StackPanel IsItemsHost="True" 
+                              KeyboardNavigation.DirectionalNavigation="Cycle" />
+               </Border>
+            </Popup>
+         </Grid>
+      </Border>
+      <ControlTemplate.Triggers>
+         <Trigger Property="Icon" Value="{x:Null}">
+            <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+         </Trigger>
+         <Trigger Property="IsHighlighted" Value="true">
+            <Setter TargetName="Border" Property="Background" Value="{StaticResource SelectedBackgroundBrush}"/>
+         </Trigger>
+         <Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="True">
+            <Setter TargetName="SubmenuBorder" Property="CornerRadius" Value="4"/>
+            <Setter TargetName="SubmenuBorder" Property="Padding" Value="0,3,0,3"/>
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <!-- MenuItem Style -->
+   <Style x:Key="EgtStone3D_MenuItem" TargetType="{x:Type MenuItem}">
+      <Setter Property="OverridesDefaultStyle" Value="True"/>
+      <Style.Triggers>
+         <Trigger Property="Role" Value="TopLevelHeader">
+            <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelHeaderTemplateKey}}"/>
+            <Setter Property="Grid.IsSharedSizeScope" Value="true"/>
+         </Trigger>
+         <Trigger Property="Role" Value="TopLevelItem">
+            <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelItemTemplateKey}}"/>
+         </Trigger>
+         <Trigger Property="Role" Value="SubmenuHeader">
+            <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.SubmenuHeaderTemplateKey}}"/>
+         </Trigger>
+         <Trigger Property="Role" Value="SubmenuItem">
+            <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.SubmenuItemTemplateKey}}"/>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="EgtStone3D_ContextMenu" TargetType="{x:Type ContextMenu}">
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
+      <Setter Property="OverridesDefaultStyle" Value="True"/>
+      <Setter Property="Grid.IsSharedSizeScope" Value="true"/>
+      <Setter Property="HasDropShadow" Value="True"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ContextMenu}">
+               <Border x:Name="Border"
+                       CornerRadius="4"
+                       Background="{StaticResource EgalwareWhite}"
+                       BorderBrush="{StaticResource EgalwareGray}"
+                       BorderThickness="1"
+                       Padding="4">
+                  <StackPanel IsItemsHost="True"
+                              KeyboardNavigation.DirectionalNavigation="Cycle"/>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="HasDropShadow" Value="true">
+                     <Setter TargetName="Border" Property="Padding" Value="4"/>
+                     <Setter TargetName="Border" Property="CornerRadius" Value="4"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!--#endregion ContextMenu-->
+   
 </ResourceDictionary>
diff --git a/Utility/EgtStone3DDictionary.xaml b/Utility/EgtStone3DDictionary.xaml
index e57c622..f2fda22 100644
--- a/Utility/EgtStone3DDictionary.xaml
+++ b/Utility/EgtStone3DDictionary.xaml
@@ -97,5 +97,115 @@
    <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="{StaticResource EgtStone3D_Alto_Color}"/>
 
    <!--#endregion TabItemColor-->
+   
+   <!--#region ContextMenuColor-->
+
+   <!--#region Fill Brushes-->
+
+   <LinearGradientBrush x:Key="NormalBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#CCC" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="HorizontalNormalBrush" StartPoint="0,0" EndPoint="1,0">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#CCC" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="LightBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#EEE" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="HorizontalLightBrush" StartPoint="0,0" EndPoint="1,0">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#EEE" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="DarkBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#AAA" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#BBB" Offset="0.0"/>
+            <GradientStop Color="#EEE" Offset="0.1"/>
+            <GradientStop Color="#EEE" Offset="0.9"/>
+            <GradientStop Color="#FFF" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888"/>
+   <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#EEE"/>
+   <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FFF"/>
+   <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#DDD"/>
+
+   <!--#endregion Fill Brushes-->
+   
+   <!--#region Border Brushes-->
+
+   <LinearGradientBrush x:Key="NormalBorderBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#CCC" Offset="0.0"/>
+            <GradientStop Color="#444" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="HorizontalNormalBorderBrush" StartPoint="0,0" EndPoint="1,0">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#CCC" Offset="0.0"/>
+            <GradientStop Color="#444" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="DefaultedBorderBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#777" Offset="0.0"/>
+            <GradientStop Color="#000" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PressedBorderBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#444" Offset="0.0"/>
+            <GradientStop Color="#888" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA"/>
+   <SolidColorBrush x:Key="SolidBorderBrush" Color="#888"/>
+   <SolidColorBrush x:Key="LightBorderBrush" Color="#AAA"/>
+
+   <!--#endregion Border Brushes-->
+   
+   <!--#region Miscellaneous Brushes-->
+   
+   <SolidColorBrush x:Key="GlyphBrush" Color="#444"/>
+   <SolidColorBrush x:Key="LightColorBrush" Color="#DDD"/>
+
+   <!--#endregion Miscellaneous Brushes-->
+
+   <!--#endregion ContextMenuColor-->
 
 </ResourceDictionary>