From 43a27c16a68dc47e6023e8d0a01b1b6b0c0ea336 Mon Sep 17 00:00:00 2001 From: mschill Date: Fri, 23 Jan 2026 10:10:08 -0500 Subject: [PATCH] B2026-006 Try to force designer update It looks like when pulled into development -- changes to DisplayHistory.designer were not pulling down locally / compiling in when not on the computer they were originally made on. Made an update that hopefully should force this file to recompile. --- .../Volian.Controls.Library/DisplayHistory.cs | 2 +- .../DisplayHistory.designer.cs | Bin 47962 -> 47916 bytes .../DisplayHistory.resx | 34 +++++++++++++++--- .../Volian.Controls.Library.csproj | 1 + 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayHistory.cs b/PROMS/Volian.Controls.Library/DisplayHistory.cs index 1978e024..a190e4f7 100644 --- a/PROMS/Volian.Controls.Library/DisplayHistory.cs +++ b/PROMS/Volian.Controls.Library/DisplayHistory.cs @@ -11,7 +11,7 @@ using System.Text.RegularExpressions; using JR.Utils.GUI.Forms; using Volian.Base.Library; using System.Linq; - + namespace Volian.Controls.Library { public partial class DisplayHistory : UserControl diff --git a/PROMS/Volian.Controls.Library/DisplayHistory.designer.cs b/PROMS/Volian.Controls.Library/DisplayHistory.designer.cs index 81fdb31684e443cf3b65a51a5b33fcfe92234c8e..a7c9d046dea58df145d0af16a254bc22de6f65b8 100644 GIT binary patch delta 65 zcmcchjcLs{rVT&1CO>c&nLL5JVRC@87?8G@EVGMiasao^W&xfK)6Ium-my$xA;UMh V!d+l8i@Vn50>>cc&3;}yg#eak8Cw7V delta 81 zcmZ4Ujp^1mrVT&1CV${$nLL5JVRC?z$YdVwhRp&z9j2SVxoI(Pp5ge8W%4cuiOB&j j0>VZN1`I|FrVKg^3P2h}8cr^Bv7T&Tt+83bi>D9(=It5g diff --git a/PROMS/Volian.Controls.Library/DisplayHistory.resx b/PROMS/Volian.Controls.Library/DisplayHistory.resx index ba42be92..28034095 100644 --- a/PROMS/Volian.Controls.Library/DisplayHistory.resx +++ b/PROMS/Volian.Controls.Library/DisplayHistory.resx @@ -112,13 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - <?xml version="1.0" encoding="utf-8"?> + <?xml version="1.0" encoding="utf-16"?> <VlnBorders Rows="4" Columns="3"> <VerticalLines Rows="4" Columns="4"> <Lines> @@ -161,7 +161,31 @@ </HorizontalLines> </VlnBorders> - - Normal{Font:Microsoft Sans Serif, 8.25pt;BackColor:White;TextAlign:LeftTop;Border:Flat,1,Black,Both;} Alternate{BackColor:White;} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:LightCyan;ForeColor:Black;} Focus{BackColor:LightCyan;} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} NewRow{ForeColor:GrayText;} EmptyArea{BackColor:Transparent;Border:None,1,Black,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} FilterEditor{} FirstCustomStyle{} + + <?xml version="1.0" encoding="utf-16"?> +<VlnGridCellShading Rows="4" Columns="3"> + <TableShadingInfo Rows="4" Columns="3"> + <CellShadingColor> + <string>[A=255, R=255, G=255, B=255]</string> + <string>[A=255, R=255, G=255, B=255]</string> + <string>[A=255, R=255, G=255, B=255]</string> + <string>[A=255, R=255, G=255, B=255]</string> + <string>[A=255, R=255, G=255, B=255]</string> + <string>[A=255, R=255, G=255, B=255]</string> + <string>[A=255, R=255, G=255, B=255]</string> + <string>[A=255, R=255, G=255, B=255]</string> + <string>[A=255, R=255, G=255, B=255]</string> + <string>[A=255, R=255, G=255, B=255]</string> + <string>[A=255, R=255, G=255, B=255]</string> + <string>[A=255, R=255, G=255, B=255]</string> + </CellShadingColor> + </TableShadingInfo> +</VlnGridCellShading> + + Normal{Font:Microsoft Sans Serif, 8.25pt;BackColor:White;TextAlign:LeftTop;Border:Flat,1,Black,Both;} Alternate{BackColor:White;} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:LightCyan;ForeColor:Black;} Focus{BackColor:LightCyan;} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} FrozenAlternate{} NewRow{ForeColor:GrayText;} EmptyArea{BackColor:Transparent;Border:None,1,Black,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} FilterEditor{} FirstCustomStyle{} + + + 17, 17 + \ No newline at end of file diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj index c4f41e44..f63be9f6 100644 --- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj +++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj @@ -460,6 +460,7 @@ DisplayHistory.cs + Designer DisplayLibDocs.cs