From 1dcda26a991f29b6b609277cc0dd58cc1ffcffd1 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 4 Jun 2010 19:24:52 +0000 Subject: [PATCH] fixed Bookmark wording debugged and fixed many issues in the property pages --- .../VEPROMS User Interface/SORTCUTS_MISC.rtf | 16 +- .../Config/SectionConfig.cs | 178 ++++++++++++++++-- 2 files changed, 175 insertions(+), 19 deletions(-) diff --git a/PROMS/VEPROMS User Interface/SORTCUTS_MISC.rtf b/PROMS/VEPROMS User Interface/SORTCUTS_MISC.rtf index 859442b7..b6c36521 100644 --- a/PROMS/VEPROMS User Interface/SORTCUTS_MISC.rtf +++ b/PROMS/VEPROMS User Interface/SORTCUTS_MISC.rtf @@ -43,9 +43,9 @@ \brdrs\brdrw10\brdrcf19 \trbrdrr\brdrs\brdrw10\brdrcf19 \trbrdrh\brdrs\brdrw10\brdrcf19 \trbrdrv\brdrs\brdrw10\brdrcf19 \trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon11 \snext17 \spriority59 \styrsid8022171 -Table Grid;}}{\*\rsidtbl \rsid1835065\rsid2033546\rsid2780123\rsid4348604\rsid5515475\rsid5975672\rsid6380939\rsid8022171\rsid13449869\rsid13901555\rsid15158949}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1 -\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author John Jenko}{\operator John Jenko}{\creatim\yr2009\mo11\dy13\hr14\min25}{\revtim\yr2009\mo11\dy13\hr14\min40}{\version3}{\edmins2}{\nofpages1}{\nofwords40}{\nofchars232}{\nofcharsws271}{\vern32771}} -{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl2448\margr2448\margt720\margb720\gutter0\ltrsect +Table Grid;}}{\*\rsidtbl \rsid1835065\rsid2033546\rsid2780123\rsid2891205\rsid4348604\rsid5515475\rsid5975672\rsid6380939\rsid8022171\rsid13449869\rsid13901555\rsid15158949}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0 +\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author John Jenko}{\operator John Jenko}{\creatim\yr2009\mo11\dy13\hr14\min25}{\revtim\yr2010\mo6\dy3\hr14\min40}{\version4}{\edmins2}{\nofpages1}{\nofwords39}{\nofchars232}{\nofcharsws270} +{\vern32771}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl2448\margr2448\margt720\margb720\gutter0\ltrsect \widowctrl\ftnbj\aenddoc\trackmoves1\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1\noxlattoyen \expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin2448\dgvorigin720\dghshow1\dgvshow1 \jexpand\viewkind1\viewscale90\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct @@ -120,9 +120,9 @@ Cancel Action}{\rtlch\fcs1 \af31507\afs20 \ltrch\fcs0 \fs20\insrsid8022171\charr \clbrdrr\brdrs\brdrw10\brdrcf19 \cltxlrtb\clftsWidth3\clwWidth4320\clshdrawnil \cellx7380\row \ltrrow}\pard\plain \ltrpar\ql \li0\ri0\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\pararsid15158949\yts17 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid1835065 [CTRL] [SHIFT] }{\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid6380939 [}{\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid15158949 M}{\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid6380939 ]}{\rtlch\fcs1 \af31507\afs20 \ltrch\fcs0 \fs20\insrsid8022171\charrsid2033546 \cell }\pard \ltrpar -\ql \li0\ri0\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\pararsid1835065\yts17 {\rtlch\fcs1 \af31507\afs20 \ltrch\fcs0 \fs20\insrsid15158949 Set Book Mark}{\rtlch\fcs1 \af31507\afs20 \ltrch\fcs0 -\fs20\insrsid8022171\charrsid2033546 \cell }\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 -\f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8022171 \trowd \irow7\irowband7\ltrrow\ts17\trgaph108\trleft0\trbrdrt\brdrs\brdrw10\brdrcf19 \trbrdrl\brdrs\brdrw10\brdrcf19 \trbrdrb +\ql \li0\ri0\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\pararsid1835065\yts17 {\rtlch\fcs1 \af31507\afs20 \ltrch\fcs0 \fs20\insrsid2891205 Set Bookm}{\rtlch\fcs1 \af31507\afs20 \ltrch\fcs0 \fs20\insrsid15158949 ark}{ +\rtlch\fcs1 \af31507\afs20 \ltrch\fcs0 \fs20\insrsid8022171\charrsid2033546 \cell }\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 \rtlch\fcs1 \af31507\afs22\alang1025 +\ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8022171 \trowd \irow7\irowband7\ltrrow\ts17\trgaph108\trleft0\trbrdrt\brdrs\brdrw10\brdrcf19 \trbrdrl\brdrs\brdrw10\brdrcf19 \trbrdrb \brdrs\brdrw10\brdrcf19 \trbrdrr\brdrs\brdrw10\brdrcf19 \trbrdrh\brdrs\brdrw10\brdrcf19 \trbrdrv\brdrs\brdrw10\brdrcf19 \trftsWidth3\trwWidth7380\trftsWidthB3\trftsWidthA3\trautofit1\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblrsid2780123\tbllkhdrrows\tbllkhdrcols\tbllknocolband\tblind108\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf19 \clbrdrl \brdrs\brdrw10\brdrcf19 \clbrdrb\brdrs\brdrw10\brdrcf19 \clbrdrr\brdrs\brdrw10\brdrcf19 \cltxlrtb\clftsWidth3\clwWidth3060\clshdrawnil \cellx3060\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf19 \clbrdrl\brdrs\brdrw10\brdrcf19 \clbrdrb\brdrs\brdrw10\brdrcf19 @@ -242,8 +242,8 @@ fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffffec69d9888b8b3d4c859eaf6cd158be0f000000000000000000000000c005 -df369964ca01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffffec69d9888b8b3d4c859eaf6cd158be0f000000000000000000000000a03c +95444c03cb01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs index 879377b3..3dc9de80 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs @@ -64,7 +64,8 @@ namespace VEPROMS.CSLA.Library if (retval != string.Empty) return retval; sect = (SectionInfo)sect.ActiveParent; } - ProcedureInfo proc = (ProcedureInfo)sect.ActiveParent; + ProcedureInfo proc = ProcedureInfo.Get(((ItemInfo)sect.ActiveParent).ItemID); + //ProcedureInfo proc = (ProcedureInfo)sect.ActiveParent; retval = proc.ProcedureConfig.GetValue(args.Group, args.Item); if (retval != string.Empty) return retval; while (proc.ActiveParent.GetType() == typeof(ProcedureInfo)) @@ -255,9 +256,11 @@ namespace VEPROMS.CSLA.Library } #endregion #region SectionCategory // from sequence number in 16-bit database. + [TypeConverter(typeof(EnumDescConverter))] public enum SectionPagination : int { - Default = 0, Continuous, Separate + //Default = 0, Continuous, Separate + Continuous = 1, Separate = 2 } [Category("Format")] [DisplayName("Section Pagination")] @@ -271,10 +274,13 @@ namespace VEPROMS.CSLA.Library //If there is no value to get, then get the parent value (a.k.a. default value). if (s == string.Empty) - s = _Xp.ParentValue("Section", "Pagination"); // get the parent value - // If there is no parent value, then use the volian default + s = _Xp.ParentValue("Section", "Pagination"); // get the parent value + //If there is no parent value, then use the volian default if (s == string.Empty) - return SectionPagination.Default;// default to volian default + { + bool rval = MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.BreakOnSections; + return (rval)? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default + } return (SectionPagination)int.Parse(s); } @@ -286,7 +292,11 @@ namespace VEPROMS.CSLA.Library string parval = _Xp.ParentValue("Section", "Pagination"); // get the parent value if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default - parval = ((int)(SectionPagination.Default)).ToString(); + { + bool rval = MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.BreakOnSections; + parval = (rval) ? ((int)(SectionPagination.Separate)).ToString() : ((int)(SectionPagination.Continuous)).ToString(); + //parval = ((int)(SectionPagination.Default)).ToString(); + } if (parval.Equals(((int)value).ToString())) _Xp["Section", "Pagination"] = string.Empty; // reset to parent value @@ -387,7 +397,8 @@ namespace VEPROMS.CSLA.Library [TypeConverter(typeof(EnumDescConverter))] public enum SectionColumnMode : int { - Default = 0, + //[Description("Format Default")] + //Default = 0, [Description("Single Column")] One = 1, [Description("Dual Column")] @@ -409,12 +420,20 @@ namespace VEPROMS.CSLA.Library //If there is no value to get, then get the parent value (a.k.a. default value). if (s == string.Empty) - s = _Xp.ParentValue("Section", "ColumnMode"); // get the parent value + s = _Xp.ParentValue("Section", "ColumnMode"); // get the parent value // If there is no parent value, then use the volian default if (s == string.Empty) - return SectionColumnMode.Default;// default to volian default + { + int rval = (int)MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.PMode; + return (SectionColumnMode)rval;//SectionColumnMode.Two; //SectionColumnMode.Default;// default to volian default + } + else + return (SectionColumnMode)int.Parse(s); - return (SectionColumnMode)int.Parse(s); + //if (s == string.Empty) + // return SectionColumnMode.Default; + + //return (SectionColumnMode)int.Parse(s); } set { @@ -424,7 +443,11 @@ namespace VEPROMS.CSLA.Library string parval = _Xp.ParentValue("Section", "ColumnMode"); // get the parent value if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default - parval = ((int)(SectionColumnMode.Default)).ToString(); + { + int rval = (int)MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.PMode; + parval = ((SectionColumnMode)rval).ToString(); + //parval = ((int)(SectionColumnMode.Default)).ToString(); + } if (parval.Equals(((int)value).ToString())) _Xp["Section", "ColumnMode"] = string.Empty; // reset to parent value @@ -434,6 +457,139 @@ namespace VEPROMS.CSLA.Library OnPropertyChanged("Section_ColumnMode"); } } +//char * far printtypes[] = { +// "Compressed, 8 lines per inch", +// "Elite, 6 lines per inch", +// "Pica, 6 lines per inch", +// "Default font, 4 Lines Per Inch", +// "Default font, 6 Lines Per Inch", +// "Compressed 6 LPI", +// "Default font, 7 Lines Per Inch", +// "Special Landscape, Elite, 6 lines per inch" +//}; + //[TypeConverter(typeof(EnumDescConverter))] + //public enum AttPrintSize : int + //{ + // [Description("Compressed, 8 lines per inch")] + // Cmp8lpi = 0, + // [Description("Elite, 6 lines per inch")] + // Elite6lpi = 1, + // [Description("Pica, 6 lines per inch")] + // Pica6lpi = 2, + // [Description("Default font, 4 Lines Per Inch")] + // Def4lpi = 3, + // [Description("Default font, 6 Lines Per Inch")] + // Def6lpi = 4, + // [Description("Compressed 6 LPI")] + // Cmp6lpi = 5, + // [Description("Default font, 7 Lines Per Inch")] + // Def7lpi = 6, + // [Description("Landscape, Elite, 6 lines per inch")] + // landElite6lpi = 7 + //} + + //[Category("Format")] + //[DisplayName("Attachment PrintSize")] + //[RefreshProperties(RefreshProperties.All)] + //[Description("Attachment Print Size")] + //public AttPrintSize Section_AttachmentPrintSize + //{ + // get + // { + // string lpiSettings = "*pP46f7L"; + // string s = _Xp["Section", "OldType"]; + // int idx = -1; + + // //If there is no value to get, then get the parent value (a.k.a. default value). + // if (s == string.Empty) + // s = _Xp.ParentValue("Section", "OldType"); // get the parent value + // // If there is no parent value, then use the volian default + // if (s == string.Empty) + // return AttPrintSize.Def6lpi;// default to volian default + + // idx = lpiSettings.IndexOf(s[1]); + // if (idx == -1) idx = 4; + // return (AttPrintSize)idx; + // //return (AttPrintSize)int.Parse(s); + // } + // set + // { + // // if value being saved is same as the parent value, then clear the value (save blank). This will + // // reset the data to use the parent value. + + // string lpiSettings = "*pP46f7L"; + // string parval = _Xp.ParentValue("Section", "OldType"); // get the parent value + // StringBuilder sb = new StringBuilder(); + // string curval = parval[1].ToString(); + + // sb.Append(parval[0]); // save first part of OldType + + // if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default + // { + // //parval = ((int)(AttPrintSize.Def6lpi)).ToString(); + // //sb.Append(((int)(AttPrintSize.Def6lpi)).ToString()); + // sb.Append(lpiSettings[(int)(AttPrintSize.Def6lpi)]); + // } + + // if (curval.Equals(((int)value).ToString())) + // _Xp["Section", "OldType"] = string.Empty; // reset to parent value + // else + // { + // //sb.Append(((int)value).ToString()); + // sb.Append(lpiSettings[(int)value]); + // _Xp["Section", "OldType"] = sb.ToString(); // save selected value + // } + + // OnPropertyChanged("Section_AttachmentPrintSize"); + // } + //} + /* + int chkOffType = (rid[0] & 0x007F) - '0'; + if (chkOffType > 0) + ci.AddItem("Section", "CheckoffSelection", chkOffType.ToString()); + + if (stype.Length > 1) + { + int chkOffHeading = (stype[1] & 0x007F) - '0'; + if (chkOffHeading > 0) + ci.AddItem("Section", "CheckoffHeading", chkOffHeading.ToString()); + */ + [Category("Format")] + [DisplayName("Checkoff List Selection")] + [Description("Checkoff List Selection")] + public int Section_CheckoffListSelection + { + get + { + string s = _Xp["Section", "CheckoffSelection"]; + if (s != null && !s.Equals(string.Empty)) + return Convert.ToInt32(s); + return 0; + } + set + { + string s = value.ToString(); + _Xp["Section", "CheckoffSelection"] = s; + } + } + [Category("Format")] + [DisplayName("Checkoff Header Selection")] + [Description("Checkoff Header Selection")] + public int Section_CheckoffHeaderSelection + { + get + { + string s = _Xp["Section", "CheckoffHeading"]; + if (s != null && s.Equals(string.Empty)) + return Convert.ToInt32(s); + return 0; + } + set + { + string s = value.ToString(); + _Xp["Section", "CheckoffHeading"] = s; + } + } #endregion #region SubSectionCategory // from sequence number in 16-bit database. [Category("SubSection")]