From 47be6b28597388a6c5dbf975d3d4002f92706a9d Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Thu, 1 Aug 2024 17:27:33 +0200 Subject: [PATCH] -spostato nel core le finestre personalizzate --- EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj | 43 ++ .../EgtColorPicker/EgtColorPickerV.xaml | 3 +- .../EgtColorPicker/EgtColorPickerV.xaml.vb | 3 +- .../OnlyProdEgtColorPickerV.xaml | 268 ++++++++++++ .../OnlyProdEgtColorPickerV.xaml.vb | 69 +++ .../EgtManageFileDialogV.xaml | 2 +- .../EgtManageFileDialogV.xaml.vb | 3 +- .../OnlyProdEgtManageFileDialogV.xaml | 400 ++++++++++++++++++ .../OnlyProdEgtManageFileDialogV.xaml.vb | 142 +++++++ .../EgtMessageBox/EgtMessageBoxV.xaml | 8 +- .../EgtMessageBox/EgtMessageBoxV.xaml.vb | 1 + .../EgtMessageBox/OnlyProdEgtMessageBoxV.xaml | 49 +++ .../OnlyProdEgtMessageBoxV.xaml.vb | 110 +++++ .../AddFeatureWnd/AddFeatureWndVM.vb | 6 +- .../AddPartWnd/AddPartWndVM.vb | 6 +- .../AddRawPartWnd/AddRawPartWndVM.vb | 6 +- .../Application.xaml.vb | 7 +- .../BTLPartManager/BTLPartManagerVM.vb | 86 +++- .../BTLViewModel/BTLParamVM.vb | 24 +- .../BTLViewModel/BTLPartVM.vb | 25 +- .../CALCPanel/CALCPanelVM.vb | 6 +- .../ConfigurationPage/ConfigurationPageVM.vb | 72 +++- .../EgtBEAMWALL.ViewerOptimizer.vbproj | 28 +- .../FeatureListManagerVM.vb | 6 +- .../MachGroupPanel/MyMachGroupVM.vb | 14 +- .../MachinePanel/MachinePanelVM.vb | 36 +- .../MacroFeatureWnd/MacroFeatureWndVM.vb | 6 +- .../MainMenu/MainMenuVM.vb | 30 +- .../MainWindow/MainWindowVM.vb | 18 +- .../MainWindow/OnlyProdMainWindowV.xaml | 42 ++ .../MainWindow/OnlyProdMainWindowV.xaml.vb | 74 ++++ .../MovePartInRawPartWndVM.vb | 12 +- .../MultiCopyRawPartWndVM.vb | 6 +- .../NestingRunningWnd/NestingRunningWndVM.vb | 20 +- .../OnlyProdManager/OnlyProdManagerVM.vb | 38 +- .../OptimizePanel/OptimizePanelVM.vb | 6 +- .../ProdManager/ProdManagerVM.vb | 13 +- .../ProjManager/ProjManagerVM.vb | 36 +- .../ProjectFileVM/ProdFileVM.vb | 6 +- .../ProjectFileVM/ProjFileVM.vb | 2 +- .../ProjectTypeWnd/ProjectTypeWndVM.vb | 12 +- .../RawPartManager/RawPartManagerVM.vb | 12 +- .../SceneHost/MySceneHostVM.vb | 26 +- EgtBEAMWALL.ViewerOptimizer/SetUp/SetUpVM.vb | 32 +- .../ToolsDbWindow/MyToolDbWindowVM.vb | 12 +- .../Utility/Dictionary.xaml | 17 +- ExtLibs/EgtWPFLib5.dll | Bin 1284096 -> 1051648 bytes 47 files changed, 1682 insertions(+), 161 deletions(-) rename {EgtBEAMWALL.ViewerOptimizer => EgtBEAMWALL.Core}/EgtColorPicker/EgtColorPickerV.xaml (98%) rename {EgtBEAMWALL.ViewerOptimizer => EgtBEAMWALL.Core}/EgtColorPicker/EgtColorPickerV.xaml.vb (96%) create mode 100644 EgtBEAMWALL.Core/EgtColorPicker/OnlyProdEgtColorPickerV.xaml create mode 100644 EgtBEAMWALL.Core/EgtColorPicker/OnlyProdEgtColorPickerV.xaml.vb rename {EgtBEAMWALL.ViewerOptimizer => EgtBEAMWALL.Core}/EgtManageFileDialog/EgtManageFileDialogV.xaml (99%) rename {EgtBEAMWALL.ViewerOptimizer => EgtBEAMWALL.Core}/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb (96%) create mode 100644 EgtBEAMWALL.Core/EgtManageFileDialog/OnlyProdEgtManageFileDialogV.xaml create mode 100644 EgtBEAMWALL.Core/EgtManageFileDialog/OnlyProdEgtManageFileDialogV.xaml.vb rename {EgtBEAMWALL.ViewerOptimizer => EgtBEAMWALL.Core}/EgtMessageBox/EgtMessageBoxV.xaml (95%) rename {EgtBEAMWALL.ViewerOptimizer => EgtBEAMWALL.Core}/EgtMessageBox/EgtMessageBoxV.xaml.vb (99%) create mode 100644 EgtBEAMWALL.Core/EgtMessageBox/OnlyProdEgtMessageBoxV.xaml create mode 100644 EgtBEAMWALL.Core/EgtMessageBox/OnlyProdEgtMessageBoxV.xaml.vb create mode 100644 EgtBEAMWALL.ViewerOptimizer/MainWindow/OnlyProdMainWindowV.xaml create mode 100644 EgtBEAMWALL.ViewerOptimizer/MainWindow/OnlyProdMainWindowV.xaml.vb diff --git a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj index 60ee8f7b..59569370 100644 --- a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj +++ b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj @@ -109,6 +109,12 @@ + + EgtColorPickerV.xaml + + + OnlyProdEgtColorPickerV.xaml + EgtDataGrid.xaml @@ -119,6 +125,18 @@ + + EgtManageFileDialogV.xaml + + + OnlyProdEgtManageFileDialogV.xaml + + + EgtMessageBoxV.xaml + + + OnlyProdEgtMessageBoxV.xaml + OnlyProd_QParamListV.xaml @@ -256,10 +274,34 @@ Designer XamlIntelliSenseFileGenerator + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -307,6 +349,7 @@ + copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.Core.dll diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtColorPicker/EgtColorPickerV.xaml b/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml similarity index 98% rename from EgtBEAMWALL.ViewerOptimizer/EgtColorPicker/EgtColorPickerV.xaml rename to EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml index f663d3a2..d3a69a88 100644 --- a/EgtBEAMWALL.ViewerOptimizer/EgtColorPicker/EgtColorPickerV.xaml +++ b/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml @@ -4,10 +4,11 @@ xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" Title="{Binding sTitle}" WindowStartupLocation="CenterOwner" + SizeToContent="WidthAndHeight" WindowStyle="None" ResizeMode="NoResize" IsMinimizable="False" ShowInTaskbar="False" Width="750" Height="450" - Style="{StaticResource OnlyProd_EgtCustomWindow}"> + Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"> diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtColorPicker/EgtColorPickerV.xaml.vb b/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb similarity index 96% rename from EgtBEAMWALL.ViewerOptimizer/EgtColorPicker/EgtColorPickerV.xaml.vb rename to EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb index 5a2703b3..4e15e305 100644 --- a/EgtBEAMWALL.ViewerOptimizer/EgtColorPicker/EgtColorPickerV.xaml.vb +++ b/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb @@ -1,4 +1,5 @@ -Imports System.Windows.Forms +Imports System.Windows +Imports System.Windows.Forms Imports EgtWPFLib5 Public Class EgtColorPickerV diff --git a/EgtBEAMWALL.Core/EgtColorPicker/OnlyProdEgtColorPickerV.xaml b/EgtBEAMWALL.Core/EgtColorPicker/OnlyProdEgtColorPickerV.xaml new file mode 100644 index 00000000..c70ea1ed --- /dev/null +++ b/EgtBEAMWALL.Core/EgtColorPicker/OnlyProdEgtColorPickerV.xaml @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +