-aggiunto nuove finestre oer nuova grafica tooldb, machdb e setup

EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb

@@ -210,7 +210,12 @@ Public Class MachinePanelVM
          ' apro finestra di gestione lavorazioni travi
          Dim sTitle = EgtMsg(9000)               'Tabelle delle lavorazioni delle travi
          Dim BeamMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath)
-         Dim BeamMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, BeamMchsWinVM)
+         Dim BeamMchsWinV As Object = Nothing
+         If bOnlyProd Then
+            BeamMchsWinV = New OnlyProdBeamMachiningsWindowV(Application.Current.MainWindow, BeamMchsWinVM)
+         Else
+            BeamMchsWinV = New BeamMachiningsWindowV(Application.Current.MainWindow, BeamMchsWinVM)
+         End If
          BeamMchsWinV.ShowDialog()
       Else
          ' Impossibile aprire l'Editor delle lavorazioni delle travi.<br/>Mancano i file di configurazione. - Errore
@@ -234,7 +239,12 @@ Public Class MachinePanelVM
          ' apro finestra di gestione lavorazioni pareti
          Dim sTitle = EgtMsg(9010)               'Tabelle delle lavorazioni delle pareti
          Dim WallMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, False)
-         Dim WallMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM)
+         Dim WallMchsWinV As Object = Nothing
+         If bOnlyProd Then
+            WallMchsWinV = New OnlyProdBeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM)
+         Else
+            WallMchsWinV = New BeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM)
+         End If
          WallMchsWinV.ShowDialog()
       Else
          ' Impossibile aprire l'Editor delle lavorazioni delle pareti.<br/>Mancano i file di configurazione. - Errore
@@ -263,7 +273,13 @@ Public Class MachinePanelVM
       End If
 
       Dim ToolDbWindowVM As New MyToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Beam")
-      Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      Dim ToolDbWindowV = Nothing
+      If bOnlyProd Then
+         ToolDbWindowV = New OnlyProdToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      Else
+         ToolDbWindowV = New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      End If
+
       If ToolDbWindowVM.MatType <> 0 Then
          ToolDbWindowV.Height = 640
          ToolDbWindowV.Width = 1024
@@ -287,7 +303,12 @@ Public Class MachinePanelVM
          Return
       End If
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Stone")
-      Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      Dim MachDbWindowV = Nothing
+      If bOnlyProd Then
+         MachDbWindowV = New OnlyProdMachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      Else
+         MachDbWindowV = New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      End If
 
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
          MachDbWindowV.Height = 768
@@ -340,10 +361,19 @@ Public Class MachinePanelVM
       ' Reset lua
       EgtLuaResetGlobVar("STU")
 
-      Dim SetUpWindow As New SetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName)) With {
-         .Height = 614,
-         .Width = 1024
-      }
+      Dim SetUpWindow As Object = Nothing
+      If bOnlyProd Then
+         SetUpWindow = New OnlyProdSetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName)) With {
+            .Height = 614,
+            .Width = 1024
+         }
+      Else
+         SetUpWindow = New SetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName)) With {
+            .Height = 614,
+            .Width = 1024
+         }
+      End If
+
       SetUpWindow.ShowDialog()
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerVM.vb

@@ -1524,9 +1524,10 @@ Public Class OnlyProdManagerVM
          .Filter = "ProjectExport (*.ngexp)|*.ngexp",
          .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
          .CheckFileExists = True,
-         .ValidateNames = True
+         .ValidateNames = True,
+         .Mode = 1
       }
-      If ImportDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
+      If Not ImportDlg.ShowDialog() = System.Windows.Forms.DialogResult.OK Then Return
       ' creo cartella temporanea di estrazione in Temp
       Dim sProjectimportDir As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\ProjectImport"
       If Directory.Exists(sProjectimportDir) Then
@@ -1818,7 +1819,7 @@ Public Class OnlyProdManagerVM
       End If
       ' faccio scegliere proj da aggiungere
       Dim OpenProjectFileDialogVM As New OpenProjectFileDialogVM
-      Dim ChooseProdFileDialog As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+      Dim ChooseProdFileDialog As New OnlyProdOpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
       Dim DialogResult As Boolean? = ChooseProdFileDialog.EgtShowDialog(ProjectType.PROJ, True)
       If IsNothing(DialogResult) OrElse Not DialogResult Then Return
       If IsNothing(OpenProjectFileDialogVM.SelProject.nProjId) OrElse OpenProjectFileDialogVM.SelProject.nProjId <= 0 Then Return

EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb

@@ -1439,21 +1439,21 @@ Public Class ProjManagerVM
       If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return
       Dim sDir As String = String.Empty
       GetMainPrivateProfileString(S_GENERAL, K_LASTNGEXPDIR, "", sDir)
-      ' apro finestra scelta file
-      'Dim ImportDlg As New Microsoft.Win32.OpenFileDialog() With {.DefaultExt = ".ngexp",
-      '                                                            .Filter = "ProjectExport (*.ngexp)|*.ngexp",
-      '                                                            .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
-      '                                                            .CheckFileExists = True,
-      '                                                            .ValidateNames = True}
-      'If ImportDlg.ShowDialog() <> True Then Return
-      Dim ImportDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
-         .Title = EgtMsg(61839),
-         .Filter = "ProjectExport (*.ngexp)|*.ngexp",
-         .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
-         .CheckFileExists = True,
-         .ValidateNames = True
-      }
-      If ImportDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
+      'apro finestra scelta file
+      Dim ImportDlg As New Microsoft.Win32.OpenFileDialog() With {.DefaultExt = ".ngexp",
+                                                                  .Filter = "ProjectExport (*.ngexp)|*.ngexp",
+                                                                  .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
+                                                                  .CheckFileExists = True,
+                                                                  .ValidateNames = True}
+      If ImportDlg.ShowDialog() <> True Then Return
+      'Dim ImportDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+      '   .Title = EgtMsg(61839),
+      '   .Filter = "ProjectExport (*.ngexp)|*.ngexp",
+      '   .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
+      '   .CheckFileExists = True,
+      '   .ValidateNames = True
+      '}
+      'If ImportDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
       ' creo cartella temporanea di estrazione in Temp
       Dim sProjectimportDir As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\ProjectImport"
       If Directory.Exists(sProjectimportDir) Then

EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml

@@ -2871,6 +2871,35 @@
       </Style.Resources>
    </Style>
 
+   <Style x:Key="OnlyProdTabControl_OnlyHeaders"  TargetType="{x:Type TabControl}" BasedOn="{StaticResource OnlyProd_TabControl}">
+      <Setter Property="OverridesDefaultStyle" Value="True" />
+      <Setter Property="SnapsToDevicePixels" Value="True" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TabControl}">
+               <Grid KeyboardNavigation.TabNavigation="Local">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="*"/>
+                  </Grid.RowDefinitions>
+                  <TabPanel Name="HeaderPanel"
+                            Grid.Row="0"
+                            Panel.ZIndex="1" 
+                            Margin="0,0,4,-1" 
+                            IsItemsHost="True"
+                            KeyboardNavigation.TabIndex="1"
+                            Background="Transparent" />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   
    <!--#endregion TabControl-->
 
    <!--#region Image-->