diff --git a/PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj b/PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj
index 7f9497c0..5cb839ea 100644
--- a/PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj
+++ b/PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj
@@ -27,7 +27,7 @@
- v4.6.2
+ v4.8.1
diff --git a/PROMS/AdjustBuildRevision/Program.cs b/PROMS/AdjustBuildRevision/Program.cs
index d4e0b720..fe9948de 100644
--- a/PROMS/AdjustBuildRevision/Program.cs
+++ b/PROMS/AdjustBuildRevision/Program.cs
@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
{
// Allow for setting build revision on either proms or the roeditor:
if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
- outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
+ outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
else
- outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
+ outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
// if (outline != line)
// {
// Console.WriteLine("Before: '{0}'", line);
diff --git a/PROMS/AdjustBuildRevision/app.config b/PROMS/AdjustBuildRevision/app.config
index 2a0024f7..eca069e4 100644
--- a/PROMS/AdjustBuildRevision/app.config
+++ b/PROMS/AdjustBuildRevision/app.config
@@ -1,3 +1,3 @@
-
+
diff --git a/PROMS/Baseline/App.config b/PROMS/Baseline/App.config
index 21930064..ccd6c6f4 100644
--- a/PROMS/Baseline/App.config
+++ b/PROMS/Baseline/App.config
@@ -6,7 +6,7 @@
-
+
diff --git a/PROMS/Baseline/Baseline.csproj b/PROMS/Baseline/Baseline.csproj
index b3163a7e..e365d3d8 100644
--- a/PROMS/Baseline/Baseline.csproj
+++ b/PROMS/Baseline/Baseline.csproj
@@ -9,7 +9,7 @@
Properties
Baseline
Baseline
- v4.6.2
+ v4.8.1
512
diff --git a/PROMS/DropDownPanel/DropDownPanel.csproj b/PROMS/DropDownPanel/DropDownPanel.csproj
index c8da1a5c..2134521b 100644
--- a/PROMS/DropDownPanel/DropDownPanel.csproj
+++ b/PROMS/DropDownPanel/DropDownPanel.csproj
@@ -18,7 +18,7 @@
- v4.6.2
+ v4.8.1
diff --git a/PROMS/FlexableMessageBox/FlexableMessageBox.csproj b/PROMS/FlexableMessageBox/FlexableMessageBox.csproj
index 5f7d9b2f..9439fdb5 100644
--- a/PROMS/FlexableMessageBox/FlexableMessageBox.csproj
+++ b/PROMS/FlexableMessageBox/FlexableMessageBox.csproj
@@ -9,7 +9,7 @@
Properties
FlexableMessageBox
FlexableMessageBox
- v4.6.2
+ v4.8.1
512
diff --git a/PROMS/Formats/Formats.csproj b/PROMS/Formats/Formats.csproj
index f2530233..ed047255 100644
--- a/PROMS/Formats/Formats.csproj
+++ b/PROMS/Formats/Formats.csproj
@@ -18,7 +18,7 @@
- v4.6.2
+ v4.8.1
diff --git a/PROMS/Formats/app.config b/PROMS/Formats/app.config
index 2a0024f7..eca069e4 100644
--- a/PROMS/Formats/app.config
+++ b/PROMS/Formats/app.config
@@ -1,3 +1,3 @@
-
+
diff --git a/PROMS/LBWordLibrary/LBWordLibrary.csproj b/PROMS/LBWordLibrary/LBWordLibrary.csproj
index 6bc72442..76bf81f4 100644
--- a/PROMS/LBWordLibrary/LBWordLibrary.csproj
+++ b/PROMS/LBWordLibrary/LBWordLibrary.csproj
@@ -18,7 +18,7 @@
- v4.6.2
+ v4.8.1
diff --git a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj
index e8a3e5f1..46a1ce81 100644
--- a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj
+++ b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj
@@ -33,7 +33,7 @@
- v4.6.2
+ v4.8.1
2.0
diff --git a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config
index 8129eac1..d3945c3d 100644
--- a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config
+++ b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config
@@ -1,6 +1,6 @@
-
+
diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs
index 8f0cf924..40c79565 100644
--- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs
+++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs
@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
// Build YYMM (two digit year, two digit month)
// Revision DHH (day - no leading zero, two digit hour - military time
//
-[assembly: AssemblyVersion("2.2.2306.2212")]
-[assembly: AssemblyFileVersion("2.2.2306.2212")]
+[assembly: AssemblyVersion("2.3.2404.1611")]
+[assembly: AssemblyFileVersion("2.3.2404.1611")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
@@ -89,6 +89,8 @@ using System.Runtime.CompilerServices;
+
+
diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj
index 751aaec4..69260b95 100644
--- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj
+++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj
@@ -44,7 +44,7 @@
- v4.6.2
+ v4.8.1
2.0
diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config
index 29f8d38d..cee050ac 100644
--- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config
+++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config
@@ -1,7 +1,7 @@
-
+
diff --git a/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj b/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj
index 3e34a82c..24c52712 100644
--- a/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj
+++ b/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj
@@ -35,7 +35,7 @@
- v4.6.2
+ v4.8.1
2.0
diff --git a/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj b/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj
index d05e5d92..d214040b 100644
--- a/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj
+++ b/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj
@@ -18,7 +18,7 @@
- v4.6.2
+ v4.8.1
diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj
index a7850154..12e54462 100644
--- a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj
+++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj
@@ -35,7 +35,7 @@
- v4.6.2
+ v4.8.1
2.0
diff --git a/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj b/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj
index 91edc027..75a2ba87 100644
--- a/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj
+++ b/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj
@@ -35,7 +35,7 @@
- v4.6.2
+ v4.8.1
2.0
diff --git a/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj b/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj
index 0bd1b17f..16950805 100644
--- a/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj
+++ b/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj
@@ -35,7 +35,7 @@
- v4.6.2
+ v4.8.1
2.0
diff --git a/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj b/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj
index 29ab1b50..fee231fd 100644
--- a/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj
+++ b/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj
@@ -51,7 +51,7 @@
- v4.6.2
+ v4.8.1
diff --git a/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj b/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj
index 91d22ce5..5c482323 100644
--- a/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj
+++ b/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj
@@ -46,7 +46,7 @@
- v4.6.2
+ v4.8.1
2.0
diff --git a/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj b/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj
index e94f11e0..1b9f33a0 100644
--- a/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj
+++ b/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj
@@ -35,7 +35,7 @@
- v4.6.2
+ v4.8.1
2.0
diff --git a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj
index 00d113ef..e5629e60 100644
--- a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj
+++ b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj
@@ -35,7 +35,7 @@
- v4.6.2
+ v4.8.1
2.0
diff --git a/PROMS/RoAccessToSql/App.config b/PROMS/RoAccessToSql/App.config
index dc4131e4..117393ac 100644
--- a/PROMS/RoAccessToSql/App.config
+++ b/PROMS/RoAccessToSql/App.config
@@ -60,6 +60,6 @@
-
+
diff --git a/PROMS/RoAccessToSql/RoAccessToSql.csproj b/PROMS/RoAccessToSql/RoAccessToSql.csproj
index 4afa3ebb..9bdd03e9 100644
--- a/PROMS/RoAccessToSql/RoAccessToSql.csproj
+++ b/PROMS/RoAccessToSql/RoAccessToSql.csproj
@@ -9,7 +9,7 @@
Properties
RoAccessToSql
RoAccessToSql
- v4.6.2
+ v4.8.1
512
diff --git a/PROMS/TablePicker/TablePicker.csproj b/PROMS/TablePicker/TablePicker.csproj
index 1e012a02..d9e7d339 100644
--- a/PROMS/TablePicker/TablePicker.csproj
+++ b/PROMS/TablePicker/TablePicker.csproj
@@ -33,7 +33,7 @@
- v4.6.2
+ v4.8.1
2.0
diff --git a/PROMS/VEPROMS User Interface/App.config b/PROMS/VEPROMS User Interface/App.config
index ce6b2188..6a31a77c 100644
--- a/PROMS/VEPROMS User Interface/App.config
+++ b/PROMS/VEPROMS User Interface/App.config
@@ -1,73 +1,73 @@
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
@@ -135,10 +135,10 @@
True
-
+
-
+
0.0
@@ -150,10 +150,10 @@
True
-
+
-
+
True
@@ -181,18 +181,22 @@
-
+
+
+
+
-
+
-
+
-
\ No newline at end of file
+
diff --git a/PROMS/VEPROMS User Interface/Properties/licenses.licx b/PROMS/VEPROMS User Interface/Properties/licenses.licx
index 7606ef69..e69de29b 100644
--- a/PROMS/VEPROMS User Interface/Properties/licenses.licx
+++ b/PROMS/VEPROMS User Interface/Properties/licenses.licx
@@ -1,2 +0,0 @@
-C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2
-C1.Win.C1SpellChecker.C1SpellChecker, C1.Win.C1SpellChecker.2
diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
index 942dcf26..11057df4 100644
--- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
+++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
@@ -19,7 +19,7 @@
- v4.6.2
+ v4.8.1
@@ -99,11 +99,11 @@
false
-
- False
+
+ ..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll
-
- False
+
+ ..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll
..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll
diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
index 59628177..ca2e8c7f 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
@@ -68,6 +68,7 @@ namespace VEPROMS
this.cbScrunch = new System.Windows.Forms.CheckBox();
this.btnNext = new System.Windows.Forms.Button();
this.cmbFont = new System.Windows.Forms.ComboBox();
+ this.lblDummy = new System.Windows.Forms.Label();
this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
@@ -514,6 +515,7 @@ namespace VEPROMS
this.bottomBar.Controls.Add(this.cbScrunch);
this.bottomBar.Controls.Add(this.btnNext);
this.bottomBar.Controls.Add(this.cmbFont);
+ this.bottomBar.Controls.Add(this.lblDummy);
this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
this.bottomBar.IsMaximized = false;
@@ -601,6 +603,15 @@ namespace VEPROMS
this.cmbFont.TabIndex = 0;
this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged);
//
+ // lblDummy
+ //
+ this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
+ this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
+ this.lblDummy.Location = new System.Drawing.Point(1013, 0);
+ this.lblDummy.Name = "lblDummy";
+ this.lblDummy.Size = new System.Drawing.Size(10, 25);
+ this.lblDummy.Visible = false;
+ //
// labelItem10
//
this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
@@ -1732,6 +1743,7 @@ namespace VEPROMS
private DevComponents.DotNetBar.ButtonItem btnShortCuts;
private DevComponents.DotNetBar.LabelItem lblItemID;
private System.Windows.Forms.ComboBox cmbFont;
+ private System.Windows.Forms.Label lblDummy;
private DevComponents.DotNetBar.LabelItem lblResolution;
private DevComponents.DotNetBar.LabelItem lblUser;
private DevComponents.DotNetBar.LabelItem lblLastChange;
diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index bc046ef3..a7778118 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
@@ -3202,6 +3202,14 @@ namespace VEPROMS
txtSearch.Visible = false;
lblLastChange.Visible = false;
btnStepRTF.Visible = false;
+ lblDummy.Visible = false;
+ }
+ else
+ {
+ // C2024-007: On Proms main form, allow for control of whether the FontMenu
+ // combo box is displayed. Only done when running in debugmode
+ cmbFont.Visible = Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
+ lblDummy.Visible = !Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
index 67c8b212..771b155f 100644
--- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
+++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
@@ -18,7 +18,7 @@
- v4.6.2
+ v4.8.1
diff --git a/PROMS/VG/VG.csproj b/PROMS/VG/VG.csproj
index 1ab52e35..7308ee23 100644
--- a/PROMS/VG/VG.csproj
+++ b/PROMS/VG/VG.csproj
@@ -35,7 +35,7 @@
- v4.6.2
+ v4.8.1
2.0
diff --git a/PROMS/Volian.Base.Library/Volian.Base.Library.csproj b/PROMS/Volian.Base.Library/Volian.Base.Library.csproj
index d4fcbc7b..8c135c78 100644
--- a/PROMS/Volian.Base.Library/Volian.Base.Library.csproj
+++ b/PROMS/Volian.Base.Library/Volian.Base.Library.csproj
@@ -18,7 +18,7 @@
- v4.6.2
+ v4.8.1
diff --git a/PROMS/Volian.Controls.Library/Properties/licenses.licx b/PROMS/Volian.Controls.Library/Properties/licenses.licx
new file mode 100644
index 00000000..e69de29b
diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
index cc01cd61..046af0aa 100644
--- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
+++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
@@ -3716,17 +3716,17 @@ namespace Volian.Controls.Library
/// Grid will be saved to an Excel file.
///
///
- public void ExportToExcel(string initDir)
- {
- SaveFileDialog sfd = new SaveFileDialog();
- sfd.DefaultExt = ".xls";
- sfd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.* ";
- //sfd.InitialDirectory = @"C:\Development\SampleTableData";
- sfd.InitialDirectory = initDir;
- sfd.Title = "Save Excel File";
- sfd.ShowDialog();
- this.SaveExcel(sfd.FileName);
- }
+ //public void ExportToExcel(string initDir)
+ //{
+ // SaveFileDialog sfd = new SaveFileDialog();
+ // sfd.DefaultExt = ".xls";
+ // sfd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.* ";
+ // //sfd.InitialDirectory = @"C:\Development\SampleTableData";
+ // sfd.InitialDirectory = initDir;
+ // sfd.Title = "Save Excel File";
+ // sfd.ShowDialog();
+ // this.SaveExcel(sfd.FileName);
+ //}
///
/// Prompts user with Open File dialog.
@@ -3761,25 +3761,25 @@ namespace Volian.Controls.Library
///
///
///
- public string ImportExcel(string initDir)
- {
- string rtn = "";
- //VlnFlexGrid grd = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3; //GetActiveGrid();
- OpenFileDialog ofd = new OpenFileDialog();
- ofd.DefaultExt = ".xls";
- ofd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.*";
- //ofd.InitialDirectory = @"C:\Development\SampleTableData";
- ofd.InitialDirectory = initDir;
- ofd.Multiselect = false;
- ofd.Title = "Select Excel File";
- ofd.ShowDialog();
- this.Clear();
- this.MergedRanges.Clear();
- this.LoadExcel(ofd.FileName);
- this.AdjustGridControlSize();
- rtn = ofd.SafeFileName;
- return rtn;
- }
+ //public string ImportExcel(string initDir)
+ //{
+ // string rtn = "";
+ // //VlnFlexGrid grd = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3; //GetActiveGrid();
+ // OpenFileDialog ofd = new OpenFileDialog();
+ // ofd.DefaultExt = ".xls";
+ // ofd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.*";
+ // //ofd.InitialDirectory = @"C:\Development\SampleTableData";
+ // ofd.InitialDirectory = initDir;
+ // ofd.Multiselect = false;
+ // ofd.Title = "Select Excel File";
+ // ofd.ShowDialog();
+ // this.Clear();
+ // this.MergedRanges.Clear();
+ // this.LoadExcel(ofd.FileName);
+ // this.AdjustGridControlSize();
+ // rtn = ofd.SafeFileName;
+ // return rtn;
+ //}
public static List ROTableUpdate(object sender, ROFstInfoROTableUpdateEventArgs args)
{
string xml = null;
diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
index 25057d33..62f3cbe6 100644
--- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
+++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
@@ -18,7 +18,7 @@
- v4.6.2
+ v4.8.1
@@ -87,11 +87,14 @@
False
..\..\..\..\3rdPartyLibraries\Edraw\AxInterop.EDWordLib.dll
-
- False
+
+ ..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll
-
- False
+
+ ..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll
+
+
+ ..\VEPROMS\packages\C1.Win.C1SpellChecker.4.8.20233.631\lib\net48\C1.Win.C1SpellChecker.4.8.dll
..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll
@@ -485,6 +488,7 @@
PreviewROImage.cs
Designer
+
RTBItem.cs
Designer
@@ -582,10 +586,12 @@
+
SettingsSingleFileGenerator
Settings.Designer.cs
+
diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.gclicx b/PROMS/Volian.Controls.Library/Volian.Controls.Library.gclicx
new file mode 100644
index 00000000..e2beeb1e
--- /dev/null
+++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.gclicx
@@ -0,0 +1 @@
+da3d5d14-691f-4908-aa3c-fd3239734232;-8584914772854775808;Vm9saWFuLkNvbnRyb2xzLkxpYnJhcnkuZGxs;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MDEwODE5MjdYWFhYWFhYWDA1Mg,Sk9ITi1XSU4xMA,RmFsc2U,ODQzNA,RmFsc2U,MA,MA,djIwMjIuMw,,;c7VmK7aSALscK1Nd/lI1cS3mms+p4j4Fsa2LgKQ1JmeSkNKq5X8LWx2NLOHITkvv+3IbbTQcVPnGa7hKiEDHlfH3thfwEvtzoqprZSXMOYfNPiXTPIIYPNb6L31Qq7AGiogvw+dMD9o/AiUWt4Q7a5SRmYU+PbrlNAXVISIzndw
diff --git a/PROMS/Volian.Controls.Library/app.config b/PROMS/Volian.Controls.Library/app.config
index a22567fe..1d945e2f 100644
--- a/PROMS/Volian.Controls.Library/app.config
+++ b/PROMS/Volian.Controls.Library/app.config
@@ -12,4 +12,4 @@
-
+
diff --git a/PROMS/Volian.Controls.Library/packages.config b/PROMS/Volian.Controls.Library/packages.config
new file mode 100644
index 00000000..423ea33e
--- /dev/null
+++ b/PROMS/Volian.Controls.Library/packages.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PROMS/Volian.Pipe.Library/Volian.Pipe.Library.csproj b/PROMS/Volian.Pipe.Library/Volian.Pipe.Library.csproj
index 201b3327..1e8f9c29 100644
--- a/PROMS/Volian.Pipe.Library/Volian.Pipe.Library.csproj
+++ b/PROMS/Volian.Pipe.Library/Volian.Pipe.Library.csproj
@@ -9,7 +9,7 @@
Properties
Volian.Pipe.Library
Volian.Pipe.Library
- v4.6.2
+ v4.8.1
512
"%24/PROMS/Volian.Pipe.Library", RQGAAAAA
diff --git a/PROMS/Volian.Print.Library/Grid2Pdf.cs b/PROMS/Volian.Print.Library/Grid2Pdf.cs
index 5b537832..652cc3fd 100644
--- a/PROMS/Volian.Print.Library/Grid2Pdf.cs
+++ b/PROMS/Volian.Print.Library/Grid2Pdf.cs
@@ -1,5 +1,4 @@
using System;
-using System;
using System.Collections.Generic;
using System.Text;
using C1.Win.C1FlexGrid;
diff --git a/PROMS/Volian.Print.Library/Properties/licenses.licx b/PROMS/Volian.Print.Library/Properties/licenses.licx
index af04e7d1..e69de29b 100644
--- a/PROMS/Volian.Print.Library/Properties/licenses.licx
+++ b/PROMS/Volian.Print.Library/Properties/licenses.licx
@@ -1 +0,0 @@
-C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2
diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
index aa5ed78d..2bda4ef7 100644
--- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
+++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
@@ -18,7 +18,7 @@
- v4.6.2
+ v4.8.1
@@ -65,8 +65,11 @@
false
-
- False
+
+ ..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll
+
+
+ ..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll
..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll
@@ -153,7 +156,9 @@
+
+