PROMS/fmtxml/FmtFileToXml.cs

@@ -23,7 +23,6 @@ public struct FormatData
 {
     public string Name; 
     public string PurchaseOptions;
-	public string PSI;
 	public string TPL;
     //public XtraFlgs XtraFlags;
     public VE_Font FontData;
@@ -461,11 +460,54 @@ public struct Procedure
 	public string CountFoldoutPages;
 	/* End of Format flags  */
     public string[] ProcedureSuffix;
-    public string PSInfFile;
+	public PSI Psi;
     public ChangeBar ChangeBarData;
     public CheckOffData CheckOffData;
 }
 [Serializable]
+public struct PSI
+{
+	public int x;
+	public int y;
+	public string Caption;
+	public string ButtonsOnBottom;
+	public string font;
+	public PsiBox[] Boxes;
+	public PsiLabel[] Labels;
+	public PsiField[] Fields;
+}
+[Serializable]
+public struct PsiBox
+{
+	public string style;
+	public int x;
+	public int y;
+	public int width;
+	public int height;
+}
+[Serializable]
+public struct PsiLabel
+{
+	public string text;
+	public string Justify;
+	public int x;
+	public int y;
+	public int width;
+	public int height;
+}
+[Serializable]
+public struct PsiField
+{
+	public string name;
+	public string type;
+	public string text;
+	public int Length;
+	public int x;
+	public int y;
+	public int width;
+	public int height;
+}
+[Serializable]
 public struct CheckOffData
 {
 	public string Menu;
@@ -1068,7 +1110,7 @@ public enum E_TransFormatXlate : uint
 ///////////////////////////
 namespace fmtxml
 {
-    public class FmtFileToXml
+    public partial class FmtFileToXml
     {
         #region localdata
 		public XtraFlgs BaseXtraFlags;			// used to set up all flags for the Base format.
@@ -1499,7 +1541,7 @@ namespace fmtxml
             BuildDictionaryText();
             fmtName = alias;
 			//if (fmtName.ToUpper() != "CPLS" && fmtName.ToUpper() != "BASE") return;
-			//if (fmtName.ToUpper() != "OHLP" &&  fmtName.ToUpper() != "BASE") return;
+			//if (fmtName.ToUpper() != "HLP" &&  fmtName.ToUpper() != "BASE") return;
 			//if (fmtName.ToUpper() != "AEP" && fmtName.ToUpper() != "BASE") return;
             try
             {
@@ -2095,9 +2137,7 @@ namespace fmtxml
 					fmtdata.TPL = FixXmlString(File.ReadAllText(otherfile));
 				// http://www.w3.org/TR/2000/REC-xml-20001006#NT-Char
 				otherfile = MyPath + @"\" + fname.Substring(0, fname.LastIndexOf(".")) + @".ini";
-				if (File.Exists(otherfile)) 
-					fmtdata.PSI = File.ReadAllText(otherfile);
-				
+				if (File.Exists(otherfile)) PsiIniToXml(ref fmtdata, otherfile);
                 fmtdata.PurchaseOptions = ((E_PurchaseOptions)brFmt.ReadInt16()).ToString();
 				fmtdata.ProcData.ProcForeColor = "Black";
 				fmtdata.ProcData.ProcBackColor = "White";
@@ -2983,7 +3023,7 @@ namespace fmtxml
 
                 indx = offset[arcnt];
                 arcnt++;
-                if (indx > 0) fmtdata.ProcData.PSInfFile = GetStringFromByte(input, indx);
+                if (indx > 0) tmpstr = GetStringFromByte(input, indx);
 
                 // not used - RNOPreSeqTab[9][2]
                 arcnt = arcnt + 18;
@@ -4571,7 +4611,6 @@ namespace fmtxml
             #region COMPAREACTIVE
 						subFmt.FontData = FixInheritedFont(subFmt.FontData, mainFmt.FontData); // Phase 10
             if (mainFmt.PurchaseOptions == subFmt.PurchaseOptions) subFmt.PurchaseOptions = null;
-			if (mainFmt.PSI == subFmt.PSI) subFmt.PSI = null;
 			if (mainFmt.TPL == subFmt.TPL) subFmt.TPL = null;
             if (mainFmt.EditData.EMode == subFmt.EditData.EMode) subFmt.EditData.EMode = null;
 			if (mainFmt.EditData.PromptForCautionType != null && mainFmt.EditData.PromptForCautionType == subFmt.EditData.PromptForCautionType) subFmt.EditData.PromptForCautionType = "null";
@@ -5002,7 +5041,6 @@ namespace fmtxml
             for (int i = 0; i < MAXCHKHEADINGS; i++)
                 if (mco.CheckOffHeaderList[i].CheckOffHeading == sco.CheckOffHeaderList[i].CheckOffHeading) subFmt.ProcData.CheckOffData.CheckOffHeaderList[i].CheckOffHeading = null;
  
-            if (mainFmt.ProcData.PSInfFile == subFmt.ProcData.PSInfFile) subFmt.ProcData.PSInfFile = null;
             if (msctpr.HLStpSeparatorString == ssctpr.HLStpSeparatorString) subFmt.SectData.StepSectionData.StpSectPrtData.HLStpSeparatorString = null;
             if (msctpr.HLRNOStpSeparatorString == ssctpr.HLRNOStpSeparatorString) subFmt.SectData.StepSectionData.StpSectPrtData.HLRNOStpSeparatorString = null;
 			if (msctpr.LowerCaseRevNum != null && msctpr.LowerCaseRevNum == ssctpr.LowerCaseRevNum) subFmt.SectData.StepSectionData.StpSectPrtData.LowerCaseRevNum = "null";