This commit is contained in:
parent
dfa4855cd2
commit
f87bf4d09a
@ -1559,7 +1559,7 @@ namespace fmtxml
|
|||||||
fmtName = alias;
|
fmtName = alias;
|
||||||
//if (fmtName.ToUpper() != "CPLS" && fmtName.ToUpper() != "BASE") return;
|
//if (fmtName.ToUpper() != "CPLS" && fmtName.ToUpper() != "BASE") return;
|
||||||
//if (fmtName.ToUpper() != "OHLP" && fmtName.ToUpper() != "BASE" && fmtName.ToUpper() != "WCN2") return;
|
//if (fmtName.ToUpper() != "OHLP" && fmtName.ToUpper() != "BASE" && fmtName.ToUpper() != "WCN2") return;
|
||||||
//if (fmtName.ToUpper() != "OHLP" && fmtName.ToUpper() != "BASE") return;
|
//if (fmtName.ToUpper() != "WCN1" && fmtName.ToUpper() != "BASE") return;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
LoadFormatFile(nm + ".fmt", ref SubXtraFlags);
|
LoadFormatFile(nm + ".fmt", ref SubXtraFlags);
|
||||||
@ -3202,18 +3202,18 @@ namespace fmtxml
|
|||||||
if (fmtdata.TransData.TransTypeData[i].TransFormat != null && fmtdata.TransData.TransTypeData[i].TransMenu != null) fmtdata.TransData.TransTypeData[i].TransUI = GetTransUIEnum(fmtdata.TransData.TransTypeData[i].TransFormat, fmtdata.TransData.TransTypeData[i].TransMenu);
|
if (fmtdata.TransData.TransTypeData[i].TransFormat != null && fmtdata.TransData.TransTypeData[i].TransMenu != null) fmtdata.TransData.TransTypeData[i].TransUI = GetTransUIEnum(fmtdata.TransData.TransTypeData[i].TransFormat, fmtdata.TransData.TransTypeData[i].TransMenu);
|
||||||
}
|
}
|
||||||
// if in dosectiontransitions, put the format/menu strings back to original
|
// if in dosectiontransitions, put the format/menu strings back to original
|
||||||
if (XtraFlags.DoSectionTrans == "True")
|
//if (XtraFlags.DoSectionTrans == "True")
|
||||||
{
|
//{
|
||||||
for (int i = 0; i < MAXTRANS; i++)
|
// for (int i = 0; i < MAXTRANS; i++)
|
||||||
{
|
// {
|
||||||
if (i < 6 && fmtdata.TransData.TransTypeData[i].TransMenu != null)
|
// if (i < 6 && fmtdata.TransData.TransTypeData[i].TransMenu != null)
|
||||||
{
|
// {
|
||||||
fmtdata.TransData.TransTypeData[i].TransFormat = DefaultSectionTransFormatStr[i];
|
// fmtdata.TransData.TransTypeData[i].TransFormat = DefaultSectionTransFormatStr[i];
|
||||||
fmtdata.TransData.TransTypeData[i].TransMenu = DefaultSectionTransFormatStr[i];
|
// fmtdata.TransData.TransTypeData[i].TransMenu = DefaultSectionTransFormatStr[i];
|
||||||
|
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
//arcnt = arcnt + MAXTRANS;
|
//arcnt = arcnt + MAXTRANS;
|
||||||
|
|
||||||
// not used OutsideTransFmt & OutsideTransMenu
|
// not used OutsideTransFmt & OutsideTransMenu
|
||||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user