diff --git a/PROMS/DataLoader/CurSet.cs b/PROMS/DataLoader/CurSet.cs index 9cef79c4..8d6a1b80 100644 --- a/PROMS/DataLoader/CurSet.cs +++ b/PROMS/DataLoader/CurSet.cs @@ -77,20 +77,20 @@ namespace Utils // the next byte has three settings embedded in it, the type of change // bar (Print_ChangeBar), the change bar location and its text. tmpsbyte= br.ReadSByte(); - cfg.Print_ChangeBar = (FolderConfig.PrintChangeBar)((int)tmpsbyte > 2 ? 3 : (int)tmpsbyte); + cfg.Print_ChangeBar = (PrintChangeBar)((int)tmpsbyte > 2 ? 3 : (int)tmpsbyte); if (tmpsbyte > 2) { - cfg.Print_ChangeBarLoc = (FolderConfig.PrintChangeBarLoc)((tmpsbyte - 3) / NUMCBTEXTYPE); + cfg.Print_ChangeBarLoc = (PrintChangeBarLoc)((tmpsbyte - 3) / NUMCBTEXTYPE); int ts = (tmpsbyte - 3) % NUMCBTEXTYPE; - cfg.Print_ChangeBarText = (FolderConfig.PrintChangeBarText)((tmpsbyte - 3) % NUMCBTEXTYPE); + cfg.Print_ChangeBarText = (PrintChangeBarText)((tmpsbyte - 3) % NUMCBTEXTYPE); } else { - cfg.Print_ChangeBarLoc = FolderConfig.PrintChangeBarLoc.WithText; - cfg.Print_ChangeBarText = FolderConfig.PrintChangeBarText.DateChgID; + cfg.Print_ChangeBarLoc = PrintChangeBarLoc.WithText; + cfg.Print_ChangeBarText = PrintChangeBarText.DateChgID; } cfg.Print_NumCopies=br.ReadSByte(); - cfg.Print_Pagination=(FolderConfig.PrintPagination) br.ReadSByte(); + cfg.Print_Pagination=(PrintPagination) br.ReadSByte(); tmpstring = ReadTheString(br,4); // DefaultPrinter not used cfg.Format_Plant = ReadTheString(br,10); DefaultPlantFmt = cfg.Format_Plant; @@ -100,7 +100,7 @@ namespace Utils tmpsbyte = br.ReadSByte(); // DefaultCIEType not used. for (int i=0;i<8;i++) // DefPenColors[8] not used tmpsbyte = br.ReadSByte(); - cfg.Print_Watermark = (FolderConfig.PrintWatermark)br.ReadSByte(); + cfg.Print_Watermark = (PrintWatermark)br.ReadSByte(); cfg.Print_UserCBMess1 = ReadTheString(br, 10); cfg.Print_UserCBMess2 = ReadTheString(br, 10); tmpsbyte = br.ReadSByte(); // DontPrintStatusTree not used