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

Browse Source
This commit is contained in:
John Jenko
2010-08-12 16:05:52 +00:00
parent f91459b9f0
commit 0849b002b4
18 changed files with 231 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs
View File

@@ -709,9 +709,9 @@ namespace VEPROMS.CSLA.Library
{
string s = _Xp["PrintSettings", "AlwaysOverwritePDF"];
// If there is no value, then default to false
// If there is no value, then default to true
if (s == string.Empty)
s = "false"; // default
s = "true"; // default
return bool.Parse(s);
}
@@ -737,9 +737,9 @@ namespace VEPROMS.CSLA.Library
{
string s = _Xp["PrintSettings", "AlwaysViewPDFAfterCreate"];
// If there is no value, then default to false
// If there is no value, then default to true
if (s == string.Empty)
s = "false"; // default
s = "true"; // default
return bool.Parse(s);
}

33
PROMS/VEPROMS.CSLA.Library/Config/DocumentConfig.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Text;
using System.ComponentModel;
using System.Drawing;
using System.Text.RegularExpressions;
namespace VEPROMS.CSLA.Library
{
@@ -83,6 +84,24 @@ namespace VEPROMS.CSLA.Library
OnPropertyChanged("Printing_Length");
}
}
private static Regex byARGB = new Regex(@"Color \[A=([0-9]*), R=([0-9]*), G=([0-9]*), B=([0-9]*)\]");
private static Regex byName = new Regex(@"Color \[(.*)\]");
public static Color ColorFromString(string sColor)
{
Match myMatch = byARGB.Match(sColor);
if (myMatch.Groups.Count == 5)
return Color.FromArgb(int.Parse(myMatch.Groups[1].Value), int.Parse(myMatch.Groups[2].Value), int.Parse(myMatch.Groups[3].Value), int.Parse(myMatch.Groups[4].Value));
myMatch = byName.Match(sColor);
if (myMatch.Groups.Count == 2)
return Color.FromName(myMatch.Groups[1].Value);
if (sColor[0] == '[')
{
string[] parts = sColor.Substring(1, sColor.Length - 2).Split(",".ToCharArray());
return Color.FromArgb(Int32.Parse(parts[0]), Int32.Parse(parts[1]), Int32.Parse(parts[2]), Int32.Parse(parts[3]));
}
else return Color.FromName(sColor);
}
[Category("Printing")]
[DisplayName("Color")]
[Description("Color of Document Text")]
@@ -91,21 +110,11 @@ namespace VEPROMS.CSLA.Library
get
{
string sColor = _Xp["Printing", "Color"];
if (sColor == string.Empty) sColor = "Transparent";
if (sColor[0] == '[')
{
string[] parts = sColor.Substring(1, sColor.Length - 2).Split(",".ToCharArray());
return Color.FromArgb(Int32.Parse(parts[0]), Int32.Parse(parts[1]), Int32.Parse(parts[2]), Int32.Parse(parts[3]));
}
else return Color.FromName(sColor);
return ColorFromString(sColor);
}
set
{
if (value.IsNamedColor) _Xp["Printing", "Color"] = value.Name;
else
{
_Xp["Printing", "Color"] = string.Format("[{0},{1},{2},{3}]", value.A, value.R, value.G, value.B);
}
_Xp["Printing", "Color"] = value.ToString();
OnPropertyChanged("Printing_Color");
}
}

192
PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs
View File

