From eba9686148aba5bbb2af6671f7b0794001862fcf Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Thu, 7 Sep 2023 18:14:34 +0200 Subject: [PATCH] Inizio gestione colori GENERAL EgtTextBox --- MachinePanel/MyMachinePanelVM.vb | 3 +- My Project/app.manifest | 79 ++++++++++++++++++++++++++++ OmagOFFICE.vbproj | 26 +++++++++ Utility/OmagOFFICEDictionary.xaml | 4 ++ Utility/OmagOFFICEDictionary.xaml.vb | 3 ++ 5 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 My Project/app.manifest diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb index efe37b1..4e55c1d 100644 --- a/MachinePanel/MyMachinePanelVM.vb +++ b/MachinePanel/MyMachinePanelVM.vb @@ -154,10 +154,11 @@ Public Class MyMachinePanelVM ' Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM) ' definisco lo stile della pagina - MachDbWindowVM.TextForegroundTxBl = Brushes.White + MachDbWindowVM.TextForegroundTxBl = Brushes.White ' → OmagOFFICEDictionary.Button_Static_Background MachDbWindowVM.BorderGrbThickness = 0.25 MachDbWindowVM.TextBackgroundTxBx = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush) MachDbWindowVM.TextForegroundTxBx = Brushes.White + MachDbWindowVM.TextBorderBrushTxBx = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush) Dim MachDbWindowV As New MyMachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM) diff --git a/My Project/app.manifest b/My Project/app.manifest new file mode 100644 index 0000000..e19fc1c --- /dev/null +++ b/My Project/app.manifest @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OmagOFFICE.vbproj b/OmagOFFICE.vbproj index bb73570..b59b450 100644 --- a/OmagOFFICE.vbproj +++ b/OmagOFFICE.vbproj @@ -12,6 +12,21 @@ v4.0 Custom Client + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true AnyCPU @@ -109,6 +124,9 @@ Resources\OmagOFFICE.ico + + My Project\app.manifest + False @@ -583,6 +601,7 @@ My.Resources Designer + SettingsSingleFileGenerator Settings.Designer.vb @@ -855,6 +874,13 @@ + + + False + .NET Framework 3.5 SP1 + false + + IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe diff --git a/Utility/OmagOFFICEDictionary.xaml b/Utility/OmagOFFICEDictionary.xaml index ce1970a..16f2964 100644 --- a/Utility/OmagOFFICEDictionary.xaml +++ b/Utility/OmagOFFICEDictionary.xaml @@ -518,6 +518,10 @@ + + + +