Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C2024-008 -Created a PROMS executable use .Net version 4.8.1

Browse Source 
B2020-106 - Fixed insert of new symbols.
This commit is contained in:
John Jenko
2024-04-16 14:16:40 -04:00
parent 4a3ca1c074
commit 1bdfb7d1e3
48 changed files with 155 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
PROMS/Volian.Controls.Library/Properties/licenses.licx Normal file
View File

60
PROMS/Volian.Controls.Library/VlnFlexGrid.cs
View File

@@ -3716,17 +3716,17 @@ namespace Volian.Controls.Library
/// Grid will be saved to an Excel file.
/// </summary>
/// <param name="initDir"></param>
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);
//}
/// <summary>
/// Prompts user with Open File dialog.
@@ -3761,25 +3761,25 @@ namespace Volian.Controls.Library
/// </summary>
/// <param name="initDir"></param>
/// <returns></returns>
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<string> ROTableUpdate(object sender, ROFstInfoROTableUpdateEventArgs args)
{
string xml = null;

16
PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
View File

@@ -18,7 +18,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@@ -87,11 +87,14 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\Edraw\AxInterop.EDWordLib.dll</HintPath>
</Reference>
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="C1.Win.4.8">
<HintPath>..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll</HintPath>
</Reference>
<Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="C1.Win.C1FlexGrid.4.8, Version=4.8.20233.631, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<HintPath>..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll</HintPath>
</Reference>
<Reference Include="C1.Win.C1SpellChecker.4.8, Version=4.8.20233.631, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<HintPath>..\VEPROMS\packages\C1.Win.C1SpellChecker.4.8.20233.631\lib\net48\C1.Win.C1SpellChecker.4.8.dll</HintPath>
</Reference>
<Reference Include="Csla">
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
@@ -485,6 +488,7 @@
<DependentUpon>PreviewROImage.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="RTBItem.resx">
<DependentUpon>RTBItem.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -582,10 +586,12 @@
<ItemGroup>
<None Include="app.config" />
<None Include="ClassDiagram1.cd" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<EmbeddedResource Include="Volian.Controls.Library.gclicx" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="DisplayApplicability.resx">

1
PROMS/Volian.Controls.Library/Volian.Controls.Library.gclicx Normal file
View File

@@ -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

2
PROMS/Volian.Controls.Library/app.config
View File

@@ -12,4 +12,4 @@
</setting>
</Volian.Controls.Library.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

6
PROMS/Volian.Controls.Library/packages.config Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="C1.Win" version="8.0.20233.631" targetFramework="net481" />
<package id="C1.Win.C1FlexGrid" version="4.8.20233.631" targetFramework="net481" />
<package id="C1.Win.C1SpellChecker" version="4.8.20233.631" targetFramework="net481" />
</packages>