@@ -227,103 +227,103 @@ namespace VEPROMS.CSLA.Library
}
}
#endregion
#region ColorCategory // From veproms.ini
// ** Note that not all possibilities from 16-bit will be added here, until
// ** it is determined how these will be used
// ** If this is used (unhidden), then we need to add logic to blank setting if the value
// ** we are saving is the same as the parent's value.
//#region ColorCategory // From veproms.ini
//// ** Note that not all possibilities from 16-bit will be added here, until
//// ** it is determined how these will be used
//// ** If this is used (unhidden), then we need to add logic to blank setting if the value
//// ** we are saving is the same as the parent's value.
//PROPGRID: Hide Editor Color for ROs
[Category("Editor Settings")]
[Browsable(false)]
[DisplayName("Step Editor Colors - Referenced Objects")]
[RefreshProperties(RefreshProperties.All)]
[Description("Color used to highlight an RO in procedure text")]
public string Color_ro
{
get
{
return _Xp["Color", "ro"];
}
set
{
_Xp["Color", "ro"] = value;
OnPropertyChanged("Color_ro");
}
}
//PROPGRID: Hide Editor Color for Transitions
[Category("Editor Settings")]
[Browsable(false)]
[DisplayName("Step Editor Colors - Transitions")]
[RefreshProperties(RefreshProperties.All)]
[Description("Color used to highlight a Transition in procedure text")]
public string Color_transition
{
get
{
return _Xp["Color", "transition"];
}
set
{
_Xp["Color", "transition"] = value;
OnPropertyChanged("Color_transition");
}
}
//PROPGRID: Hide Active Text Background Color
[Category("Editor Settings")]
[Browsable(false)]
[DisplayName("Step Editor Colors - Active Background")]
[RefreshProperties(RefreshProperties.All)]
[Description("editbackground")]
public string Color_editbackground
{
get
{
return _Xp["Color", "editbackground"];
}
set
{
_Xp["Color", "editbackground"] = value;
OnPropertyChanged("Color_editbackground");
}
}
//PROPGRID: Hide color setting for Black
[Category("Color")]
[Browsable(false)]
[DisplayName("black")]
[RefreshProperties(RefreshProperties.All)]
[Description("black")]
public string Color_black
{
get
{
return _Xp["Color", "black"];
}
set
{
_Xp["Color", "black"] = value;
OnPropertyChanged("Color_black");
}
}
//PROPGRID: Hide Color Setting for Blue
[Category("Color")]
[Browsable(false)]
[DisplayName("blue")]
[RefreshProperties(RefreshProperties.All)]
[Description("blue")]
public string Color_blue
{
get
{
return _Xp["Color", "blue"];
}
set
{
_Xp["Color", "blue"] = value;
OnPropertyChanged("Color_blue");
}
}
#endregion // From veproms.ini
////PROPGRID: Hide Editor Color for ROs
//[Category("Editor Settings")]
//[Browsable(false)]
//[DisplayName("Step Editor Colors - Referenced Objects")]
//[RefreshProperties(RefreshProperties.All)]
//[Description("Color used to highlight an RO in procedure text")]
//public string Color_ro
//{
// get
// {
// return _Xp["Color", "ro"];
// }
// set
// {
// _Xp["Color", "ro"] = value;
// OnPropertyChanged("Color_ro");
// }
//}
////PROPGRID: Hide Editor Color for Transitions
//[Category("Editor Settings")]
//[Browsable(false)]
//[DisplayName("Step Editor Colors - Transitions")]
//[RefreshProperties(RefreshProperties.All)]
//[Description("Color used to highlight a Transition in procedure text")]
//public string Color_transition
//{
// get
// {
// return _Xp["Color", "transition"];
// }
// set
// {
// _Xp["Color", "transition"] = value;
// OnPropertyChanged("Color_transition");
// }
//}
////PROPGRID: Hide Active Text Background Color
//[Category("Editor Settings")]
//[Browsable(false)]
//[DisplayName("Step Editor Colors - Active Background")]
//[RefreshProperties(RefreshProperties.All)]
//[Description("editbackground")]
//public string Color_editbackground
//{
// get
// {
// return _Xp["Color", "editbackground"];
// }
// set
// {
// _Xp["Color", "editbackground"] = value;
// OnPropertyChanged("Color_editbackground");
// }
//}
////PROPGRID: Hide color setting for Black
//[Category("Color")]
//[Browsable(false)]
//[DisplayName("black")]
//[RefreshProperties(RefreshProperties.All)]
//[Description("black")]
//public string Color_black
//{
// get
// {
// return _Xp["Color", "black"];
// }
// set
// {
// _Xp["Color", "black"] = value;
// OnPropertyChanged("Color_black");
// }
//}
////PROPGRID: Hide Color Setting for Blue
//[Category("Color")]
//[Browsable(false)]
//[DisplayName("blue")]
//[RefreshProperties(RefreshProperties.All)]
//[Description("blue")]
//public string Color_blue
//{
// get
// {
// return _Xp["Color", "blue"];
// }
// set
// {
// _Xp["Color", "blue"] = value;
// OnPropertyChanged("Color_blue");
// }
//}
//#endregion // From veproms.ini
#region SystemPrintCategory // From veproms.ini
[Category("Print Settings")]
[DisplayName("Override Underline Thickness (dots)")]