Index: cprs/branches/tmg-cprs/CPRS-Chart/Accessibility_TLB.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/Accessibility_TLB.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/Accessibility_TLB.pas (revision 801) @@ -13,5 +13,5 @@ // PASTLWTR : 1.2 -// File generated on 6/14/2010 7:54:12 AM from Type Library described below. +// File generated on 6/16/2010 3:23:34 PM from Type Library described below. // ************************************************************************ // Index: cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.dof =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.dof (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.dof (revision 801) @@ -101,5 +101,5 @@ UsePackages=0 [Parameters] -RunParams=CCOW=disable s=192.168.3.99 p=9260 +RunParams=CCOW=disable s=s0.sequencemanagers.com p=53110 HostApplication= Launcher= Index: cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.dpr =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.dpr (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.dpr (revision 801) @@ -331,5 +331,6 @@ frmSearchResults in 'TMG_Extra\frmSearchResults.pas' {frmSrchResults}, uLogic in 'TMG_Extra\uLogic.pas', - fImagePickPDF in 'TMG_Extra\fImagePickPDF.pas' {frmImagePickPDF}; + fImagePickPDF in 'TMG_Extra\fImagePickPDF.pas' {frmImagePickPDF}, + fImagePickExisting in 'TMG_Extra\fImagePickExisting.pas' {frmImagePickExisting}; {$R *.TLB} @@ -355,5 +356,4 @@ Application.CreateForm(TdmodShared, dmodShared); Application.CreateForm(TfrmFrame, frmFrame); - Application.CreateForm(TfrmImagePickPDF, frmImagePickPDF); //kt <--- frmImages etc created here Application.CreateForm(TfrmPtLabelPrint, frmPtLabelPrint); Index: cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.drc =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.drc (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.drc (revision 801) @@ -9,422 +9,423 @@ */ -#define JConsts_sJPEGError 64912 -#define JConsts_sJPEGImageFile 64913 -#define IdResourceStrings_RSStackECONNABORTED 64928 -#define IdResourceStrings_RSStackECONNRESET 64929 -#define IdResourceStrings_RSStackENOBUFS 64930 -#define IdResourceStrings_RSStackEISCONN 64931 -#define IdResourceStrings_RSStackENOTCONN 64932 -#define IdResourceStrings_RSStackESHUTDOWN 64933 -#define IdResourceStrings_RSStackETOOMANYREFS 64934 -#define IdResourceStrings_RSStackETIMEDOUT 64935 -#define IdResourceStrings_RSStackECONNREFUSED 64936 -#define IdResourceStrings_RSStackELOOP 64937 -#define IdResourceStrings_RSStackENAMETOOLONG 64938 -#define IdResourceStrings_RSStackEHOSTDOWN 64939 -#define IdResourceStrings_RSStackEHOSTUNREACH 64940 -#define IdResourceStrings_RSStackENOTEMPTY 64941 -#define IdResourceStrings_RSStackHOST_NOT_FOUND 64942 -#define JConsts_sChangeJPGSize 64943 -#define IdResourceStrings_RSStackEALREADY 64944 -#define IdResourceStrings_RSStackENOTSOCK 64945 -#define IdResourceStrings_RSStackEDESTADDRREQ 64946 -#define IdResourceStrings_RSStackEMSGSIZE 64947 -#define IdResourceStrings_RSStackEPROTOTYPE 64948 -#define IdResourceStrings_RSStackENOPROTOOPT 64949 -#define IdResourceStrings_RSStackEPROTONOSUPPORT 64950 -#define IdResourceStrings_RSStackESOCKTNOSUPPORT 64951 -#define IdResourceStrings_RSStackEOPNOTSUPP 64952 -#define IdResourceStrings_RSStackEPFNOSUPPORT 64953 -#define IdResourceStrings_RSStackEAFNOSUPPORT 64954 -#define IdResourceStrings_RSStackEADDRINUSE 64955 -#define IdResourceStrings_RSStackEADDRNOTAVAIL 64956 -#define IdResourceStrings_RSStackENETDOWN 64957 -#define IdResourceStrings_RSStackENETUNREACH 64958 -#define IdResourceStrings_RSStackENETRESET 64959 -#define pnglang_EPNGOutMemoryText 64960 -#define pnglang_EPNGHeaderNotPresentText 64961 -#define IdResourceStrings_RSWinsockInitializationError 64962 -#define IdResourceStrings_RSSetSizeExceeded 64963 -#define IdResourceStrings_RSWS2CallError 64964 -#define IdResourceStrings_RSWS2LoadError 64965 -#define IdResourceStrings_RSInvalidServiceName 64966 -#define IdResourceStrings_RSStackError 64967 -#define IdResourceStrings_RSStackEINTR 64968 -#define IdResourceStrings_RSStackEBADF 64969 -#define IdResourceStrings_RSStackEACCES 64970 -#define IdResourceStrings_RSStackEFAULT 64971 -#define IdResourceStrings_RSStackEINVAL 64972 -#define IdResourceStrings_RSStackEMFILE 64973 -#define IdResourceStrings_RSStackEWOULDBLOCK 64974 -#define IdResourceStrings_RSStackEINPROGRESS 64975 -#define pnglang_EPngInvalidCRCText 64976 -#define pnglang_EPNGInvalidIHDRText 64977 -#define pnglang_EPNGMissingMultipleIDATText 64978 -#define pnglang_EPNGZLIBErrorText 64979 -#define pnglang_EPNGInvalidPaletteText 64980 -#define pnglang_EPNGInvalidFileHeaderText 64981 -#define pnglang_EPNGIHDRNotFirstText 64982 -#define pnglang_EPNGSizeExceedsText 64983 -#define pnglang_EPNGUnknownPalEntryText 64984 -#define pnglang_EPNGUnknownCriticalChunkText 64985 -#define pnglang_EPNGUnknownCompressionText 64986 -#define pnglang_EPNGUnknownInterlaceText 64987 -#define pnglang_EPNGCannotAssignChunkText 64988 -#define pnglang_EPNGUnexpectedEndText 64989 -#define pnglang_EPNGNoImageDataText 64990 -#define pnglang_EPNGCannotChangeSizeText 64991 -#define QConsts_SDuplicateApp 64992 -#define DBConsts_SBcdOverflow 64993 -#define DBConsts_SInvalidBcdValue 64994 -#define DBConsts_SCouldNotParseTimeStamp 64995 -#define DBConsts_SInvalidSqlTimeStamp 64996 -#define VDBConsts_SFirstRecord 64997 -#define VDBConsts_SPriorRecord 64998 -#define VDBConsts_SNextRecord 64999 -#define VDBConsts_SLastRecord 65000 -#define VDBConsts_SInsertRecord 65001 -#define VDBConsts_SDeleteRecord 65002 -#define VDBConsts_SEditRecord 65003 -#define VDBConsts_SPostEdit 65004 -#define VDBConsts_SCancelEdit 65005 -#define VDBConsts_SRefreshRecord 65006 -#define VDBConsts_SRemoteLogin 65007 -#define QConsts_SInvalidImageDimension 65008 -#define QConsts_SInvalidMimeSourceStream 65009 -#define QConsts_SMimeNotSupportedForIcon 65010 -#define QConsts_SOpen 65011 -#define QConsts_SSave 65012 -#define QConsts_SUnknownImageFormat 65013 -#define QConsts_SUnableToWrite 65014 -#define QConsts_SUndo 65015 -#define QConsts_SRedo 65016 -#define QConsts_SLine 65017 -#define QConsts_SCut 65018 -#define QConsts_SCopy 65019 -#define QConsts_SPaste 65020 -#define QConsts_SClear 65021 -#define QConsts_SSelectAll 65022 -#define QConsts_SNoAppInLib 65023 -#define QConsts_SAbortButton 65024 -#define QConsts_SAllButton 65025 -#define QConsts_SCannotDragForm 65026 -#define QConsts_SMsgDlgWarning 65027 -#define QConsts_SMsgDlgError 65028 -#define QConsts_SMsgDlgInformation 65029 -#define QConsts_SMsgDlgConfirm 65030 -#define QConsts_SUnnamed 65031 -#define QConsts_SName 65032 -#define QConsts_SSize 65033 -#define QConsts_SType 65034 -#define QConsts_SDate 65035 -#define QConsts_SAttributes 65036 -#define QConsts_SDuplicateMenus 65037 -#define QConsts_SImageIndexError 65038 -#define QConsts_SInvalidImageDimensions 65039 -#define QConsts_SNoMenuRecursion 65040 -#define QConsts_SMenuNotFound 65041 -#define QConsts_SMenuSetFormError 65042 -#define QConsts_SGroupIndexTooLow 65043 -#define QConsts_SNoMDIForm 65044 -#define QConsts_SNotAnMDIForm 65045 -#define QConsts_SMDIChildNotVisible 65046 -#define QConsts_SControlParentSetToSelf 65047 -#define QConsts_SOKButton 65048 -#define QConsts_SCancelButton 65049 -#define QConsts_SYesButton 65050 -#define QConsts_SNoButton 65051 -#define QConsts_SHelpButton 65052 -#define QConsts_SCloseButton 65053 -#define QConsts_SIgnoreButton 65054 -#define QConsts_SRetryButton 65055 -#define QConsts_SmkcDown 65056 -#define QConsts_SmkcIns 65057 -#define QConsts_SmkcDel 65058 -#define QConsts_SmkcShift 65059 -#define QConsts_SmkcCtrl 65060 -#define QConsts_SmkcAlt 65061 -#define QConsts_SInvalidPixelFormat 65062 -#define QConsts_SNoCanvasHandle 65063 -#define QConsts_SInvalidCanvasState 65064 -#define QConsts_SInvalidImageSize 65065 -#define QConsts_SInvalidColorDepth 65066 -#define QConsts_SCannotFocus 65067 -#define QConsts_SParentRequired 65068 -#define QConsts_SVisibleChanged 65069 -#define QConsts_SMenuIndexError 65070 -#define QConsts_SMenuReinserted 65071 -#define QConsts_SInvalidCreateWidget 65072 -#define QConsts_STooManyMessageBoxButtons 65073 -#define QConsts_SmkcBkSp 65074 -#define QConsts_SmkcTab 65075 -#define QConsts_SmkcBackTab 65076 -#define QConsts_SmkcEsc 65077 -#define QConsts_SmkcReturn 65078 -#define QConsts_SmkcEnter 65079 -#define QConsts_SmkcSpace 65080 -#define QConsts_SmkcPgUp 65081 -#define QConsts_SmkcPgDn 65082 -#define QConsts_SmkcEnd 65083 -#define QConsts_SmkcHome 65084 -#define QConsts_SmkcLeft 65085 -#define QConsts_SmkcUp 65086 -#define QConsts_SmkcRight 65087 -#define TeeConst_TeeMsg_ValuesArrowEndX 65088 -#define TeeConst_TeeMsg_ValuesArrowEndY 65089 -#define TntSystem_SBufferOverflow 65090 -#define TntSystem_SInvalidUTF7 65091 -#define DKLang_SDKLangErrMsg_DuplicatePropValueID 65092 -#define DKLang_SDKLangErrMsg_ErrorLoadingTran 65093 -#define DKLang_SDKLangErrMsg_InvalidConstName 65094 -#define DKLang_SDKLangErrMsg_DuplicateConstName 65095 -#define DKLang_SDKLangErrMsg_ConstantNotFound 65096 -#define DKLang_SDKLangErrMsg_LangManagerCalledAtDT 65097 -#define DKLang_SDKLangErrMsg_StreamVersionTooHigh 65098 -#define OleConst_SCannotActivate 65099 -#define OleConst_SNoWindowHandle 65100 -#define OleConst_SInvalidLicense 65101 -#define OleConst_SNotLicensed 65102 -#define OleConst_sNoRunningObject 65103 -#define TeeConst_TeeMsg_FunctionDivide 65104 -#define TeeConst_TeeMsg_FunctionHigh 65105 -#define TeeConst_TeeMsg_FunctionLow 65106 -#define TeeConst_TeeMsg_FunctionAverage 65107 -#define TeeConst_TeeMsg_DefaultFontName 65108 -#define TeeConst_TeeMsg_CheckPointerSize 65109 -#define TeeConst_TeeMsg_FunctionPeriod 65110 -#define TeeConst_TeeMsg_PieOther 65111 -#define TeeConst_TeeMsg_ValuesX 65112 -#define TeeConst_TeeMsg_ValuesY 65113 -#define TeeConst_TeeMsg_ValuesPie 65114 -#define TeeConst_TeeMsg_ValuesBar 65115 -#define TeeConst_TeeMsg_ValuesAngle 65116 -#define TeeConst_TeeMsg_ValuesGanttStart 65117 -#define TeeConst_TeeMsg_ValuesGanttEnd 65118 -#define TeeConst_TeeMsg_ValuesGanttNextTask 65119 -#define TeeConst_TeeMsg_GalleryArrow 65120 -#define TeeConst_TeeMsg_GalleryGantt 65121 -#define TeeConst_TeeMsg_GanttSample1 65122 -#define TeeConst_TeeMsg_GanttSample2 65123 -#define TeeConst_TeeMsg_GanttSample3 65124 -#define TeeConst_TeeMsg_GanttSample4 65125 -#define TeeConst_TeeMsg_GanttSample5 65126 -#define TeeConst_TeeMsg_GanttSample6 65127 -#define TeeConst_TeeMsg_GanttSample7 65128 -#define TeeConst_TeeMsg_GanttSample8 65129 -#define TeeConst_TeeMsg_GanttSample9 65130 -#define TeeConst_TeeMsg_GanttSample10 65131 -#define TeeConst_TeeMsg_DefaultFontSize 65132 -#define TeeConst_TeeMsg_FunctionAdd 65133 -#define TeeConst_TeeMsg_FunctionSubtract 65134 -#define TeeConst_TeeMsg_FunctionMultiply 65135 -#define TeeConst_TeeMsg_GalleryArea 65136 -#define TeeConst_TeeMsg_GalleryBar 65137 -#define TeeConst_TeeMsg_GalleryHorizBar 65138 -#define TeeConst_TeeMsg_GalleryPie 65139 -#define TeeConst_TeeMsg_GalleryFastLine 65140 -#define TeeConst_TeeMsg_Rotation 65141 -#define TeeConst_TeeMsg_PieSample1 65142 -#define TeeConst_TeeMsg_PieSample2 65143 -#define TeeConst_TeeMsg_PieSample3 65144 -#define TeeConst_TeeMsg_PieSample4 65145 -#define TeeConst_TeeMsg_PieSample5 65146 -#define TeeConst_TeeMsg_PieSample6 65147 -#define TeeConst_TeeMsg_PieSample7 65148 -#define TeeConst_TeeMsg_PieSample8 65149 -#define TeeConst_TeeMsg_GalleryStandard 65150 -#define TeeConst_TeeMsg_GalleryFunctions 65151 -#define TeeConst_TeeMsg_AxisIncrementNeg 65152 -#define TeeConst_TeeMsg_AxisMinMax 65153 -#define TeeConst_TeeMsg_AxisMaxMin 65154 -#define TeeConst_TeeMsg_AxisLogBase 65155 -#define TeeConst_TeeMsg_MaxPointsPerPage 65156 -#define TeeConst_TeeMsg_3dPercent 65157 -#define TeeConst_TeeMsg_CircularSeries 65158 -#define TeeConst_TeeMsg_BarWidthPercent 65159 -#define TeeConst_TeeMsg_BarOffsetPercent 65160 -#define TeeConst_TeeMsg_DefaultPercentOf 65161 -#define TeeConst_TeeMsg_DefPercentFormat 65162 -#define TeeConst_TeeMsg_DefValueFormat 65163 -#define TeeConst_TeeMsg_AxisTitle 65164 -#define TeeConst_TeeMsg_AxisLabels 65165 -#define TeeConst_TeeMsg_GalleryLine 65166 -#define TeeConst_TeeMsg_GalleryPoint 65167 -#define ComConst_STooManyParams 65168 -#define ComConst_SDCOMNotInstalled 65169 -#define ComConst_SDAXError 65170 -#define ComConst_SAutomationWarning 65171 -#define ComConst_SNoCloseActiveServer1 65172 -#define ComConst_SNoCloseActiveServer2 65173 -#define TeeConst_TeeMsg_LegendTopPos 65174 -#define TeeConst_TeeMsg_LegendFirstValue 65175 -#define TeeConst_TeeMsg_LegendColorWidth 65176 -#define TeeConst_TeeMsg_SeriesSetDataSource 65177 -#define TeeConst_TeeMsg_SeriesInvDataSource 65178 -#define TeeConst_TeeMsg_FillSample 65179 -#define TeeConst_TeeMsg_Angle 65180 -#define TeeConst_TeeMsg_AxisLogDateTime 65181 -#define TeeConst_TeeMsg_AxisLogNotPositive 65182 -#define TeeConst_TeeMsg_AxisLabelSep 65183 -#define ComStrs_sDateTimeMax 65184 -#define ComStrs_sDateTimeMin 65185 -#define ComStrs_sNeedAllowNone 65186 -#define ComStrs_sFailSetCalDateTime 65187 -#define ComStrs_sFailSetCalMaxSelRange 65188 -#define ComStrs_sFailSetCalMinMaxRange 65189 -#define ComStrs_sFailsetCalSelRange 65190 -#define WinHelpViewer_hNoKeyword 65191 -#define ComConst_SCreateRegKeyError 65192 -#define ComConst_SOleError 65193 -#define ComConst_SObjectFactoryMissing 65194 -#define ComConst_STypeInfoMissing 65195 -#define ComConst_SBadTypeInfo 65196 -#define ComConst_SDispIntfMissing 65197 -#define ComConst_SNoMethod 65198 -#define ComConst_SVarNotObject 65199 -#define ComStrs_sTabFailClear 65200 -#define ComStrs_sTabFailDelete 65201 -#define ComStrs_sTabFailRetrieve 65202 -#define ComStrs_sTabFailGetObject 65203 -#define ComStrs_sTabFailSet 65204 -#define ComStrs_sTabFailSetObject 65205 -#define ComStrs_sTabMustBeMultiLine 65206 -#define ComStrs_sInvalidIndex 65207 -#define ComStrs_sInsertError 65208 -#define ComStrs_sInvalidOwner 65209 -#define ComStrs_sRichEditInsertError 65210 -#define ComStrs_sRichEditLoadFail 65211 -#define ComStrs_sRichEditSaveFail 65212 -#define ComStrs_sUDAssociated 65213 -#define ComStrs_sPageIndexError 65214 -#define ComStrs_sInvalidComCtl32 65215 -#define ExtCtrls_clNameHighlight 65216 -#define ExtCtrls_clNameHighlightText 65217 -#define ExtCtrls_clNameInactiveBorder 65218 -#define ExtCtrls_clNameInactiveCaption 65219 -#define ExtCtrls_clNameInactiveCaptionText 65220 -#define ExtCtrls_clNameInfoBk 65221 -#define ExtCtrls_clNameInfoText 65222 -#define ExtCtrls_clNameMenu 65223 -#define ExtCtrls_clNameMenuText 65224 -#define ExtCtrls_clNameNone 65225 -#define ExtCtrls_clNameScrollBar 65226 -#define ExtCtrls_clName3DDkShadow 65227 -#define ExtCtrls_clName3DLight 65228 -#define ExtCtrls_clNameWindow 65229 -#define ExtCtrls_clNameWindowFrame 65230 -#define ExtCtrls_clNameWindowText 65231 -#define ExtCtrls_clNameWhite 65232 -#define ExtCtrls_clNameMoneyGreen 65233 -#define ExtCtrls_clNameSkyBlue 65234 -#define ExtCtrls_clNameCream 65235 -#define ExtCtrls_clNameMedGray 65236 -#define ExtCtrls_clNameActiveBorder 65237 -#define ExtCtrls_clNameActiveCaption 65238 -#define ExtCtrls_clNameAppWorkSpace 65239 -#define ExtCtrls_clNameBackground 65240 -#define ExtCtrls_clNameBtnFace 65241 -#define ExtCtrls_clNameBtnHighlight 65242 -#define ExtCtrls_clNameBtnShadow 65243 -#define ExtCtrls_clNameBtnText 65244 -#define ExtCtrls_clNameCaptionText 65245 -#define ExtCtrls_clNameDefault 65246 -#define ExtCtrls_clNameGrayText 65247 -#define HelpIntfs_hNoTopics 65248 -#define ExtCtrls_clNameBlack 65249 -#define ExtCtrls_clNameMaroon 65250 -#define ExtCtrls_clNameGreen 65251 -#define ExtCtrls_clNameOlive 65252 -#define ExtCtrls_clNameNavy 65253 -#define ExtCtrls_clNamePurple 65254 -#define ExtCtrls_clNameTeal 65255 -#define ExtCtrls_clNameGray 65256 -#define ExtCtrls_clNameSilver 65257 -#define ExtCtrls_clNameRed 65258 -#define ExtCtrls_clNameLime 65259 -#define ExtCtrls_clNameYellow 65260 -#define ExtCtrls_clNameBlue 65261 -#define ExtCtrls_clNameFuchsia 65262 -#define ExtCtrls_clNameAqua 65263 -#define Consts_SPictureLabel 65264 -#define Consts_SPictureDesc 65265 -#define Consts_SPreviewLabel 65266 -#define Consts_SCannotOpenAVI 65267 -#define Consts_SDockedCtlNeedsName 65268 -#define Consts_SDockTreeRemoveError 65269 -#define Consts_SDockZoneNotFound 65270 -#define Consts_SDockZoneHasNoCtl 65271 -#define Consts_SMultiSelectRequired 65272 -#define Consts_SSeparator 65273 -#define Consts_SErrorSettingCount 65274 -#define Consts_SListBoxMustBeVirtual 65275 -#define Consts_SNoGetItemEventHandler 65276 -#define HelpIntfs_hNoTableOfContents 65277 -#define HelpIntfs_hNothingFound 65278 -#define HelpIntfs_hNoContext 65279 -#define Consts_SmkcDel 65280 -#define Consts_SmkcShift 65281 -#define Consts_SmkcCtrl 65282 -#define Consts_SmkcAlt 65283 -#define Consts_srNone 65284 -#define Consts_SOutOfRange 65285 -#define Consts_SDefaultFilter 65286 -#define Consts_sAllFilter 65287 -#define Consts_SInsertLineError 65288 -#define Consts_SInvalidClipFmt 65289 -#define Consts_SIconToClipboard 65290 -#define Consts_SCannotOpenClipboard 65291 -#define Consts_SInvalidMemoSize 65292 -#define Consts_SInvalidPrinterOp 65293 -#define Consts_SNoDefaultPrinter 65294 -#define Consts_SDuplicateMenus 65295 -#define Consts_SMsgDlgNoToAll 65296 -#define Consts_SMsgDlgYesToAll 65297 -#define Consts_SmkcBkSp 65298 -#define Consts_SmkcTab 65299 -#define Consts_SmkcEsc 65300 -#define Consts_SmkcEnter 65301 -#define Consts_SmkcSpace 65302 -#define Consts_SmkcPgUp 65303 -#define Consts_SmkcPgDn 65304 -#define Consts_SmkcEnd 65305 -#define Consts_SmkcHome 65306 -#define Consts_SmkcLeft 65307 -#define Consts_SmkcUp 65308 -#define Consts_SmkcRight 65309 -#define Consts_SmkcDown 65310 -#define Consts_SmkcIns 65311 -#define Consts_SVBitmaps 65312 -#define Consts_SMaskErr 65313 -#define Consts_SMaskEditErr 65314 -#define Consts_SMsgDlgWarning 65315 -#define Consts_SMsgDlgError 65316 -#define Consts_SMsgDlgInformation 65317 -#define Consts_SMsgDlgConfirm 65318 -#define Consts_SMsgDlgYes 65319 -#define Consts_SMsgDlgNo 65320 -#define Consts_SMsgDlgOK 65321 -#define Consts_SMsgDlgCancel 65322 -#define Consts_SMsgDlgHelp 65323 -#define Consts_SMsgDlgAbort 65324 -#define Consts_SMsgDlgRetry 65325 -#define Consts_SMsgDlgIgnore 65326 -#define Consts_SMsgDlgAll 65327 +#define JConsts_sChangeJPGSize 64912 +#define JConsts_sJPEGError 64913 +#define JConsts_sJPEGImageFile 64914 +#define IdResourceStrings_RSStackENETRESET 64928 +#define IdResourceStrings_RSStackECONNABORTED 64929 +#define IdResourceStrings_RSStackECONNRESET 64930 +#define IdResourceStrings_RSStackENOBUFS 64931 +#define IdResourceStrings_RSStackEISCONN 64932 +#define IdResourceStrings_RSStackENOTCONN 64933 +#define IdResourceStrings_RSStackESHUTDOWN 64934 +#define IdResourceStrings_RSStackETOOMANYREFS 64935 +#define IdResourceStrings_RSStackETIMEDOUT 64936 +#define IdResourceStrings_RSStackECONNREFUSED 64937 +#define IdResourceStrings_RSStackELOOP 64938 +#define IdResourceStrings_RSStackENAMETOOLONG 64939 +#define IdResourceStrings_RSStackEHOSTDOWN 64940 +#define IdResourceStrings_RSStackEHOSTUNREACH 64941 +#define IdResourceStrings_RSStackENOTEMPTY 64942 +#define IdResourceStrings_RSStackHOST_NOT_FOUND 64943 +#define IdResourceStrings_RSStackEINPROGRESS 64944 +#define IdResourceStrings_RSStackEALREADY 64945 +#define IdResourceStrings_RSStackENOTSOCK 64946 +#define IdResourceStrings_RSStackEDESTADDRREQ 64947 +#define IdResourceStrings_RSStackEMSGSIZE 64948 +#define IdResourceStrings_RSStackEPROTOTYPE 64949 +#define IdResourceStrings_RSStackENOPROTOOPT 64950 +#define IdResourceStrings_RSStackEPROTONOSUPPORT 64951 +#define IdResourceStrings_RSStackESOCKTNOSUPPORT 64952 +#define IdResourceStrings_RSStackEOPNOTSUPP 64953 +#define IdResourceStrings_RSStackEPFNOSUPPORT 64954 +#define IdResourceStrings_RSStackEAFNOSUPPORT 64955 +#define IdResourceStrings_RSStackEADDRINUSE 64956 +#define IdResourceStrings_RSStackEADDRNOTAVAIL 64957 +#define IdResourceStrings_RSStackENETDOWN 64958 +#define IdResourceStrings_RSStackENETUNREACH 64959 +#define pnglang_EPNGCannotChangeSizeText 64960 +#define pnglang_EPNGOutMemoryText 64961 +#define pnglang_EPNGHeaderNotPresentText 64962 +#define IdResourceStrings_RSWinsockInitializationError 64963 +#define IdResourceStrings_RSSetSizeExceeded 64964 +#define IdResourceStrings_RSWS2CallError 64965 +#define IdResourceStrings_RSWS2LoadError 64966 +#define IdResourceStrings_RSInvalidServiceName 64967 +#define IdResourceStrings_RSStackError 64968 +#define IdResourceStrings_RSStackEINTR 64969 +#define IdResourceStrings_RSStackEBADF 64970 +#define IdResourceStrings_RSStackEACCES 64971 +#define IdResourceStrings_RSStackEFAULT 64972 +#define IdResourceStrings_RSStackEINVAL 64973 +#define IdResourceStrings_RSStackEMFILE 64974 +#define IdResourceStrings_RSStackEWOULDBLOCK 64975 +#define VDBConsts_SRemoteLogin 64976 +#define pnglang_EPngInvalidCRCText 64977 +#define pnglang_EPNGInvalidIHDRText 64978 +#define pnglang_EPNGMissingMultipleIDATText 64979 +#define pnglang_EPNGZLIBErrorText 64980 +#define pnglang_EPNGInvalidPaletteText 64981 +#define pnglang_EPNGInvalidFileHeaderText 64982 +#define pnglang_EPNGIHDRNotFirstText 64983 +#define pnglang_EPNGSizeExceedsText 64984 +#define pnglang_EPNGUnknownPalEntryText 64985 +#define pnglang_EPNGUnknownCriticalChunkText 64986 +#define pnglang_EPNGUnknownCompressionText 64987 +#define pnglang_EPNGUnknownInterlaceText 64988 +#define pnglang_EPNGCannotAssignChunkText 64989 +#define pnglang_EPNGUnexpectedEndText 64990 +#define pnglang_EPNGNoImageDataText 64991 +#define QConsts_SNoAppInLib 64992 +#define QConsts_SDuplicateApp 64993 +#define DBConsts_SBcdOverflow 64994 +#define DBConsts_SInvalidBcdValue 64995 +#define DBConsts_SCouldNotParseTimeStamp 64996 +#define DBConsts_SInvalidSqlTimeStamp 64997 +#define VDBConsts_SFirstRecord 64998 +#define VDBConsts_SPriorRecord 64999 +#define VDBConsts_SNextRecord 65000 +#define VDBConsts_SLastRecord 65001 +#define VDBConsts_SInsertRecord 65002 +#define VDBConsts_SDeleteRecord 65003 +#define VDBConsts_SEditRecord 65004 +#define VDBConsts_SPostEdit 65005 +#define VDBConsts_SCancelEdit 65006 +#define VDBConsts_SRefreshRecord 65007 +#define QConsts_SInvalidImageDimensions 65008 +#define QConsts_SInvalidImageDimension 65009 +#define QConsts_SInvalidMimeSourceStream 65010 +#define QConsts_SMimeNotSupportedForIcon 65011 +#define QConsts_SOpen 65012 +#define QConsts_SSave 65013 +#define QConsts_SUnknownImageFormat 65014 +#define QConsts_SUnableToWrite 65015 +#define QConsts_SUndo 65016 +#define QConsts_SRedo 65017 +#define QConsts_SLine 65018 +#define QConsts_SCut 65019 +#define QConsts_SCopy 65020 +#define QConsts_SPaste 65021 +#define QConsts_SClear 65022 +#define QConsts_SSelectAll 65023 +#define QConsts_SRetryButton 65024 +#define QConsts_SAbortButton 65025 +#define QConsts_SAllButton 65026 +#define QConsts_SCannotDragForm 65027 +#define QConsts_SMsgDlgWarning 65028 +#define QConsts_SMsgDlgError 65029 +#define QConsts_SMsgDlgInformation 65030 +#define QConsts_SMsgDlgConfirm 65031 +#define QConsts_SUnnamed 65032 +#define QConsts_SName 65033 +#define QConsts_SSize 65034 +#define QConsts_SType 65035 +#define QConsts_SDate 65036 +#define QConsts_SAttributes 65037 +#define QConsts_SDuplicateMenus 65038 +#define QConsts_SImageIndexError 65039 +#define QConsts_SMenuReinserted 65040 +#define QConsts_SNoMenuRecursion 65041 +#define QConsts_SMenuNotFound 65042 +#define QConsts_SMenuSetFormError 65043 +#define QConsts_SGroupIndexTooLow 65044 +#define QConsts_SNoMDIForm 65045 +#define QConsts_SNotAnMDIForm 65046 +#define QConsts_SMDIChildNotVisible 65047 +#define QConsts_SControlParentSetToSelf 65048 +#define QConsts_SOKButton 65049 +#define QConsts_SCancelButton 65050 +#define QConsts_SYesButton 65051 +#define QConsts_SNoButton 65052 +#define QConsts_SHelpButton 65053 +#define QConsts_SCloseButton 65054 +#define QConsts_SIgnoreButton 65055 +#define QConsts_SmkcRight 65056 +#define QConsts_SmkcDown 65057 +#define QConsts_SmkcIns 65058 +#define QConsts_SmkcDel 65059 +#define QConsts_SmkcShift 65060 +#define QConsts_SmkcCtrl 65061 +#define QConsts_SmkcAlt 65062 +#define QConsts_SInvalidPixelFormat 65063 +#define QConsts_SNoCanvasHandle 65064 +#define QConsts_SInvalidCanvasState 65065 +#define QConsts_SInvalidImageSize 65066 +#define QConsts_SInvalidColorDepth 65067 +#define QConsts_SCannotFocus 65068 +#define QConsts_SParentRequired 65069 +#define QConsts_SVisibleChanged 65070 +#define QConsts_SMenuIndexError 65071 +#define OleConst_sNoRunningObject 65072 +#define QConsts_SInvalidCreateWidget 65073 +#define QConsts_STooManyMessageBoxButtons 65074 +#define QConsts_SmkcBkSp 65075 +#define QConsts_SmkcTab 65076 +#define QConsts_SmkcBackTab 65077 +#define QConsts_SmkcEsc 65078 +#define QConsts_SmkcReturn 65079 +#define QConsts_SmkcEnter 65080 +#define QConsts_SmkcSpace 65081 +#define QConsts_SmkcPgUp 65082 +#define QConsts_SmkcPgDn 65083 +#define QConsts_SmkcEnd 65084 +#define QConsts_SmkcHome 65085 +#define QConsts_SmkcLeft 65086 +#define QConsts_SmkcUp 65087 +#define TeeConst_TeeMsg_ValuesGanttNextTask 65088 +#define TeeConst_TeeMsg_ValuesArrowEndX 65089 +#define TeeConst_TeeMsg_ValuesArrowEndY 65090 +#define TntSystem_SBufferOverflow 65091 +#define TntSystem_SInvalidUTF7 65092 +#define DKLang_SDKLangErrMsg_DuplicatePropValueID 65093 +#define DKLang_SDKLangErrMsg_ErrorLoadingTran 65094 +#define DKLang_SDKLangErrMsg_InvalidConstName 65095 +#define DKLang_SDKLangErrMsg_DuplicateConstName 65096 +#define DKLang_SDKLangErrMsg_ConstantNotFound 65097 +#define DKLang_SDKLangErrMsg_LangManagerCalledAtDT 65098 +#define DKLang_SDKLangErrMsg_StreamVersionTooHigh 65099 +#define OleConst_SCannotActivate 65100 +#define OleConst_SNoWindowHandle 65101 +#define OleConst_SInvalidLicense 65102 +#define OleConst_SNotLicensed 65103 +#define TeeConst_TeeMsg_FunctionMultiply 65104 +#define TeeConst_TeeMsg_FunctionDivide 65105 +#define TeeConst_TeeMsg_FunctionHigh 65106 +#define TeeConst_TeeMsg_FunctionLow 65107 +#define TeeConst_TeeMsg_FunctionAverage 65108 +#define TeeConst_TeeMsg_DefaultFontName 65109 +#define TeeConst_TeeMsg_CheckPointerSize 65110 +#define TeeConst_TeeMsg_FunctionPeriod 65111 +#define TeeConst_TeeMsg_PieOther 65112 +#define TeeConst_TeeMsg_ValuesX 65113 +#define TeeConst_TeeMsg_ValuesY 65114 +#define TeeConst_TeeMsg_ValuesPie 65115 +#define TeeConst_TeeMsg_ValuesBar 65116 +#define TeeConst_TeeMsg_ValuesAngle 65117 +#define TeeConst_TeeMsg_ValuesGanttStart 65118 +#define TeeConst_TeeMsg_ValuesGanttEnd 65119 +#define TeeConst_TeeMsg_GalleryFunctions 65120 +#define TeeConst_TeeMsg_GalleryArrow 65121 +#define TeeConst_TeeMsg_GalleryGantt 65122 +#define TeeConst_TeeMsg_GanttSample1 65123 +#define TeeConst_TeeMsg_GanttSample2 65124 +#define TeeConst_TeeMsg_GanttSample3 65125 +#define TeeConst_TeeMsg_GanttSample4 65126 +#define TeeConst_TeeMsg_GanttSample5 65127 +#define TeeConst_TeeMsg_GanttSample6 65128 +#define TeeConst_TeeMsg_GanttSample7 65129 +#define TeeConst_TeeMsg_GanttSample8 65130 +#define TeeConst_TeeMsg_GanttSample9 65131 +#define TeeConst_TeeMsg_GanttSample10 65132 +#define TeeConst_TeeMsg_DefaultFontSize 65133 +#define TeeConst_TeeMsg_FunctionAdd 65134 +#define TeeConst_TeeMsg_FunctionSubtract 65135 +#define TeeConst_TeeMsg_GalleryPoint 65136 +#define TeeConst_TeeMsg_GalleryArea 65137 +#define TeeConst_TeeMsg_GalleryBar 65138 +#define TeeConst_TeeMsg_GalleryHorizBar 65139 +#define TeeConst_TeeMsg_GalleryPie 65140 +#define TeeConst_TeeMsg_GalleryFastLine 65141 +#define TeeConst_TeeMsg_Rotation 65142 +#define TeeConst_TeeMsg_PieSample1 65143 +#define TeeConst_TeeMsg_PieSample2 65144 +#define TeeConst_TeeMsg_PieSample3 65145 +#define TeeConst_TeeMsg_PieSample4 65146 +#define TeeConst_TeeMsg_PieSample5 65147 +#define TeeConst_TeeMsg_PieSample6 65148 +#define TeeConst_TeeMsg_PieSample7 65149 +#define TeeConst_TeeMsg_PieSample8 65150 +#define TeeConst_TeeMsg_GalleryStandard 65151 +#define TeeConst_TeeMsg_AxisLabelSep 65152 +#define TeeConst_TeeMsg_AxisIncrementNeg 65153 +#define TeeConst_TeeMsg_AxisMinMax 65154 +#define TeeConst_TeeMsg_AxisMaxMin 65155 +#define TeeConst_TeeMsg_AxisLogBase 65156 +#define TeeConst_TeeMsg_MaxPointsPerPage 65157 +#define TeeConst_TeeMsg_3dPercent 65158 +#define TeeConst_TeeMsg_CircularSeries 65159 +#define TeeConst_TeeMsg_BarWidthPercent 65160 +#define TeeConst_TeeMsg_BarOffsetPercent 65161 +#define TeeConst_TeeMsg_DefaultPercentOf 65162 +#define TeeConst_TeeMsg_DefPercentFormat 65163 +#define TeeConst_TeeMsg_DefValueFormat 65164 +#define TeeConst_TeeMsg_AxisTitle 65165 +#define TeeConst_TeeMsg_AxisLabels 65166 +#define TeeConst_TeeMsg_GalleryLine 65167 +#define ComConst_SVarNotObject 65168 +#define ComConst_STooManyParams 65169 +#define ComConst_SDCOMNotInstalled 65170 +#define ComConst_SDAXError 65171 +#define ComConst_SAutomationWarning 65172 +#define ComConst_SNoCloseActiveServer1 65173 +#define ComConst_SNoCloseActiveServer2 65174 +#define TeeConst_TeeMsg_LegendTopPos 65175 +#define TeeConst_TeeMsg_LegendFirstValue 65176 +#define TeeConst_TeeMsg_LegendColorWidth 65177 +#define TeeConst_TeeMsg_SeriesSetDataSource 65178 +#define TeeConst_TeeMsg_SeriesInvDataSource 65179 +#define TeeConst_TeeMsg_FillSample 65180 +#define TeeConst_TeeMsg_Angle 65181 +#define TeeConst_TeeMsg_AxisLogDateTime 65182 +#define TeeConst_TeeMsg_AxisLogNotPositive 65183 +#define ComStrs_sInvalidComCtl32 65184 +#define ComStrs_sDateTimeMax 65185 +#define ComStrs_sDateTimeMin 65186 +#define ComStrs_sNeedAllowNone 65187 +#define ComStrs_sFailSetCalDateTime 65188 +#define ComStrs_sFailSetCalMaxSelRange 65189 +#define ComStrs_sFailSetCalMinMaxRange 65190 +#define ComStrs_sFailsetCalSelRange 65191 +#define WinHelpViewer_hNoKeyword 65192 +#define ComConst_SCreateRegKeyError 65193 +#define ComConst_SOleError 65194 +#define ComConst_SObjectFactoryMissing 65195 +#define ComConst_STypeInfoMissing 65196 +#define ComConst_SBadTypeInfo 65197 +#define ComConst_SDispIntfMissing 65198 +#define ComConst_SNoMethod 65199 +#define ExtCtrls_clNameWindowText 65200 +#define ComStrs_sTabFailClear 65201 +#define ComStrs_sTabFailDelete 65202 +#define ComStrs_sTabFailRetrieve 65203 +#define ComStrs_sTabFailGetObject 65204 +#define ComStrs_sTabFailSet 65205 +#define ComStrs_sTabFailSetObject 65206 +#define ComStrs_sTabMustBeMultiLine 65207 +#define ComStrs_sInvalidIndex 65208 +#define ComStrs_sInsertError 65209 +#define ComStrs_sInvalidOwner 65210 +#define ComStrs_sRichEditInsertError 65211 +#define ComStrs_sRichEditLoadFail 65212 +#define ComStrs_sRichEditSaveFail 65213 +#define ComStrs_sUDAssociated 65214 +#define ComStrs_sPageIndexError 65215 +#define ExtCtrls_clNameGrayText 65216 +#define ExtCtrls_clNameHighlight 65217 +#define ExtCtrls_clNameHighlightText 65218 +#define ExtCtrls_clNameInactiveBorder 65219 +#define ExtCtrls_clNameInactiveCaption 65220 +#define ExtCtrls_clNameInactiveCaptionText 65221 +#define ExtCtrls_clNameInfoBk 65222 +#define ExtCtrls_clNameInfoText 65223 +#define ExtCtrls_clNameMenu 65224 +#define ExtCtrls_clNameMenuText 65225 +#define ExtCtrls_clNameNone 65226 +#define ExtCtrls_clNameScrollBar 65227 +#define ExtCtrls_clName3DDkShadow 65228 +#define ExtCtrls_clName3DLight 65229 +#define ExtCtrls_clNameWindow 65230 +#define ExtCtrls_clNameWindowFrame 65231 +#define ExtCtrls_clNameAqua 65232 +#define ExtCtrls_clNameWhite 65233 +#define ExtCtrls_clNameMoneyGreen 65234 +#define ExtCtrls_clNameSkyBlue 65235 +#define ExtCtrls_clNameCream 65236 +#define ExtCtrls_clNameMedGray 65237 +#define ExtCtrls_clNameActiveBorder 65238 +#define ExtCtrls_clNameActiveCaption 65239 +#define ExtCtrls_clNameAppWorkSpace 65240 +#define ExtCtrls_clNameBackground 65241 +#define ExtCtrls_clNameBtnFace 65242 +#define ExtCtrls_clNameBtnHighlight 65243 +#define ExtCtrls_clNameBtnShadow 65244 +#define ExtCtrls_clNameBtnText 65245 +#define ExtCtrls_clNameCaptionText 65246 +#define ExtCtrls_clNameDefault 65247 +#define HelpIntfs_hNoContext 65248 +#define HelpIntfs_hNoTopics 65249 +#define ExtCtrls_clNameBlack 65250 +#define ExtCtrls_clNameMaroon 65251 +#define ExtCtrls_clNameGreen 65252 +#define ExtCtrls_clNameOlive 65253 +#define ExtCtrls_clNameNavy 65254 +#define ExtCtrls_clNamePurple 65255 +#define ExtCtrls_clNameTeal 65256 +#define ExtCtrls_clNameGray 65257 +#define ExtCtrls_clNameSilver 65258 +#define ExtCtrls_clNameRed 65259 +#define ExtCtrls_clNameLime 65260 +#define ExtCtrls_clNameYellow 65261 +#define ExtCtrls_clNameBlue 65262 +#define ExtCtrls_clNameFuchsia 65263 +#define Consts_SDuplicateMenus 65264 +#define Consts_SPictureLabel 65265 +#define Consts_SPictureDesc 65266 +#define Consts_SPreviewLabel 65267 +#define Consts_SCannotOpenAVI 65268 +#define Consts_SDockedCtlNeedsName 65269 +#define Consts_SDockTreeRemoveError 65270 +#define Consts_SDockZoneNotFound 65271 +#define Consts_SDockZoneHasNoCtl 65272 +#define Consts_SMultiSelectRequired 65273 +#define Consts_SSeparator 65274 +#define Consts_SErrorSettingCount 65275 +#define Consts_SListBoxMustBeVirtual 65276 +#define Consts_SNoGetItemEventHandler 65277 +#define HelpIntfs_hNoTableOfContents 65278 +#define HelpIntfs_hNothingFound 65279 +#define Consts_SmkcIns 65280 +#define Consts_SmkcDel 65281 +#define Consts_SmkcShift 65282 +#define Consts_SmkcCtrl 65283 +#define Consts_SmkcAlt 65284 +#define Consts_srNone 65285 +#define Consts_SOutOfRange 65286 +#define Consts_SDefaultFilter 65287 +#define Consts_sAllFilter 65288 +#define Consts_SInsertLineError 65289 +#define Consts_SInvalidClipFmt 65290 +#define Consts_SIconToClipboard 65291 +#define Consts_SCannotOpenClipboard 65292 +#define Consts_SInvalidMemoSize 65293 +#define Consts_SInvalidPrinterOp 65294 +#define Consts_SNoDefaultPrinter 65295 +#define Consts_SMsgDlgAll 65296 +#define Consts_SMsgDlgNoToAll 65297 +#define Consts_SMsgDlgYesToAll 65298 +#define Consts_SmkcBkSp 65299 +#define Consts_SmkcTab 65300 +#define Consts_SmkcEsc 65301 +#define Consts_SmkcEnter 65302 +#define Consts_SmkcSpace 65303 +#define Consts_SmkcPgUp 65304 +#define Consts_SmkcPgDn 65305 +#define Consts_SmkcEnd 65306 +#define Consts_SmkcHome 65307 +#define Consts_SmkcLeft 65308 +#define Consts_SmkcUp 65309 +#define Consts_SmkcRight 65310 +#define Consts_SmkcDown 65311 +#define Consts_SVIcons 65312 +#define Consts_SVBitmaps 65313 +#define Consts_SMaskErr 65314 +#define Consts_SMaskEditErr 65315 +#define Consts_SMsgDlgWarning 65316 +#define Consts_SMsgDlgError 65317 +#define Consts_SMsgDlgInformation 65318 +#define Consts_SMsgDlgConfirm 65319 +#define Consts_SMsgDlgYes 65320 +#define Consts_SMsgDlgNo 65321 +#define Consts_SMsgDlgOK 65322 +#define Consts_SMsgDlgCancel 65323 +#define Consts_SMsgDlgHelp 65324 +#define Consts_SMsgDlgAbort 65325 +#define Consts_SMsgDlgRetry 65326 +#define Consts_SMsgDlgIgnore 65327 #define Consts_SNoMDIForm 65328 -#define Consts_SControlParentSetToSelf 65329 -#define Consts_SOKButton 65330 -#define Consts_SCancelButton 65331 -#define Consts_SYesButton 65332 -#define Consts_SNoButton 65333 -#define Consts_SHelpButton 65334 -#define Consts_SCloseButton 65335 -#define Consts_SIgnoreButton 65336 -#define Consts_SRetryButton 65337 -#define Consts_SAbortButton 65338 -#define Consts_SAllButton 65339 -#define Consts_SCannotDragForm 65340 -#define Consts_SVMetafiles 65341 -#define Consts_SVEnhMetafiles 65342 -#define Consts_SVIcons 65343 +#define Consts_SImageCanvasNeedsBitmap 65329 +#define Consts_SControlParentSetToSelf 65330 +#define Consts_SOKButton 65331 +#define Consts_SCancelButton 65332 +#define Consts_SYesButton 65333 +#define Consts_SNoButton 65334 +#define Consts_SHelpButton 65335 +#define Consts_SCloseButton 65336 +#define Consts_SIgnoreButton 65337 +#define Consts_SRetryButton 65338 +#define Consts_SAbortButton 65339 +#define Consts_SAllButton 65340 +#define Consts_SCannotDragForm 65341 +#define Consts_SVMetafiles 65342 +#define Consts_SVEnhMetafiles 65343 #define Consts_SParentGivenNotAParent 65344 #define Consts_SMDIChildNotVisible 65345 @@ -621,6 +622,8 @@ STRINGTABLE BEGIN + JConsts_sChangeJPGSize, "Cannot change the size of a JPEG image" JConsts_sJPEGError, "JPEG error #%d" JConsts_sJPEGImageFile, "JPEG Image File" + IdResourceStrings_RSStackENETRESET, "Net dropped connection or reset." IdResourceStrings_RSStackECONNABORTED, "Software caused connection abort." IdResourceStrings_RSStackECONNRESET, "Connection reset by peer." @@ -638,5 +641,5 @@ IdResourceStrings_RSStackENOTEMPTY, "Directory not empty" IdResourceStrings_RSStackHOST_NOT_FOUND, "Host not found." - JConsts_sChangeJPGSize, "Cannot change the size of a JPEG image" + IdResourceStrings_RSStackEINPROGRESS, "Operation now in progress." IdResourceStrings_RSStackEALREADY, "Operation already in progress." IdResourceStrings_RSStackENOTSOCK, "Socket operation on non-socket." @@ -654,5 +657,5 @@ IdResourceStrings_RSStackENETDOWN, "Network is down." IdResourceStrings_RSStackENETUNREACH, "Network is unreachable." - IdResourceStrings_RSStackENETRESET, "Net dropped connection or reset." + pnglang_EPNGCannotChangeSizeText, "The \"Portable Network Graphics\" image can not be resize by changing width and height properties. Try assigning the image from a bitmap." pnglang_EPNGOutMemoryText, "Some operation could not be performed because the system is out of resources. Close some windows and try again." pnglang_EPNGHeaderNotPresentText, "This operation is not valid because the current image contains no valid header." @@ -670,5 +673,5 @@ IdResourceStrings_RSStackEMFILE, "Too many open files." IdResourceStrings_RSStackEWOULDBLOCK, "Operation would block. " - IdResourceStrings_RSStackEINPROGRESS, "Operation now in progress." + VDBConsts_SRemoteLogin, "Remote Login" pnglang_EPngInvalidCRCText, "This \"Portable Network Graphics\" image is not valid because it contains invalid pieces of data (crc error)" pnglang_EPNGInvalidIHDRText, "The \"Portable Network Graphics\" image could not be loaded because one of its main piece of data (ihdr) might be corrupted" @@ -686,5 +689,5 @@ pnglang_EPNGUnexpectedEndText, "This \"Portable Network Graphics\" image is invalid because the decoder found an unexpected end of the file." pnglang_EPNGNoImageDataText, "This \"Portable Network Graphics\" image contains no data." - pnglang_EPNGCannotChangeSizeText, "The \"Portable Network Graphics\" image can not be resize by changing width and height properties. Try assigning the image from a bitmap." + QConsts_SNoAppInLib, "Fatal error: Cannot create application object in a shared object or library." QConsts_SDuplicateApp, "Fatal error: Cannot create more than one TApplication instance" DBConsts_SBcdOverflow, "BCD overflow" @@ -702,5 +705,5 @@ VDBConsts_SCancelEdit, "Cancel edit" VDBConsts_SRefreshRecord, "Refresh data" - VDBConsts_SRemoteLogin, "Remote Login" + QConsts_SInvalidImageDimensions, "Image width and heigth must match" QConsts_SInvalidImageDimension, "Invalid image dimension" QConsts_SInvalidMimeSourceStream, "MimeSource format must have an associated data stream" @@ -718,5 +721,5 @@ QConsts_SClear, "Clear" QConsts_SSelectAll, "Select All" - QConsts_SNoAppInLib, "Fatal error: Cannot create application object in a shared object or library." + QConsts_SRetryButton, "&Retry" QConsts_SAbortButton, "Abort" QConsts_SAllButton, "&All" @@ -734,5 +737,5 @@ QConsts_SDuplicateMenus, "Menu '%s' is already being used by another form" QConsts_SImageIndexError, "Invalid ImageList Index" - QConsts_SInvalidImageDimensions, "Image width and heigth must match" + QConsts_SMenuReinserted, "Menu inserted twice" QConsts_SNoMenuRecursion, "Menu insertion recursion not allowed" QConsts_SMenuNotFound, "Sub-menu is not in menu" @@ -750,5 +753,5 @@ QConsts_SCloseButton, "&Close" QConsts_SIgnoreButton, "&Ignore" - QConsts_SRetryButton, "&Retry" + QConsts_SmkcRight, "Right" QConsts_SmkcDown, "Down" QConsts_SmkcIns, "Ins" @@ -766,5 +769,5 @@ QConsts_SVisibleChanged, "Cannot change Visible in OnShow or OnHide" QConsts_SMenuIndexError, "Menu index out of range" - QConsts_SMenuReinserted, "Menu inserted twice" + OleConst_sNoRunningObject, "Unable to retrieve a pointer to a running object registered with OLE for %s/%s" QConsts_SInvalidCreateWidget, "Class %s could not create QT widget" QConsts_STooManyMessageBoxButtons, "Too many buttons specified for message box" @@ -782,5 +785,5 @@ QConsts_SmkcLeft, "Left" QConsts_SmkcUp, "Up" - QConsts_SmkcRight, "Right" + TeeConst_TeeMsg_ValuesGanttNextTask, "NextTask" TeeConst_TeeMsg_ValuesArrowEndX, "EndX" TeeConst_TeeMsg_ValuesArrowEndY, "EndY" @@ -798,5 +801,5 @@ OleConst_SInvalidLicense, "License information for %s is invalid" OleConst_SNotLicensed, "License information for %s not found. You cannot use this control in design mode" - OleConst_sNoRunningObject, "Unable to retrieve a pointer to a running object registered with OLE for %s/%s" + TeeConst_TeeMsg_FunctionMultiply, "Multiply" TeeConst_TeeMsg_FunctionDivide, "Divide" TeeConst_TeeMsg_FunctionHigh, "High" @@ -814,5 +817,5 @@ TeeConst_TeeMsg_ValuesGanttStart, "Start" TeeConst_TeeMsg_ValuesGanttEnd, "End" - TeeConst_TeeMsg_ValuesGanttNextTask, "NextTask" + TeeConst_TeeMsg_GalleryFunctions, "Functions" TeeConst_TeeMsg_GalleryArrow, "Arrow" TeeConst_TeeMsg_GalleryGantt, "Gantt" @@ -830,5 +833,5 @@ TeeConst_TeeMsg_FunctionAdd, "Add" TeeConst_TeeMsg_FunctionSubtract, "Subtract" - TeeConst_TeeMsg_FunctionMultiply, "Multiply" + TeeConst_TeeMsg_GalleryPoint, "Point" TeeConst_TeeMsg_GalleryArea, "Area" TeeConst_TeeMsg_GalleryBar, "Bar" @@ -846,5 +849,5 @@ TeeConst_TeeMsg_PieSample8, "Chairs" TeeConst_TeeMsg_GalleryStandard, "Standard" - TeeConst_TeeMsg_GalleryFunctions, "Functions" + TeeConst_TeeMsg_AxisLabelSep, "Labels Separation % must be greater than 0" TeeConst_TeeMsg_AxisIncrementNeg, "Axis increment must be >= 0" TeeConst_TeeMsg_AxisMinMax, "Axis Minimum Value must be <= Maximum" @@ -862,5 +865,5 @@ TeeConst_TeeMsg_AxisLabels, "Axis Labels" TeeConst_TeeMsg_GalleryLine, "Line" - TeeConst_TeeMsg_GalleryPoint, "Point" + ComConst_SVarNotObject, "Variant does not reference an automation object" ComConst_STooManyParams, "Dispatch methods do not support more than 64 parameters" ComConst_SDCOMNotInstalled, "DCOM not installed" @@ -878,5 +881,5 @@ TeeConst_TeeMsg_AxisLogDateTime, "DateTime Axis cannot be Logarithmic" TeeConst_TeeMsg_AxisLogNotPositive, "Logarithmic Axis Min and Max values should be >= 0" - TeeConst_TeeMsg_AxisLabelSep, "Labels Separation % must be greater than 0" + ComStrs_sInvalidComCtl32, "This control requires version 4.70 or greater of COMCTL32.DLL" ComStrs_sDateTimeMax, "Date exceeds maximum of %s" ComStrs_sDateTimeMin, "Date is less than minimum of %s" @@ -894,5 +897,5 @@ ComConst_SDispIntfMissing, "Dispatch interface missing from class %s" ComConst_SNoMethod, "Method '%s' not supported by automation object" - ComConst_SVarNotObject, "Variant does not reference an automation object" + ExtCtrls_clNameWindowText, "Window Text" ComStrs_sTabFailClear, "Failed to clear tab control" ComStrs_sTabFailDelete, "Failed to delete tab at index %d" @@ -910,5 +913,5 @@ ComStrs_sUDAssociated, "%s is already associated with %s" ComStrs_sPageIndexError, "%d is an invalid PageIndex value. PageIndex must be between 0 and %d" - ComStrs_sInvalidComCtl32, "This control requires version 4.70 or greater of COMCTL32.DLL" + ExtCtrls_clNameGrayText, "Gray Text" ExtCtrls_clNameHighlight, "Highlight Background" ExtCtrls_clNameHighlightText, "Highlight Text" @@ -926,5 +929,5 @@ ExtCtrls_clNameWindow, "Window Background" ExtCtrls_clNameWindowFrame, "Window Frame" - ExtCtrls_clNameWindowText, "Window Text" + ExtCtrls_clNameAqua, "Aqua" ExtCtrls_clNameWhite, "White" ExtCtrls_clNameMoneyGreen, "Money Green" @@ -942,5 +945,5 @@ ExtCtrls_clNameCaptionText, "Caption Text" ExtCtrls_clNameDefault, "Default" - ExtCtrls_clNameGrayText, "Gray Text" + HelpIntfs_hNoContext, "No context-sensitive help installed" HelpIntfs_hNoTopics, "No topic-based help system installed" ExtCtrls_clNameBlack, "Black" @@ -958,5 +961,5 @@ ExtCtrls_clNameBlue, "Blue" ExtCtrls_clNameFuchsia, "Fuchsia" - ExtCtrls_clNameAqua, "Aqua" + Consts_SDuplicateMenus, "Menu '%s' is already being used by another form" Consts_SPictureLabel, "Picture:" Consts_SPictureDesc, " (%dx%d)" @@ -974,5 +977,5 @@ HelpIntfs_hNoTableOfContents, "Unable to find a Table of Contents" HelpIntfs_hNothingFound, "No help found for %s" - HelpIntfs_hNoContext, "No context-sensitive help installed" + Consts_SmkcIns, "Ins" Consts_SmkcDel, "Del" Consts_SmkcShift, "Shift+" @@ -990,5 +993,5 @@ Consts_SInvalidPrinterOp, "Operation not supported on selected printer" Consts_SNoDefaultPrinter, "There is no default printer currently selected" - Consts_SDuplicateMenus, "Menu '%s' is already being used by another form" + Consts_SMsgDlgAll, "&All" Consts_SMsgDlgNoToAll, "N&o to All" Consts_SMsgDlgYesToAll, "Yes to &All" @@ -1006,5 +1009,5 @@ Consts_SmkcRight, "Right" Consts_SmkcDown, "Down" - Consts_SmkcIns, "Ins" + Consts_SVIcons, "Icons" Consts_SVBitmaps, "Bitmaps" Consts_SMaskErr, "Invalid input value" @@ -1022,6 +1025,6 @@ Consts_SMsgDlgRetry, "&Retry" Consts_SMsgDlgIgnore, "&Ignore" - Consts_SMsgDlgAll, "&All" Consts_SNoMDIForm, "Cannot create form. No MDI forms are currently active" + Consts_SImageCanvasNeedsBitmap, "Can only modify an image if it contains a bitmap" Consts_SControlParentSetToSelf, "A control cannot have itself as its parent" Consts_SOKButton, "OK" @@ -1038,5 +1041,4 @@ Consts_SVMetafiles, "Metafiles" Consts_SVEnhMetafiles, "Enhanced Metafiles" - Consts_SVIcons, "Icons" Consts_SParentGivenNotAParent, "Parent given is not a parent of '%s'" Consts_SMDIChildNotVisible, "Cannot hide an MDI Child Form" Index: cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.dsk =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.dsk (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart.dsk (revision 801) @@ -1,43 +1,113 @@ [Closed Files] -File_0=SourceModule,'P:\vista\tmg-cprs\CPRS-Chart\rCore.pas',0,1,233,13,246,0,0 -File_1=SourceModule,'c:\program files\borland\delphi7\source\rtl\common\classes.pas',0,1,4672,43,4675,0,0 -File_2=SourceModule,'C:\PROGRA~1\VISTA\BDK32\Source\Trpcb.pas',0,1,1052,1,1059,0,0 -File_3=SourceModule,'c:\program files\borland\delphi7\source\vcl\Graphics.pas',0,1,3762,1,3769,0,0 -File_4=SourceModule,'C:\PROGRA~1\VISTA\BDK32\Source\Wsockc.pas',0,1,1472,1,1479,0,0 -File_5=SourceModule,'P:\Vista\tmg-cprs\dklang-package-3.01\DKLang.pas',0,1,2653,1,2659,0,0 -File_6=SourceModule,'c:\program files\borland\delphi7\source\rtl\common\ComObj.pas',0,1,1262,1,1269,0,0 -File_7=SourceModule,'c:\program files\borland\delphi7\source\vcl\Forms.pas',0,1,6939,1,6946,0,0 -File_8=SourceModule,'P:\vista\tmg-cprs\CPRS-Chart\fVitals.pas',0,1,197,1,204,0,0 -File_9=SourceModule,'P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fPtDemoEdit.pas',0,1,683,11,726,0,0 +File_0=SourceModule,'P:\vista\tmg-cprs\CPRS-Chart\BA\UBACore.pas',0,1,417,50,420,0,0 +File_1=SourceModule,'c:\program files\borland\delphi7\source\vcl\Graphics.pas',0,1,3762,1,3769,0,0 +File_2=SourceModule,'c:\program files\borland\delphi7\source\rtl\common\classes.pas',0,1,5113,1,5120,0,0 +File_3=SourceModule,'P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fImagePickPDF.pas',0,1,90,1,98,0,0 +File_4=SourceModule,'c:\program files\borland\delphi7\source\vcl\Forms.pas',0,1,2657,1,2664,0,0 +File_5=SourceModule,'P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fImagePickExisting.pas',0,1,141,1,148,0,0 +File_6=SourceModule,'P:\vista\tmg-cprs\CPRS-Chart\rHTMLTools.pas',0,1,631,12,638,0,0 +File_7=SourceModule,'c:\program files\borland\delphi7\source\rtl\Sys\system.pas',0,1,8385,1,8394,0,0 +File_8=SourceModule,'C:\PROGRA~1\VISTA\BDK32\Source\Wsockc.pas',0,1,1472,1,1479,0,0 [Modules] -Module0=P:\vista\tmg-cprs\CPRS-Chart\UploadImages.pas -Module1=P:\vista\tmg-cprs\CPRS-Chart\fPtSelDemog.pas -Module2=P:\vista\tmg-cprs\CPRS-Chart\fPtSelOptns.pas -Module3=P:\vista\tmg-cprs\CPRS-Chart\fPtSel.pas -Module4=P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas -Module5=P:\vista\tmg-cprs\CPRS-Chart\fMeds.pas -Module6=c:\program files\borland\delphi7\source\rtl\Sys\sysutils.pas -Module7=c:\program files\borland\delphi7\source\vcl\StdCtrls.pas -Module8=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fImagePickPDF.pas -Module9=P:\vista\tmg-cprs\CPRS-Chart\fImages.pas -Module10=P:\vista\tmg-cprs\CPRS-Chart\fProbEdt.pas -Module11=P:\vista\tmg-cprs\CPRS-Chart\fProbs.pas -Module12=P:\vista\tmg-cprs\CPRS-Chart\fFrame.pas -Count=13 +Module0=P:\Vista\tmg-cprs\CPRS-Lib\ORNet.pas +Module1=P:\vista\tmg-cprs\CPRS-Chart\rCore.pas +Module2=c:\program files\borland\delphi7\source\rtl\Sys\sysutils.pas +Module3=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\uLogic.pas +Module4=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\SubfilesU.pas +Module5=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\SearchAnimationU.pas +Module6=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\HTMLEdit\fWebTab.pas +Module7=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\HTMLEdit\fPtAdd.pas +Module8=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\frmSearchResults.pas +Module9=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fPtQuery.pas +Module10=P:\vista\tmg-cprs\CPRS-Chart\fPtAdd.pas +Module11=P:\vista\tmg-cprs\CPRS-Chart\fImages.pas +Module12=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fPtAdd.pas +Module13=P:\vista\tmg-cprs\CPRS-Chart\UploadImages.pas +Module14=P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas +Module15=P:\vista\tmg-cprs\CPRS-Chart\Options\rOptions.pas +Module16=P:\vista\tmg-cprs\CPRS-Chart\fPtSel.pas +Module17=P:\vista\tmg-cprs\CPRS-Chart\fFrame.pas +Module18=P:\vista\tmg-cprs\CPRS-Chart\fSplash.pas +Count=19 EditWindowCount=1 TypeLibWindowCount=1 +[P:\Vista\tmg-cprs\CPRS-Lib\ORNet.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\rCore.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[c:\program files\borland\delphi7\source\rtl\Sys\sysutils.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\uLogic.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\SubfilesU.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\SearchAnimationU.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\HTMLEdit\fWebTab.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\HTMLEdit\fPtAdd.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\frmSearchResults.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fPtQuery.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\fPtAdd.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\fImages.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fPtAdd.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + [P:\vista\tmg-cprs\CPRS-Chart\UploadImages.pas] ModuleType=SourceModule -FormState=1 -FormOnTop=0 - -[P:\vista\tmg-cprs\CPRS-Chart\fPtSelDemog.pas] -ModuleType=SourceModule -FormState=0 -FormOnTop=0 - -[P:\vista\tmg-cprs\CPRS-Chart\fPtSelOptns.pas] +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + +[P:\vista\tmg-cprs\CPRS-Chart\Options\rOptions.pas] ModuleType=SourceModule FormState=0 @@ -47,45 +117,5 @@ ModuleType=SourceModule FormState=0 -FormOnTop=0 - -[P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas] -ModuleType=SourceModule -FormState=0 -FormOnTop=0 - -[P:\vista\tmg-cprs\CPRS-Chart\fMeds.pas] -ModuleType=SourceModule -FormState=0 -FormOnTop=0 - -[c:\program files\borland\delphi7\source\rtl\Sys\sysutils.pas] -ModuleType=SourceModule -FormState=0 -FormOnTop=0 - -[c:\program files\borland\delphi7\source\vcl\StdCtrls.pas] -ModuleType=SourceModule -FormState=0 -FormOnTop=0 - -[P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fImagePickPDF.pas] -ModuleType=SourceModule -FormState=0 -FormOnTop=0 - -[P:\vista\tmg-cprs\CPRS-Chart\fImages.pas] -ModuleType=SourceModule -FormState=0 -FormOnTop=0 - -[P:\vista\tmg-cprs\CPRS-Chart\fProbEdt.pas] -ModuleType=SourceModule -FormState=0 -FormOnTop=0 - -[P:\vista\tmg-cprs\CPRS-Chart\fProbs.pas] -ModuleType=SourceModule -FormState=0 -FormOnTop=0 +FormOnTop=1 [P:\vista\tmg-cprs\CPRS-Chart\fFrame.pas] @@ -94,4 +124,9 @@ FormOnTop=0 +[P:\vista\tmg-cprs\CPRS-Chart\fSplash.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + [C:\Program Files\Borland\Delphi7\Projects\ProjectGroup1.bpg] FormState=0 @@ -106,15 +141,15 @@ FormOnTop=0 +[P:\vista\tmg-cprs\CPRS-Chart\fPage.pas] +FormState=0 +FormOnTop=0 + [P:\vista\tmg-cprs\CPRS-Chart\fHSplit.pas] FormState=0 FormOnTop=0 -[P:\vista\tmg-cprs\CPRS-Chart\fPage.pas] -FormState=0 -FormOnTop=0 - [EditWindow0] -ViewCount=13 -CurrentView=4 +ViewCount=19 +CurrentView=10 View0=0 View1=1 @@ -130,4 +165,10 @@ View11=11 View12=12 +View13=13 +View14=14 +View15=15 +View16=16 +View17=17 +View18=18 CodeExplorer=CodeExplorer@EditWindow0 MessageView=MessageView@EditWindow0 @@ -152,92 +193,134 @@ [View0] +Module=P:\vista\tmg-cprs\CPRS-Chart\fImages.pas +CursorX=1 +CursorY=1183 +TopLine=1174 +LeftCol=1 + +[View1] +Module=P:\vista\tmg-cprs\CPRS-Chart\fPtAdd.pas +CursorX=5 +CursorY=470 +TopLine=463 +LeftCol=1 + +[View2] +Module=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fPtQuery.pas +CursorX=1 +CursorY=156 +TopLine=147 +LeftCol=1 + +[View3] +Module=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\frmSearchResults.pas +CursorX=1 +CursorY=108 +TopLine=99 +LeftCol=1 + +[View4] +Module=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\HTMLEdit\fPtAdd.pas +CursorX=1 +CursorY=483 +TopLine=474 +LeftCol=1 + +[View5] +Module=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\HTMLEdit\fWebTab.pas +CursorX=5 +CursorY=79 +TopLine=71 +LeftCol=1 + +[View6] +Module=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\SearchAnimationU.pas +CursorX=1 +CursorY=133 +TopLine=124 +LeftCol=1 + +[View7] +Module=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\SubfilesU.pas +CursorX=7 +CursorY=205 +TopLine=198 +LeftCol=1 + +[View8] +Module=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\uLogic.pas +CursorX=1 +CursorY=1113 +TopLine=1104 +LeftCol=1 + +[View9] +Module=P:\vista\tmg-cprs\CPRS-Chart\Options\rOptions.pas +CursorX=5 +CursorY=206 +TopLine=199 +LeftCol=1 + +[View10] +Module=P:\Vista\tmg-cprs\CPRS-Lib\ORNet.pas +CursorX=23 +CursorY=380 +TopLine=367 +LeftCol=1 + +[View11] +Module=c:\program files\borland\delphi7\source\rtl\Sys\sysutils.pas +CursorX=1 +CursorY=6473 +TopLine=6466 +LeftCol=1 + +[View12] +Module=P:\vista\tmg-cprs\CPRS-Chart\rCore.pas +CursorX=1 +CursorY=402 +TopLine=396 +LeftCol=1 + +[View13] Module=P:\vista\tmg-cprs\CPRS-Chart\fFrame.pas -CursorX=1 -CursorY=1684 -TopLine=1677 -LeftCol=1 - -[View1] -Module=P:\vista\tmg-cprs\CPRS-Chart\fProbs.pas -CursorX=1 -CursorY=1423 -TopLine=1416 -LeftCol=1 - -[View2] -Module=P:\vista\tmg-cprs\CPRS-Chart\fProbEdt.pas -CursorX=6 -CursorY=7 +CursorX=5 +CursorY=4970 +TopLine=4971 +LeftCol=1 + +[View14] +Module=P:\vista\tmg-cprs\CPRS-Chart\UploadImages.pas +CursorX=1 +CursorY=498 +TopLine=491 +LeftCol=1 + +[View15] +Module=P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas +CursorX=1 +CursorY=4691 +TopLine=4679 +LeftCol=1 + +[View16] +Module=P:\vista\tmg-cprs\CPRS-Chart\fSplash.pas +CursorX=61 +CursorY=2 TopLine=1 LeftCol=1 -[View3] -Module=P:\vista\tmg-cprs\CPRS-Chart\fImages.pas -CursorX=3 -CursorY=249 -TopLine=230 -LeftCol=1 - -[View4] -Module=P:\vista\tmg-cprs\CPRS-Chart\UploadImages.pas -CursorX=1 -CursorY=636 -TopLine=629 -LeftCol=1 - -[View5] -Module=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fImagePickPDF.pas -CursorX=56 -CursorY=36 -TopLine=23 -LeftCol=1 - -[View6] -Module=c:\program files\borland\delphi7\source\vcl\StdCtrls.pas -CursorX=1 -CursorY=3625 -TopLine=3616 -LeftCol=1 - -[View7] -Module=c:\program files\borland\delphi7\source\rtl\Sys\sysutils.pas -CursorX=1 -CursorY=5443 -TopLine=5431 -LeftCol=1 - -[View8] -Module=P:\vista\tmg-cprs\CPRS-Chart\fMeds.pas -CursorX=32 -CursorY=68 -TopLine=60 -LeftCol=1 - -[View9] -Module=P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas -CursorX=67 -CursorY=4650 -TopLine=4644 -LeftCol=1 - -[View10] +[View17] Module=P:\vista\tmg-cprs\CPRS-Chart\fPtSel.pas -CursorX=78 -CursorY=1333 -TopLine=1331 -LeftCol=1 - -[View11] -Module=P:\vista\tmg-cprs\CPRS-Chart\fPtSelOptns.pas -CursorX=1 -CursorY=1 -TopLine=1 -LeftCol=1 - -[View12] -Module=P:\vista\tmg-cprs\CPRS-Chart\fPtSelDemog.pas -CursorX=28 -CursorY=103 -TopLine=98 +CursorX=1 +CursorY=1303 +TopLine=1301 +LeftCol=1 + +[View18] +Module=P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fPtAdd.pas +CursorX=22 +CursorY=481 +TopLine=474 LeftCol=1 @@ -257,10 +340,9 @@ [Watches] -Count=5 -Watch0='ResultStr',256,0,18,1,0,'Watches' -Watch1='RPCResult',256,0,18,1,0,'Watches' -Watch2='AsDefault',256,0,18,1,0,'Watches' -Watch3='RPCBrokerV.Results.Strings[0]',256,0,18,1,0,'Watches' -Watch4='Patient',256,0,18,1,0,'Watches' +Count=4 +Watch0='ImagesList.Strings[0]',256,0,18,1,0,'Watches' +Watch1='ImagesList.Strings[1]',256,0,18,1,0,'Watches' +Watch2='ImagesList.Strings[2]',256,0,18,1,0,'Watches' +Watch3='frmImagePickExisting.SelectedIndex',256,0,18,1,0,'Watches' [WatchWindow] @@ -283,13 +365,13 @@ [Breakpoints] -Count=42 +Count=39 Breakpoint0='P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fPtDemoEdit.pas',1714,'',0,1,'',1,0,0,'',1,'','','' Breakpoint1='P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\fPtDemoEdit.pas',1791,'',0,1,'',1,0,0,'',1,'','','' Breakpoint2='P:\vista\tmg-cprs\CPRS-Chart\fDrawers.pas',1068,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint3='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',3282,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint4='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',3288,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint5='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',4382,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint6='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',4788,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint7='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',4808,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint3='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',3288,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint4='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',3294,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint5='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',4388,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint6='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',4829,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint7='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',4849,'',0,1,'',1,0,0,'',1,'','','' Breakpoint8='P:\vista\tmg-cprs\CPRS-Chart\fLabs.pas',2419,'',0,1,'',1,0,0,'',1,'','','' Breakpoint9='P:\vista\tmg-cprs\CPRS-Chart\fReports.pas',2966,'',0,1,'',1,0,0,'',1,'','','' @@ -303,5 +385,5 @@ Breakpoint17='P:\vista\tmg-cprs\CPRS-Chart\Templates\fTemplateFields.pas',143,'',0,1,'',1,0,0,'',1,'','','' Breakpoint18='P:\vista\tmg-cprs\CPRS-Chart\Templates\uTemplateFields.pas',1128,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint19='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',1891,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint19='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',1897,'',0,1,'',1,0,0,'',1,'','','' Breakpoint20='P:\vista\tmg-cprs\CPRS-Chart\Templates\uTemplateFields.pas',1133,'',0,1,'',1,0,0,'',1,'','','' Breakpoint21='P:\vista\tmg-cprs\CPRS-Chart\Templates\uTemplateFields.pas',1126,'',0,1,'',1,0,0,'',1,'','','' @@ -311,19 +393,16 @@ Breakpoint25='P:\vista\tmg-cprs\CPRS-Chart\TMG_Extra\HTMLEdit\TMGHTML2.pas',706,'',0,1,'',1,0,0,'',1,'','','' Breakpoint26='P:\vista\tmg-cprs\CPRS-Chart\fNotePrt.pas',86,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint27='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',778,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint27='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',784,'',0,1,'',1,0,0,'',1,'','','' Breakpoint28='P:\vista\tmg-cprs\CPRS-Chart\fNotePrt.pas',243,'',0,1,'',1,0,0,'',1,'','','' Breakpoint29='P:\vista\tmg-cprs\CPRS-Chart\Orders\fOrders.pas',2820,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint30='P:\vista\tmg-cprs\CPRS-Chart\uTMGOptions.pas',129,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint31='P:\vista\tmg-cprs\CPRS-Chart\uTMGOptions.pas',87,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint32='P:\vista\tmg-cprs\CPRS-Chart\Consults\fConsults.pas',3059,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint33='P:\vista\tmg-cprs\CPRS-Chart\fReportsAdhocComponent1.pas',133,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint34='P:\vista\tmg-cprs\CPRS-Chart\Consults\fConsults.pas',1708,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint35='P:\vista\tmg-cprs\CPRS-Chart\fProbs.pas',334,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint36='P:\vista\tmg-cprs\CPRS-Chart\fProbs.pas',1271,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint37='P:\vista\tmg-cprs\CPRS-Chart\fProbs.pas',1378,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint38='P:\vista\tmg-cprs\CPRS-Chart\UploadImages.pas',636,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint39='P:\vista\tmg-cprs\CPRS-Chart\UploadImages.pas',578,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint40='P:\vista\tmg-cprs\CPRS-Chart\UploadImages.pas',498,'',0,1,'',1,0,0,'',1,'','','' -Breakpoint41='P:\vista\tmg-cprs\CPRS-Chart\fImages.pas',695,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint30='P:\vista\tmg-cprs\CPRS-Chart\Consults\fConsults.pas',3059,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint31='P:\vista\tmg-cprs\CPRS-Chart\fReportsAdhocComponent1.pas',133,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint32='P:\vista\tmg-cprs\CPRS-Chart\Consults\fConsults.pas',1708,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint33='P:\vista\tmg-cprs\CPRS-Chart\fProbs.pas',334,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint34='P:\vista\tmg-cprs\CPRS-Chart\fProbs.pas',1271,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint35='P:\vista\tmg-cprs\CPRS-Chart\fProbs.pas',1378,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint36='P:\vista\tmg-cprs\CPRS-Chart\Options\fOptions.pas',522,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint37='P:\vista\tmg-cprs\CPRS-Chart\fNotes.pas',4671,'',0,1,'',1,0,0,'',1,'','','' +Breakpoint38='P:\vista\tmg-cprs\CPRS-Chart\rCore.pas',402,'',0,1,'',1,0,0,'',1,'','','' [AddressBreakpoints] @@ -335,5 +414,5 @@ State=0 Left=11 -Top=6 +Top=0 Width=1013 Height=112 @@ -379,6 +458,6 @@ Visible=0 State=0 -Left=25 -Top=161 +Left=31 +Top=162 Width=731 Height=488 @@ -411,17 +490,17 @@ Left=0 Top=0 -Width=246 -Height=528 -MaxLeft=-1 -MaxTop=-1 -ClientWidth=246 -ClientHeight=528 +Width=238 +Height=499 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=238 +ClientHeight=499 TBDockHeight=492 -LRDockWidth=190 +LRDockWidth=246 Dockable=1 SplitPos=114 ArrangeBy=Name -SelectedItem=Left -ExpandedItems=Anchors,CalColors,Constraints,EdgeBorders,Font,Options +SelectedItem=Caption +ExpandedItems=Anchors,CalColors,Constraints,EdgeBorders,Font,Images,Options HiddenCategories=Legacy @@ -450,13 +529,13 @@ [CallStackWindow] Create=1 -Visible=0 -State=0 -Left=0 -Top=0 -Width=553 +Visible=1 +State=0 +Left=13 +Top=161 +Width=321 Height=521 MaxLeft=-1 MaxTop=-1 -ClientWidth=545 +ClientWidth=313 ClientHeight=495 TBDockHeight=411 @@ -490,12 +569,12 @@ Left=0 Top=0 -Width=246 -Height=528 -MaxLeft=-1 -MaxTop=-1 -ClientWidth=246 -ClientHeight=528 +Width=238 +Height=499 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=238 +ClientHeight=499 TBDockHeight=175 -LRDockWidth=108 +LRDockWidth=246 Dockable=1 @@ -669,13 +748,13 @@ State=0 Left=9 -Top=123 -Width=262 -Height=583 -MaxLeft=-1 -MaxTop=-1 -ClientWidth=254 -ClientHeight=557 -TBDockHeight=356 -LRDockWidth=140 +Top=119 +Width=254 +Height=554 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=246 +ClientHeight=528 +TBDockHeight=554 +LRDockWidth=254 Dockable=1 TabPosition=0 Index: cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart_TLB.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart_TLB.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/CPRSChart_TLB.pas (revision 801) @@ -13,5 +13,5 @@ // PASTLWTR : 1.2 -// File generated on 6/14/2010 7:54:12 AM from Type Library described below. +// File generated on 6/16/2010 3:23:35 PM from Type Library described below. // ************************************************************************ // Index: cprs/branches/tmg-cprs/CPRS-Chart/Options/fOptions.dfm =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/Options/fOptions.dfm (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/Options/fOptions.dfm (revision 801) @@ -1761,5 +1761,5 @@ Caption = 'Image Retrieval Method' end - object Label4: TLabel + object lblDropBox: TLabel Left = 16 Top = 104 @@ -1768,5 +1768,5 @@ Caption = 'Dropbox Folder' end - object Label5: TLabel + object lblPollingInterval: TLabel Left = 15 Top = 231 @@ -1775,5 +1775,5 @@ Caption = 'Polling Interval of Scanned Images Folder' end - object Label6: TLabel + object lblScannedImagesFolder: TLabel Left = 15 Top = 183 @@ -1782,5 +1782,5 @@ Caption = 'Scanned Images Folder' end - object Label7: TLabel + object lblSeconds: TLabel Left = 96 Top = 248 @@ -1821,5 +1821,5 @@ OnChange = editDropboxLocationChange end - object BitBtn1: TBitBtn + object btnBrowseDropBox: TBitBtn Left = 224 Top = 120 @@ -1828,5 +1828,5 @@ Caption = '...' TabOrder = 3 - OnClick = BitBtn1Click + OnClick = btnBrowseDropBoxClick Glyph.Data = { F6000000424DF600000000000000760000002800000010000000100000000100 @@ -1856,5 +1856,5 @@ OnChange = editScannedLocationChange end - object BitBtn2: TBitBtn + object btnBrowseScannedImages: TBitBtn Left = 224 Top = 200 @@ -1863,5 +1863,5 @@ Caption = '...' TabOrder = 6 - OnClick = BitBtn2Click + OnClick = btnBrowseScannedImagesClick Glyph.Data = { F6000000424DF600000000000000760000002800000010000000100000000100 @@ -2074,12 +2074,13 @@ 5A00000005004974656D73590000000400546578740006004C6162656C330101 0000005B000000070043617074696F6E0013006564697444726F70626F784C6F - 636174696F6E000006004C6162656C3401010000005C00000007004361707469 - 6F6E00070042697442746E3100000A00646C675069636B446972000010006362 - 456E61626C655363616E6E696E6701010000005D000000070043617074696F6E - 0006004C6162656C3501010000005E000000070043617074696F6E0013006564 - 69745363616E6E65644C6F636174696F6E0000070042697442746E3200000600 - 4C6162656C3601010000005F000000070043617074696F6E000A00656474506F - 6C46726571000006004C6162656C37010100000060000000070043617074696F - 6E00} + 636174696F6E00000A006C626C44726F70426F7801010000005C000000070043 + 617074696F6E00100062746E42726F77736544726F70426F7800000A00646C67 + 5069636B446972000010006362456E61626C655363616E6E696E670101000000 + 5D000000070043617074696F6E0012006C626C506F6C6C696E67496E74657276 + 616C01010000005E000000070043617074696F6E001300656469745363616E6E + 65644C6F636174696F6E0000160062746E42726F7773655363616E6E6564496D + 61676573000016006C626C5363616E6E6564496D61676573466F6C6465720101 + 0000005F000000070043617074696F6E000A00656474506F6C4672657100000A + 006C626C5365636F6E6473010100000060000000070043617074696F6E00} end object dlgPickDir: TOpenDialog Index: cprs/branches/tmg-cprs/CPRS-Chart/Options/fOptions.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/Options/fOptions.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/Options/fOptions.pas (revision 801) @@ -140,14 +140,14 @@ Label3: TLabel; editDropboxLocation: TEdit; - Label4: TLabel; - BitBtn1: TBitBtn; + lblDropBox: TLabel; + btnBrowseDropBox: TBitBtn; dlgPickDir: TOpenDialog; cbEnableScanning: TCheckBox; - Label5: TLabel; + lblPollingInterval: TLabel; editScannedLocation: TEdit; - BitBtn2: TBitBtn; - Label6: TLabel; + btnBrowseScannedImages: TBitBtn; + lblScannedImagesFolder: TLabel; edtPolFreq: TEdit; - Label7: TLabel; + lblSeconds: TLabel; procedure FormCreate(Sender: TObject); procedure FormDestroy(Sender: TObject); @@ -195,6 +195,6 @@ procedure editScannedLocationChange(Sender: TObject); procedure edtPolFreqChange(Sender: TObject); - procedure BitBtn1Click(Sender: TObject); - procedure BitBtn2Click(Sender: TObject); //kt added 6/29/07 + procedure btnBrowseDropBoxClick(Sender: TObject); + procedure btnBrowseScannedImagesClick(Sender: TObject); //kt added 6/29/07 private { Private declarations } @@ -357,9 +357,14 @@ // initialize form var i : integer; //kt added 6/29/07 - begin + j : TImgTransferMethod; + begin + //kt start mod + cboTransMethod.Items.Clear; + for j := itmDropbox to itmRPC do cboTransMethod.Items.Add(IMAGE_TRANSFER_METHODS[j]); + //kt end mod LoadNotifications; LoadOrderChecks; - LoadImageSettings; - FdirtyImageSettings := false; + LoadImageSettings; //kt + FdirtyImageSettings := false; //kt FdirtyNotifications := false; FdirtyOrderChecks := false; @@ -515,11 +520,10 @@ procedure TfrmOptions.LoadImageSettings; begin - cbEnableImages.Checked := uTMGOptions.ReadBool('EnableImages',false); - cboTransMethod.ItemIndex := uTMGOptions.ReadInteger('ImageTransferMethod',0); + cbEnableImages.Checked := uTMGOptions.ReadBool('EnableImages',true); + cboTransMethod.ItemIndex := uTMGOptions.ReadInteger('ImageTransferMethod',2); editDropboxLocation.text := uTMGOptions.ReadString('Dropbox directory',''); cbEnableScanning.Checked := uTMGOptions.ReadBool('Scan Enabled',false); editScannedLocation.text := uTMGOptions.ReadString('Pol Directory',''); edtPolFreq.text := IntToStr(uTMGOptions.ReadInteger('Pol Interval (milliseconds)',0)); - cbEnableScanningClick(self); cboTransMethodChange(self); @@ -568,4 +572,6 @@ uTMGOptions.WriteInteger('ImageTransferMethod',cboTransMethod.itemindex); + frmImages.TransferMethod := TImgTransferMethod(cboTransMethod.itemindex); + { if cboTransMethod.text = 'Dropbox Transfer' then begin frmImages.UseDropBox := True; @@ -573,5 +579,5 @@ frmImages.UseDropBox := False; end; - + } uTMGOptions.WriteString('Dropbox directory',editDropboxLocation.text); frmImages.DropBoxDir := editDropboxLocation.text; @@ -1018,101 +1024,109 @@ end; -procedure TfrmOptions.cboTransMethodChange(Sender: TObject); -begin - if cboTransMethod.text = 'Dropbox Transfer' then begin - editDropboxLocation.enabled := true; - bitbtn1.enabled := true; - end else begin - editDropboxLocation.enabled := false; - bitbtn1.enabled := false; - end; + procedure TfrmOptions.cboTransMethodChange(Sender: TObject); + var Show : boolean; + begin + if cboTransMethod.Text = IMAGE_TRANSFER_METHODS[itmDirect] then begin + MessageDlg('Sorry. Direct file access not yet supported.',mtInformation,[mbOK],0); + cboTransMethod.ItemIndex := -1; + end; + if cboTransMethod.ItemIndex < 0 then begin + cboTransMethod.ItemIndex := ord(itmRPC); + cboTransMethod.Text := IMAGE_TRANSFER_METHODS[itmRPC]; + end; + Show := (cboTransMethod.ItemIndex = ord(itmDropbox)); + editDropboxLocation.Visible := Show; + btnBrowseDropBox.Visible := Show; + lblDropBox.Visible := Show; FdirtyImageSettings := true; CheckApply; -end; - -procedure TfrmOptions.cbEnableImagesClick(Sender: TObject); -begin - FdirtyImageSettings := true; - CheckApply; -end; - -procedure TfrmOptions.editDropboxLocationChange(Sender: TObject); -begin - FdirtyImageSettings := true; - CheckApply; -end; - -procedure TfrmOptions.cbEnableScanningClick(Sender: TObject); -begin - editScannedLocation.enabled := cbEnableScanning.checked; - bitbtn2.enabled := cbEnableScanning.checked; - edtPolFreq.enabled := cbEnableScanning.checked; - FdirtyImageSettings := true; - CheckApply; -end; - -procedure TfrmOptions.editScannedLocationChange(Sender: TObject); -begin - FdirtyImageSettings := true; - CheckApply; -end; - -procedure TfrmOptions.edtPolFreqChange(Sender: TObject); -begin - FdirtyImageSettings := true; - CheckApply; -end; - -procedure TfrmOptions.BitBtn1Click(Sender: TObject); -var - sFolder: string; -begin - sFolder := BrowseDialog('Choose a Dropbox folder', BIF_RETURNONLYFSDIRS); - if sFolder <> '' then begin - if rightstr(sFolder,1) = '\' then begin - editDropboxLocation.text := sFolder; - end else begin - editDropboxLocation.text := sFolder + '\'; - end; - end; -end; - -function TfrmOptions.BrowseDialog(const Title: string; const Flag: integer): string; -var - lpItemID : PItemIDList; - BrowseInfo : TBrowseInfo; - DisplayName : array[0..MAX_PATH] of char; - TempPath : array[0..MAX_PATH] of char; -begin - Result:=''; - FillChar(BrowseInfo, sizeof(TBrowseInfo), #0); - with BrowseInfo do begin - hwndOwner := Application.Handle; - pszDisplayName := @DisplayName; - lpszTitle := PChar(Title); - ulFlags := Flag; - end; - lpItemID := SHBrowseForFolder(BrowseInfo); - if lpItemId <> nil then begin - SHGetPathFromIDList(lpItemID, TempPath); - Result := TempPath; - GlobalFreePtr(lpItemID); - end; -end; - - -procedure TfrmOptions.BitBtn2Click(Sender: TObject); -var - sFolder: string; -begin - sFolder := BrowseDialog('Choose a Scanned folder', BIF_RETURNONLYFSDIRS); - if sFolder <> '' then begin - if rightstr(sFolder,1) = '\' then begin - editScannedLocation.text := sFolder; - end else begin - editScannedLocation.text := sFolder + '\'; - end; - end; -end; + end; + + procedure TfrmOptions.cbEnableImagesClick(Sender: TObject); + begin + FdirtyImageSettings := true; + CheckApply; + end; + + procedure TfrmOptions.editDropboxLocationChange(Sender: TObject); + begin + FdirtyImageSettings := true; + CheckApply; + end; + + procedure TfrmOptions.cbEnableScanningClick(Sender: TObject); + begin + editScannedLocation.Visible := cbEnableScanning.checked; + btnBrowseScannedImages.Visible := cbEnableScanning.checked; + edtPolFreq.Visible := cbEnableScanning.checked; + lblScannedImagesFolder.Visible := cbEnableScanning.checked; + lblPollingInterval.Visible := cbEnableScanning.checked; + lblSeconds.Visible := cbEnableScanning.checked; + FdirtyImageSettings := true; + CheckApply; + end; + + procedure TfrmOptions.editScannedLocationChange(Sender: TObject); + begin + FdirtyImageSettings := true; + CheckApply; + end; + + procedure TfrmOptions.edtPolFreqChange(Sender: TObject); + begin + FdirtyImageSettings := true; + CheckApply; + end; + + procedure TfrmOptions.btnBrowseDropBoxClick(Sender: TObject); + var + sFolder: string; + begin + sFolder := BrowseDialog('Choose a Dropbox folder', BIF_RETURNONLYFSDIRS); + if sFolder <> '' then begin + if rightstr(sFolder,1) = '\' then begin + editDropboxLocation.text := sFolder; + end else begin + editDropboxLocation.text := sFolder + '\'; + end; + end; + end; + + function TfrmOptions.BrowseDialog(const Title: string; const Flag: integer): string; + var + lpItemID : PItemIDList; + BrowseInfo : TBrowseInfo; + DisplayName : array[0..MAX_PATH] of char; + TempPath : array[0..MAX_PATH] of char; + begin + Result:=''; + FillChar(BrowseInfo, sizeof(TBrowseInfo), #0); + with BrowseInfo do begin + hwndOwner := Application.Handle; + pszDisplayName := @DisplayName; + lpszTitle := PChar(Title); + ulFlags := Flag; + end; + lpItemID := SHBrowseForFolder(BrowseInfo); + if lpItemId <> nil then begin + SHGetPathFromIDList(lpItemID, TempPath); + Result := TempPath; + GlobalFreePtr(lpItemID); + end; + end; + + procedure TfrmOptions.btnBrowseScannedImagesClick(Sender: TObject); + var + sFolder: string; + begin + sFolder := BrowseDialog('Choose a Scanned folder', BIF_RETURNONLYFSDIRS); + if sFolder <> '' then begin + if rightstr(sFolder,1) = '\' then begin + editScannedLocation.text := sFolder; + end else begin + editScannedLocation.text := sFolder + '\'; + end; + end; + end; end. Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/fPtAdd.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/fPtAdd.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/fPtAdd.pas (revision 801) @@ -479,5 +479,6 @@ //CheckPost('PtType',PtType); - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; tempS := RPCBrokerV.Results.Strings[0]; tempResult := strtoint(piece(tempS,'^',1)); Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/fWebTab.dfm =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/fWebTab.dfm (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/fWebTab.dfm (revision 801) @@ -13,5 +13,4 @@ OldCreateOrder = True Position = poScreenCenter - OnCreate = FormCreate PixelsPerInch = 96 TextHeight = 13 Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/fWebTab.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/fWebTab.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/HTMLEdit/fWebTab.pas (revision 801) @@ -76,5 +76,6 @@ if (URLList <> nil) then begin RPCBrokerV.remoteprocedure := 'TMG CPRS GET URL LIST'; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; URLList.Assign(RPCBrokerV.Results); if RPCBrokerV.Results.Count>0 then Result := RPCBrokerV.Results.Strings[0] Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/SearchAnimationU.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/SearchAnimationU.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/SearchAnimationU.pas (revision 801) @@ -129,5 +129,6 @@ cmd := cmd + '^' + JobNumber; RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; if RPCBrokerV.Results.Count > 0 then begin RPCResult := RPCBrokerV.Results[0]; Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fImagePickExisting.dfm =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fImagePickExisting.dfm (revision 801) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fImagePickExisting.dfm (revision 801) @@ -0,0 +1,145 @@ +object frmImagePickExisting: TfrmImagePickExisting + Left = 270 + Top = 308 + Width = 507 + Height = 307 + Caption = 'Pick Image Previously Uploaded' + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'MS Sans Serif' + Font.Style = [] + OldCreateOrder = False + OnCreate = FormCreate + OnDestroy = FormDestroy + OnShow = FormShow + PixelsPerInch = 96 + TextHeight = 13 + object pnlButtons: TPanel + Left = 0 + Top = 231 + Width = 499 + Height = 42 + Align = alBottom + BevelOuter = bvLowered + TabOrder = 0 + object btnOK: TBitBtn + Left = 261 + Top = 5 + Width = 113 + Height = 33 + Caption = '&Select Image' + Default = True + ModalResult = 1 + TabOrder = 0 + OnClick = btnOKClick + Glyph.Data = { + 76060000424D7606000000000000360000002800000014000000140000000100 + 20000000000040060000130B0000130B00000000000000000000000000000000 + 0000000000000000000000000000FFFFFF10B1CCAF44CEDFCE9E4E995AB42F84 + 3CAD2C8338B9439655A29BCAA79EB9D0B644FFFFFF1000000000000000000000 + 0000000000000000000000000000000000000000000000000000E3ECE160679E + 67D73F9553FF26A15BFF26AA68F225A461CA25A461FF24B16FFF25A662FF3F95 + 52FF679E67D7E3ECE16000000000000000000000000000000000000000000000 + 000000000000D2E1D1993D8944FF26A25FFF24B372FF299A54FF2B8C42FF2B8A + 41FF2B8A41FF2B8A42FF299A53FF24B272FF26A25EFF3D8944FFD2E1D1990000 + 000000000000000000000000000000000000D2E1D1992D873EFF23A763FE28A0 + 5BFF2B8E45FF2B9048FF2A934CFF28934CFF2B934CFF2A934BFF2B8F48FF2B8C + 44FF289F5AFF23A662FE2D873EFFD2E1D199000000000000000000000000E3EB + E1603D8A45FF24A560FE2A964FFF2B934DFF2A9650FF2B9852FF27964FFF2F90 + 49FF299A53FF2B9852FF2B9751FF2A954FFF2A924BFF2A944EFF24A460FE3D8A + 45FFE3EBE16000000000FFFFFF10679F67D7269F5AFF299D57FF2A9750FF2A9A + 55FF299C57FF269C55FF51A168FFAFC2ADFF25934AFF299E59FF299C56FF2A9A + 55FF2A9853FF2A954EFF299B56FF269E58FF679F67D7FFFFFF10B3CDB0443F94 + 52FF28A35FFF2B9852FF2A9D57FF2AA05BFF1F9B53FF57A56EFFCED6CEFFEBE6 + EAFF82B48EFF219E57FF29A15EFF299F5CFF299D58FF2A9B55FF2B964FFF28A0 + 5CFF3F9553FFB0CCAF44BEDBC59E269B55FF2A9B56FF299E5AFF29A25DFF26A2 + 5EFF5AA772FFDADED9FFE6E5E6FFE5E5E5FFD5DCD5FF3EA366FF2AA865FF2AA5 + 62FF29A35EFF29A05BFF299C57FF2B9852FF27964FFFCEE0CF9E53A76DDA279F + 5BFF289F5BFF28A360FF27A45FFF5AAA75FFD7DED7FFEAEAEBFFE5E5E4FFE6E7 + E7FFE8E9E9FF98C0A1FF20A660FF2AAB69FF29A765FF29A461FF29A15DFF299C + 58FF309C58FF4D9A5CDA39904BF93BA768FF34A968FF29A966FF36A463FFC5D3 + C4FFF1F0F2FFEFEBECFF54A46BFFB9D2BFFFEDEDEEFFE6E8E6FF56A871FF1FAE + 6AFF29AB6AFF28A865FF2CA663FF34A665FF349B58FF31853DF9469656F948AD + 73FF42B277FF43B77DFF2FAD6CFF8CC19EFFE2E5E0FF4CA66BFF20B370FF399F + 5FFFF1EEEEFFF3F1F3FFD3DFD5FF32A563FF2EB273FF3BB478FF43B379FF42AF + 73FF3DA060FF3C8D48F9348D47DA51B47EFF4FBA84FF4EBD87FF4FC18CFF51B2 + 7CFF58B17BFF44BE86FF46BF89FF3EBD83FF80B78EFFF7F4F5FFF4F2F3FF9FC9 + ABFF4AB881FF4FBF89FF4EBB84FF4EB880FF4CA76CFF79AF7FDA98CAA79E54B0 + 78FF5BC28FFF5BC391FF5AC492FF5AC795FF5AC897FF5AC896FF5AC997FF5AC9 + 97FF59C28FFFC3D9C7FFF7F6F7FFEDF0EDFF74B78AFF56C28FFF5BC190FF5CBF + 8DFF4A9F61FFBFD6BF9EB8CFB444509657FF71CDA2FF65C899FF66CA9CFF66CB + 9CFF65CD9EFF65CD9FFF65CEA0FF65CEA0FF64CD9EFF6FBC8EFFEAEFE9FFFFFF + FFFFBAD2BAFF59B782FF65C899FF71CB9FFF509758FFB1CDB144FFFFFF10669D + 65D766B37FFF7DD5AEFF72CEA4FF73D1A6FF73D1A7FF72D3A8FF71D3AAFF72D4 + AAFF71D3AAFF6DD0A4FF82BF95FFC5D9C5FF77C094FF70CDA2FF7ED4ADFF66B1 + 7EFF669D65D7FFFFFF1000000000DFEBE060468C49FF83C9A1FE83D7B2FF7DD4 + ADFF7ED6B0FF7ED7B1FF7DD8B2FF7DD8B3FF7DD8B3FF7ED8B2FF79D1A9FF6EBF + 91FF7DD4ACFF84D6B0FF82C9A0FE468B49FFDFEBE06000000000000000000000 + 0000D1E1D099448D4AFF92D0ADFEA0E4C9FF88D9B6FF89DBB8FF8ADCBAFF8ADD + BBFF8ADDBAFF8BDCB9FF89DAB7FF88D9B5FFA1E4C8FF92D0ADFE448D4AFFD1E1 + D0990000000000000000000000000000000000000000D0E1D099488C4AFF87C1 + 97FFBDEDDAFFA4E4CAFF96DFC1FF94E0C0FF94DFC0FF96DFC0FFA4E4C9FFBDEC + D9FF87C097FF488D4AFFD0E1D099000000000000000000000000000000000000 + 00000000000000000000DFEBDF60659D65D7609E65FF86BC92FFA1CFB0FCA0D0 + B2E8AAD7BCFF99CCABFF8BBF98FF609E65FF659D65D7DFEBDF60000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF10B3CEB344A8C8A99E3787417439894398489353F93F8F4CDA87B68B9EB9D1 + B844FFFFFF100000000000000000000000000000000000000000} + end + object btnCancel: TBitBtn + Left = 380 + Top = 5 + Width = 113 + Height = 33 + Caption = '&Cancel' + ModalResult = 2 + TabOrder = 1 + Glyph.Data = { + 36030000424D3603000000000000360000002800000010000000100000000100 + 18000000000000030000120B0000120B00000000000000000000FFFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + FFDAE0FAD8DFFAFFFFFFFFFFFFFFFFFFD9DFFAE9ECFCFFFFFFFFFFFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFBAC7F7143CE25875E9FFFFFFFFFFFFFFFFFF + 1B43E1294EE3D9E0FAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAEBDF6123D + E44465E9EDF0FDFFFFFFFFFFFFFFFFFF4363E60833DE1A42E2E5E9FCFFFFFFFF + FFFFFFFFFFFFFFFFAFBDF70633E5244CE6EDF1FDFFFFFFFFFFFFFFFFFFFFFFFF + F3F5FD728AED0632E1234AE7CED7FAFFFFFFFFFFFF92A6F5153FE8244DE8E7EB + FCFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFCFF8399F10C38E7274FEBD3 + DBFBACBCF90D3AEB2B51EBE6EAFCFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + FFFFFFFFFFFFFFFFFFACBBF70C39EB0735EC0534EC103CEBE2E7FCFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5C7AF405 + 34EE0434EFADBDF9FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + FFFFFFFFFFFFFCFDFF8BA1F90434F01C47F12952F41E49F5DAE2FEFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6A87F80636F31C47F1E1 + E6FDF2F5FE4065F82650FAF3F5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + F9FAFF7C95FB0434F41844F4CBD5FCFFFFFFFFFFFFF3F5FF6785FC2C56FBE9ED + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5E7EFB0335F7133FF5DAE1FDFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFF7F98FD1442FBEBEFFFFFFFFFFFFFFFFFFFFFFFFFFF + 0637F91241F7C8D2FDFEFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCFDFFBFCC + FEDEE5FEFFFFFFFFFFFFFFFFFFFFFFFF6A87FBB2C1FDFFFFFFFFFFFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF} + end + end + object ScrollBox: TScrollBox + Left = 0 + Top = 0 + Width = 499 + Height = 231 + Align = alClient + TabOrder = 1 + OnClick = ScrollBoxClick + object Image1: TImage + Left = 48 + Top = 24 + Width = 105 + Height = 105 + OnClick = ImageClick + OnDblClick = ImageDblClick + end + end +end Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fImagePickExisting.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fImagePickExisting.pas (revision 801) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fImagePickExisting.pas (revision 801) @@ -0,0 +1,220 @@ +unit fImagePickExisting; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, fImages, StdCtrls, Buttons, ExtCtrls; + +type + TfrmImagePickExisting = class(TForm) + pnlButtons: TPanel; + btnOK: TBitBtn; + btnCancel: TBitBtn; + ScrollBox: TScrollBox; + Image1: TImage; + procedure FormShow(Sender: TObject); + procedure FormCreate(Sender: TObject); + procedure FormDestroy(Sender: TObject); + procedure ImageClick(Sender: TObject); + procedure ImageDblClick(Sender: TObject); + procedure btnOKClick(Sender: TObject); + procedure ScrollBoxClick(Sender: TObject); + private + { Private declarations } + ShownImagesList : TList; //owns objects + Row, Col : integer; + NextInsert : TPoint; + CurRowHeight : integer; + SelectedIndex : integer; + function GetImageFName : string; + function GetSelectedImageInfo : TImageInfo; + procedure InitImagePlacement; + procedure BoxImage(Index: integer; Selected : boolean); + procedure ImagesListClear; + procedure ShowImages; + procedure ShowSelected; + public + { Public declarations } + property SelectedImageInfo : TImageInfo read GetSelectedImageInfo; + property SelectedImageFName : string read GetImageFName; + end; + +const + IMAGE_SPACING = 5; + COLS_PER_ROW = 3; + +var + frmImagePickExisting: TfrmImagePickExisting; + +implementation + +{$R *.dfm} + +procedure TfrmImagePickExisting.FormShow(Sender: TObject); +begin + ShowImages; +end; + +procedure TfrmImagePickExisting.FormCreate(Sender: TObject); +begin + ShownImagesList := TList.Create; //owns objects + InitImagePlacement; +end; + +procedure TfrmImagePickExisting.FormDestroy(Sender: TObject); +begin + ImagesListClear; + ShownImagesList.Free; +end; + +//------------------------------------------------------------ +//Event handlers +//------------------------------------------------------------ +procedure TfrmImagePickExisting.ImageClick(Sender: TObject); +begin + SelectedIndex := TImage(Sender).Tag; + ShowSelected; +end; + +procedure TfrmImagePickExisting.ImageDblClick(Sender: TObject); +begin + SelectedIndex := TImage(Sender).Tag; + ShowSelected; + btnOK.Click; +end; + +procedure TfrmImagePickExisting.btnOKClick(Sender: TObject); +begin + //kt +end; + +procedure TfrmImagePickExisting.ScrollBoxClick(Sender: TObject); +begin + SelectedIndex := -1; + ShowSelected; +end; + +//------------------------------------------------------------ +//----------------------------------------------------------- + +procedure TfrmImagePickExisting.ShowSelected; +var i : integer; +begin + for i := 0 to ShownImagesList.Count-1 do begin + BoxImage(i, (i=SelectedIndex)); + end; +end; + +procedure TfrmImagePickExisting.ImagesListClear; +var i : integer; + Image : TImage; +begin + for i := 0 to ShownImagesList.Count-1 do begin + Image := TImage(ShownImagesList.Items[i]); + Image.Free; + end; + InitImagePlacement; +end; + +procedure TfrmImagePickExisting.InitImagePlacement; +begin + Row := 0; + Col := 0; + NextInsert.X := IMAGE_SPACING; + NextInsert.Y := IMAGE_SPACING; + CurRowHeight := 0; + SelectedIndex := -1; +end; + + +procedure TfrmImagePickExisting.ShowImages; +var i : integer; + Image : TImage; + Rec : TImageInfo; + +begin + frmImages.EnsureALLImagesDownloaded; + ImagesListClear; + for i := 0 to frmImages.ImagesCount - 1 do begin + Rec := frmImages.ImageInfo[i]; + Image := TImage.Create(Self); + ShownImagesList.Add(Image); //index will match Image.Tag below + Image.Visible := false; + Image.Parent := ScrollBox; + if FileExists(Rec.CacheThumbFName) then begin + Image.Picture.Bitmap.LoadFromFile(Rec.CacheThumbFName); + end else begin + frmImages.GetThumbnailBitmapForFName(Rec.CacheFName, + Image.Picture.Bitmap); + end; + Image.Top := NextInsert.Y; + Image.Left := NextInsert.X; + Image.Tag := i; + Image.OnClick := ImageClick; + Image.OnDblclick := ImageDblClick; + Image.Visible := true; + If Image.Picture.Bitmap.Height > CurRowHeight then begin + CurRowHeight := Image.Picture.Bitmap.Height; + end; + Inc (Col); + if Col > COLS_PER_ROW then begin + Col := 0; + Inc (Row); + NextInsert.X := IMAGE_SPACING; + NextInsert.Y := NextInsert.Y + CurRowHeight + IMAGE_SPACING; + end else begin + NextInsert.X := NextInsert.X + Image.Picture.Bitmap.Width + IMAGE_SPACING; + end; + end; +end; + +function TfrmImagePickExisting.GetSelectedImageInfo : TImageInfo; +//Returns nil if not selcted. +begin + if SelectedIndex> -1 then begin + Result := frmImages.ImageInfo[SelectedIndex]; + end else begin + Result := nil; + end; +end; + +function TfrmImagePickExisting.GetImageFName : string; +var + Rec : TImageInfo; +begin + Rec := GetSelectedImageInfo; + if Assigned(Rec) then begin + Result := Rec.CacheFName; + end else begin + Result := ''; + end; +end; + +procedure TfrmImagePickExisting.BoxImage(Index: integer; Selected : boolean); +var + Image : TImage; + Rect : TRect; +begin + if (Index < 0) or (Index >= ShownImagesList.Count) then exit; + Image := TImage(ShownImagesList.Items[Index]); + if Image = nil then exit; + Rect.Top := 0; Rect.Left := 0; + Rect.Right := Image.Picture.Bitmap.Width-1; + Rect.Bottom := Image.Picture.Bitmap.Height-1; + if Selected then begin + Image.Canvas.Pen.Color := clRed; + end else begin + Image.Canvas.Pen.Color := clBtnFace; + end; + Image.Canvas.PenPos := Rect.TopLeft; + Image.Canvas.LineTo(Rect.Left,Rect.Bottom); + Image.Canvas.LineTo(Rect.Right,Rect.Bottom); + Image.Canvas.LineTo(Rect.Right,Rect.Top); + Image.Canvas.LineTo(Rect.Left,Rect.Top); + //Image.Canvas.Rectangle(Rect); //This fills in center with brush. +end; + + +end. + Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fImagePickPDF.dfm =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fImagePickPDF.dfm (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fImagePickPDF.dfm (revision 801) @@ -1,8 +1,8 @@ object frmImagePickPDF: TfrmImagePickPDF - Left = 228 - Top = 122 + Left = 273 + Top = 123 Width = 742 Height = 581 - Caption = 'Select a PDF file' + Caption = 'Select a Portable Document Format (PDF) File' Color = clBtnFace Font.Charset = DEFAULT_CHARSET @@ -19,5 +19,5 @@ object UDSplitter: TSplitter Left = 0 - Top = 185 + Top = 153 Width = 734 Height = 3 @@ -29,5 +29,5 @@ Top = 0 Width = 734 - Height = 185 + Height = 153 Align = alTop BevelOuter = bvNone @@ -37,5 +37,5 @@ Top = 0 Width = 5 - Height = 185 + Height = 153 end object pnlTopLeft: TPanel @@ -43,5 +43,5 @@ Top = 0 Width = 361 - Height = 185 + Height = 153 Align = alLeft BevelOuter = bvLowered @@ -49,5 +49,5 @@ DesignSize = ( 361 - 185) + 153) object DriveComboBox: TDriveComboBox Left = 8 @@ -63,5 +63,5 @@ Top = 32 Width = 345 - Height = 121 + Height = 89 Anchors = [akLeft, akTop, akRight, akBottom] FileList = FileListBox @@ -71,5 +71,5 @@ object FilterComboBox: TFilterComboBox Left = 8 - Top = 160 + Top = 128 Width = 345 Height = 21 @@ -84,5 +84,5 @@ Top = 0 Width = 368 - Height = 185 + Height = 153 Align = alClient BevelOuter = bvNone @@ -92,5 +92,5 @@ Top = 0 Width = 368 - Height = 185 + Height = 153 Align = alClient Font.Charset = DEFAULT_CHARSET @@ -111,12 +111,12 @@ object pnlBottom: TPanel Left = 0 - Top = 188 + Top = 156 Width = 734 - Height = 359 + Height = 391 Align = alClient TabOrder = 1 object pnlButtons: TPanel Left = 1 - Top = 312 + Top = 344 Width = 732 Height = 46 @@ -228,9 +228,9 @@ Top = 1 Width = 732 - Height = 311 + Height = 343 Align = alClient TabOrder = 1 ControlData = { - 4C000000A84B0000252000000000000000000000000000000000000000000000 + 4C000000A84B0000732300000000000000000000000000000000000000000000 000000004C000000000000000000000001000000E0D057007335CF11AE690800 2B2E126208000000000000004C0000000114020000000000C000000000000046 Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtQuery.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtQuery.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fPtQuery.pas (revision 801) @@ -105,5 +105,6 @@ cmd := cmd + '^' + JobNumber; RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; if RPCBrokerV.Results.Count > 0 then begin RPCResult := RPCBrokerV.Results[0] @@ -126,5 +127,6 @@ cmd := cmd + '^' + SearchFileNumber + '^' + SearchString; RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; if RPCBrokerV.Results.Count > 0 then begin RPCResult := RPCBrokerV.Results[0] @@ -150,5 +152,6 @@ cmd := cmd + '^' + JobNumber + '^' + FldNum; RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; frmRPCResults.listRPCResults.Clear; Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fWebTab.dfm =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fWebTab.dfm (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/fWebTab.dfm (revision 801) @@ -13,5 +13,4 @@ OldCreateOrder = True Position = poScreenCenter - OnCreate = FormCreate PixelsPerInch = 96 TextHeight = 13 Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/frmSearchResults.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/frmSearchResults.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/frmSearchResults.pas (revision 801) @@ -62,5 +62,6 @@ cmd := cmd + '^' + JobNum + '^' + Fields; RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; if RPCBrokerV.Results.Count > 0 then begin RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 @@ -103,5 +104,6 @@ cmd := cmd + '^' + JobNum + '^' + StartFrom + '^' + IntToStr(Direction); RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; if RPCBrokerV.Results.Count > 0 then begin RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 Index: cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/uLogic.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/uLogic.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/TMG_Extra/uLogic.pas (revision 801) @@ -973,5 +973,6 @@ cmd := cmd + '^' + FileNum + '^' + StartFrom + '^' + IntToStr(Direction) + '^^' + GetSimple; RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; if RPCBrokerV.Results.Count > 0 then begin RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 @@ -1008,5 +1009,6 @@ RPCBrokerV.param[0].ptype := list; RPCBrokerV.Param[0].Mult['"REQUEST"'] := 'IS WP FIELD^' + FileNum + '^' + FieldNum; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 if piece(RPCResult,'^',1)='-1' then begin @@ -1075,5 +1077,6 @@ cmd := cmd + '^' + FileNum + '^' + StartFrom + '^' + IntToStr(Direction) + '^^' + GetSimple; RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; if RPCBrokerV.Results.Count > 0 then begin RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 @@ -1106,5 +1109,6 @@ cmd := cmd + '^' + FileNum + '^' + StartFrom + '^' + IntToStr(Direction); RPCBrokerV.Param[0].Mult['"REQUEST"'] := cmd; - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; RPCResult := RPCBrokerV.Results[0]; //returns: error: -1; success=1 if piece(RPCResult,'^',1)='-1' then begin Index: cprs/branches/tmg-cprs/CPRS-Chart/UploadImages.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/UploadImages.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/UploadImages.pas (revision 801) @@ -781,4 +781,5 @@ FormRefresh(Sender); frmImagePickPDF.Free; + frmImagePickPDF := nil; end; Index: cprs/branches/tmg-cprs/CPRS-Chart/fImages.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/fImages.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/fImages.pas (revision 801) @@ -41,4 +41,6 @@ published end; + + TImgTransferMethod = (itmDropbox,itmDirect,itmRPC); TfrmImages = class(TfrmPage) @@ -97,6 +99,6 @@ ImageInfoList : TList; LastDisplayedTIUIEN : AnsiString; - CurImageToLoad : integer; - InTimerFn : Boolean; + NumImagesAvailableOnServer : integer; + ImageIndexLastDownloaded : integer; procedure EnsureImageListLoaded(); procedure ClearImageList(); @@ -108,9 +110,13 @@ procedure UpdateImageInfoMemo(Rec: TImageInfo); function FileSize(fileName : wideString) : Int64; + function GetImagesCount : integer; + function GetImageInfo(Index : integer) : TImageInfo; + procedure SetupTimer; public CacheDir : AnsiString; - UseDropBox : boolean; + TransferMethod : TImgTransferMethod; DropBoxDir : string; NullImageName : AnsiString; + DownloadImagesInBackground : boolean; function Decode(input: AnsiString) : AnsiString; function Encode(input: AnsiString) : AnsiString; @@ -127,6 +133,25 @@ function DecodeBarcode(LocalFNamePath,ImageType: AnsiString): AnsiString; procedure EnsureImagesDownloaded(ImagesList : TStringList); + procedure EnsureALLImagesDownloaded; + property ImagesCount : integer read GetImagesCount; + property ImageInfo[index : integer] : TImageInfo read GetImageInfo; + procedure GetThumbnailBitmapForFName (FName : string; Bitmap : TBitmap); + function ThumbnailIndexForFName (FName : string) : integer; published end; + +Const + IMAGE_TRANSFER_METHODS : Array[itmDropbox..itmRPC] of string[32] = ( + 'Dropbox Transfer', 'Direct Access', 'Embedded in RPCs'); + IMAGE_DOWNLOAD_DELAY_BACKGROUND = 30000; + IMAGE_DOWNLOAD_DELAY_FOREGROUND = 100; + NOT_YET_CHECKED_SERVER = -2; + + //NOTE: If order is changed in ThumbsImageList, these numbers should be changed + IMAGE_INDEX_IMAGE = 0; + IMAGE_INDEX_ADOBE = 1; + IMAGE_INDEX_VIDEO = 2; + IMAGE_INDEX_SOUND = 3; + IMAGE_INDEX_MISC = 4; var @@ -157,34 +182,26 @@ begin inherited; - if InTimerFn=false then begin - InTimerFn := true; - EnsureImageListLoaded(); //only does RPC call if CurImageToLoad = 0 - if CurImageToLoad <> -1 then begin //-1 means RPC-> no avail images. - if CurImageToLoad < ImageInfoList.Count then begin - ImageTransferForm.ProgressMsg.Caption := 'Downloading Images'; - //if ImageTransferForm.Visible = false then begin - // ImageTransferForm.Show; - //end; - DownloadToCache(CurImageToLoad); //Only load 1 image per timer firing. - SetupTab(CurImageToLoad); - Inc(CurImageToLoad); - if TabControl.TabIndex < 0 then TabControl.TabIndex := 0; - TabControlChange(self); - end else begin - timLoadImages.Enabled := false; - //ImageTransferForm.ProgressBar.Position := 100; - //Sleep(1000); - //ImageTransferForm.Hide; - end; - end; - InTimerFn := false; - if self.Visible = true then begin - timLoadImages.Interval :=100; - end else begin - timLoadImages.Interval :=30000; //30 sec delay - end; - end; -end; - + timLoadImages.Enabled := false; + EnsureImageListLoaded(); + if NumImagesAvailableOnServer = 0 then exit; + if (ImageIndexLastDownloaded >= (ImageInfoList.Count-1)) then exit; + ImageTransferForm.ProgressMsg.Caption := 'Downloading Images'; + DownloadToCache(ImageIndexLastDownloaded+1); //Only load 1 image per timer firing. + SetupTab(ImageIndexLastDownloaded+1); + Inc(ImageIndexLastDownloaded); + if TabControl.TabIndex < 0 then TabControl.TabIndex := 0; + TabControlChange(self); + SetupTimer; +end; + +procedure TfrmImages.SetupTimer; +begin + if DownloadImagesInBackground then begin + timLoadImages.Interval := IMAGE_DOWNLOAD_DELAY_BACKGROUND; + end else begin + timLoadImages.Interval := IMAGE_DOWNLOAD_DELAY_FOREGROUND; + end; + timLoadImages.Enabled := true; +end; procedure TfrmImages.EnsureImagesDownloaded(ImagesList : TStringList); @@ -219,4 +236,18 @@ end; +procedure TfrmImages.EnsureALLImagesDownloaded; +//This function's goal is to download ALL images in the FOREground. +begin + EnsureImageListLoaded(); + if NumImagesAvailableOnServer = 0 then exit; + ImageTransferForm.ProgressMsg.Caption := 'Downloading Images'; + while (ImageIndexLastDownloaded < (ImageInfoList.Count-1)) do begin + DownloadToCache(ImageIndexLastDownloaded+1); //Only load 1 image per timer firing. + SetupTab(ImageIndexLastDownloaded+1); + Inc(ImageIndexLastDownloaded); + if TabControl.TabIndex < 0 then TabControl.TabIndex := 0; + TabControlChange(self); + end; +end; { TPage common methods --------------------------------------------------------------------- } @@ -241,8 +272,8 @@ begin inherited; - InTimerFn:=false; LastDisplayedTIUIEN := '0'; ImageInfoList := TList.Create; - CurImageToLoad := 0; + ClearImageList(); //sets up other needed variables. + DownloadImagesInBackground := true; CacheDir := ExtractFilePath(ParamStr(0))+ 'Cache'; //NullImageName := ExtractFilePath(ParamStr(0)) + 'images\blank.htm'; @@ -250,10 +281,10 @@ if not DirectoryExists(CacheDir) then ForceDirectories(CacheDir); - //UseDropBox := uTMGOptions.ReadBool('Use dropbox directory for transfers',false); - if uTMGOptions.ReadInteger('ImageTransferMethod',0) = 0 then begin + TransferMethod := TImgTransferMethod(uTMGOptions.ReadInteger('ImageTransferMethod',2)); + {if uTMGOptions.ReadInteger('ImageTransferMethod',0) = 0 then begin UseDropBox := True; end else begin UseDropBox := False; - end; + end;} DropBoxDir := uTMGOptions.ReadString('Dropbox directory','??'); if DropBoxDir='??' then begin //just on first run. @@ -273,12 +304,10 @@ procedure TfrmImages.FormShow(Sender: TObject); -var - TIUIEN : AnsiString; - +var TIUIEN : AnsiString; begin inherited; TIUIEN := IntToStr(frmNotes.lstNotes.ItemID); - timLoadImages.Enabled := true; - timLoadImages.Interval := 100; + DownloadImagesInBackground := false; + SetupTimer; if LastDisplayedTIUIEN <> TIUIEN then begin UpdateNoteInfoMemo(); @@ -380,40 +409,58 @@ Bitmap.Height := ThumbsImageList.Height; index := ThumbsImageList.Add(Bitmap,nil); - TImageInfo(ImageInfoList[i]).TabImageIndex := index; + //TImageInfo(ImageInfoList[i]).TabImageIndex := index; + Rec.TabImageIndex := index; Bitmap.Free; end else begin - Ext := LowerCase(ExtractFileExt(Rec.CacheFName)); - Ext := MidStr(Ext,2,99); - if (Ext='jpg') - or (Ext='jpeg') - or (Ext='png') - or (Ext='tif') - or (Ext='tiff') - or (Ext='gif') - or (Ext='bmp') then begin - TImageInfo(ImageInfoList[i]).TabImageIndex := 0; //camera image - end else - if (Ext='pdf') then begin - TImageInfo(ImageInfoList[i]).TabImageIndex := 1; //adobe icon - end else - if (Ext='avi') - or (Ext='qt') - or (Ext='mpg') - or (Ext='mpeg') then begin - TImageInfo(ImageInfoList[i]).TabImageIndex := 2; //video icon - end else - if (Ext='mp3') - or (Ext='wma') - or (Ext='au') - or (Ext='wav') then begin - TImageInfo(ImageInfoList[i]).TabImageIndex := 3; //sound icon - end else - begin - TImageInfo(ImageInfoList[i]).TabImageIndex := 4; // misc icon - end; + Rec.TabImageIndex := ThumbnailIndexForFName(Rec.CacheFName); end; end; TabControl.Tabs.Add(' '); //add the tab. Thumbnail should exist before this end; +end; + +function TfrmImages.ThumbnailIndexForFName (FName : string) : integer; +var + index : integer; + Ext : AnsiString; +begin + Result := 4; //default + Ext := LowerCase(ExtractFileExt(FName)); + Ext := MidStr(Ext,2,99); + if (Ext='jpg') + or (Ext='jpeg') + or (Ext='png') + or (Ext='tif') + or (Ext='tiff') + or (Ext='gif') + or (Ext='bmp') then begin + Result := IMAGE_INDEX_IMAGE; //camera image + end else + if (Ext='pdf') then begin + Result := IMAGE_INDEX_ADOBE; //adobe icon + end else + if (Ext='avi') + or (Ext='qt') + or (Ext='mpg') + or (Ext='mpeg') then begin + Result := IMAGE_INDEX_VIDEO; //video icon + end else + if (Ext='mp3') + or (Ext='wma') + or (Ext='au') + or (Ext='wav') then begin + Result := IMAGE_INDEX_SOUND; //sound icon + end else + begin + Result := IMAGE_INDEX_MISC; // misc icon + end; +end; + + +procedure TfrmImages.GetThumbnailBitmapForFName (FName : string; Bitmap : TBitmap); +var index: integer; +begin + index := ThumbnailIndexForFName(FName); + ThumbsImageList.GetBitmap(index,Bitmap); end; @@ -437,4 +484,6 @@ ImageInfoList.Delete(i); end; + NumImagesAvailableOnServer := NOT_YET_CHECKED_SERVER; + ImageIndexLastDownloaded := -1; end; @@ -442,11 +491,11 @@ procedure TfrmImages.EnsureImageListLoaded(); begin - if CurImageToLoad = 0 then begin + if NumImagesAvailableOnServer = NOT_YET_CHECKED_SERVER then begin GetImageList(); - if ImageInfoList.Count=0 then CurImageToLoad := -1; end; end; procedure TfrmImages.GetImageList(); +//Sets up ImageInfoList var i,j : integer; @@ -470,5 +519,4 @@ on E: Exception do exit; end; - //----MOVED StatusText('Retrieving images information...'); CallV('MAG3 CPRS TIU NOTE', [TIUIEN]); @@ -530,6 +578,6 @@ end; end; - //----END MOVED StatusText(''); + NumImagesAvailableOnServer := ImageInfoList.Count; end; @@ -628,8 +676,10 @@ result := false; //default of failure if not FileExists(LocalFNamePath) then exit; - if UseDropBox then begin + //if UseDropBox then begin + if TransferMethod = itmDropbox then begin Result := UploadFileViaDropBox(LocalFNamePath,FPath,FName,CurrentImage,TotalImages); exit; end; + //LATER add support for itmDirect mode try InFile := TFileStream.Create(LocalFNamePath,fmOpenRead or fmShareCompat); @@ -639,5 +689,4 @@ // (or I could, but I'm not going to change the RPC broker...) ImageTransferForm.setMax(InFile.Size); - //ImageTransferForm.ResetStartTime; ImageTransferForm.ProgressMsg.Caption := 'Preparing to upload...'; ImageTransferForm.Show; @@ -786,8 +835,10 @@ DeleteFile(LocalSaveFNamePath); end; - if UseDropBox then begin + //if UseDropBox then begin + if TransferMethod = itmDropbox then begin Result := DownloadFileViaDropBox(FPath,FName,LocalSaveFNamePath,CurrentImage,TotalImages); exit; end; + //LATER add support for itmDirect mode Result := true; //default to success; StatusText('Retrieving full image...'); @@ -970,10 +1021,9 @@ begin ClearTabPages(); - CurImageToLoad := 0; //a -1 would signal that no images avail to load. - //this will start downloading images after 5 second delay (so that if + DownloadImagesInBackground := true; + SetupTimer; + //This will start downloading images after few second delay (so that if //user is just browsing past note, this won't waste effort. //If user selects images tab, then load will occur without delay. - timLoadImages.Enabled := true; - timLoadImages.Interval := 60000; //60 sec delay -- also set in timLoadImagesTimer //Note: OnTimer calls timLoadImagesTimer() UploadImagesButton.Enabled := EditIsActive; @@ -1028,5 +1078,5 @@ if not IsAbortResult(AddResult) then begin NewNoteSelected(true); //force a reload to show recently added image. - timLoadImages.Interval := 100; + timLoadImages.Interval := IMAGE_DOWNLOAD_DELAY_FOREGROUND; Node := TORTreeNode(frmNotes.tvNotes.Selected); case Node.StateIndex of @@ -1042,4 +1092,6 @@ begin inherited; + DownloadImagesInBackground := true; + // Application.MessageBox('Here I can hide images.','title'); end; @@ -1277,4 +1329,22 @@ end; +function TfrmImages.GetImagesCount : integer; +//Returns number of images possible, not just those already downloaded. +begin + EnsureImageListLoaded(); + Result := NumImagesAvailableOnServer; +end; + +function TfrmImages.GetImageInfo(Index : integer) : TImageInfo; +begin + if (Index > -1) and (Index < ImageInfoList.Count) then begin + Result := TImageInfo(ImageInfoList[Index]); + end else begin + Result := nil; + end; +end; + + + initialization //put init code here Index: cprs/branches/tmg-cprs/CPRS-Chart/fNotes.dfm =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/fNotes.dfm (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/fNotes.dfm (revision 801) @@ -1,7 +1,7 @@ inherited frmNotes: TfrmNotes - Left = 341 - Top = 478 - Width = 341 - Height = 256 + Left = 277 + Top = 211 + Width = 490 + Height = 358 HelpContext = 5000 Caption = 'Progress Notes Page' @@ -16,15 +16,15 @@ TextHeight = 13 inherited shpPageBottom: TShape - Top = 197 - Width = 333 + Top = 299 + Width = 482 end inherited sptHorz: TSplitter Left = 64 - Height = 197 + Height = 299 OnCanResize = sptHorzCanResize end inherited pnlLeft: TPanel Width = 64 - Height = 197 + Height = 299 object lblNotes: TOROffsetLabel Left = 0 @@ -43,5 +43,5 @@ object lblSpace1: TLabel Left = 0 - Top = 152 + Top = 254 Width = 64 Height = 3 @@ -52,5 +52,5 @@ object cmdNewNote: TORAlignButton Left = 0 - Top = 155 + Top = 257 Width = 64 Height = 21 @@ -64,5 +64,5 @@ object cmdPCE: TORAlignButton Left = 0 - Top = 176 + Top = 278 Width = 64 Height = 21 @@ -79,5 +79,5 @@ Top = 19 Width = 64 - Height = 133 + Height = 235 Align = alClient BevelOuter = bvNone @@ -85,5 +85,5 @@ object splDrawers: TSplitter Left = 0 - Top = 130 + Top = 232 Width = 64 Height = 3 @@ -115,5 +115,5 @@ Top = 0 Width = 64 - Height = 130 + Height = 232 Align = alClient Constraints.MinWidth = 30 @@ -142,10 +142,10 @@ inherited pnlRight: TPanel Left = 68 - Width = 265 - Height = 197 + Width = 414 + Height = 299 object sptVert: TSplitter Left = 0 - Top = 148 - Width = 265 + Top = 250 + Width = 414 Height = 4 Cursor = crVSplit @@ -154,6 +154,6 @@ object memPCEShow: TRichEdit Left = 0 - Top = 152 - Width = 265 + Top = 254 + Width = 414 Height = 45 Align = alBottom @@ -170,6 +170,6 @@ Left = 0 Top = 0 - Width = 265 - Height = 148 + Width = 414 + Height = 250 Align = alClient BevelOuter = bvNone @@ -180,5 +180,5 @@ Left = 0 Top = 0 - Width = 265 + Width = 414 Height = 67 Align = alTop @@ -187,5 +187,5 @@ OnResize = pnlFieldsResize DesignSize = ( - 265 + 414 67) object bvlNewTitle: TBevel @@ -209,5 +209,5 @@ end object lblAuthor: TStaticText - Left = 47 + Left = 196 Top = 6 Width = 152 @@ -232,5 +232,5 @@ end object lblCosigner: TStaticText - Left = -48 + Left = 101 Top = 21 Width = 243 @@ -275,5 +275,5 @@ end object cmdChange: TButton - Left = 201 + Left = 350 Top = 6 Width = 58 @@ -288,5 +288,5 @@ Left = 48 Top = 40 - Width = 211 + Width = 360 Height = 21 Hint = 'Subject is limited to a maximum of 80 characters.' @@ -303,6 +303,6 @@ Left = 0 Top = 67 - Width = 265 - Height = 81 + Width = 414 + Height = 183 Align = alClient BevelOuter = bvNone @@ -312,6 +312,6 @@ Left = 0 Top = 0 - Width = 265 - Height = 81 + Width = 414 + Height = 183 Align = alClient Font.Charset = DEFAULT_CHARSET @@ -335,6 +335,6 @@ Left = 0 Top = 67 - Width = 265 - Height = 81 + Width = 414 + Height = 183 Align = alClient BevelOuter = bvNone @@ -345,6 +345,6 @@ Left = 0 Top = 25 - Width = 265 - Height = 56 + Width = 414 + Height = 158 Align = alClient BevelOuter = bvNone @@ -354,5 +354,5 @@ Left = 0 Top = 0 - Width = 265 + Width = 414 Height = 25 AutoSize = True @@ -814,6 +814,6 @@ Left = 0 Top = 0 - Width = 265 - Height = 148 + Width = 414 + Height = 250 Align = alClient BevelOuter = bvNone @@ -823,5 +823,5 @@ Left = 0 Top = 0 - Width = 265 + Width = 414 Height = 19 Align = alTop @@ -835,5 +835,5 @@ Left = 0 Top = 113 - Width = 265 + Width = 414 Height = 3 Cursor = crVSplit @@ -843,11 +843,11 @@ Left = 0 Top = 116 - Width = 265 - Height = 32 + Width = 414 + Height = 134 TabStop = False Align = alClient TabOrder = 2 ControlData = { - 4C000000631B00004F0300000000000000000000000000000000000000000000 + 4C000000CA2A0000D90D00000000000000000000000000000000000000000000 000000004C000000000000000000000001000000E0D057007335CF11AE690800 2B2E126208000000000000004C0000000114020000000000C000000000000046 @@ -858,6 +858,6 @@ Left = 0 Top = 116 - Width = 265 - Height = 32 + Width = 414 + Height = 134 Align = alClient Color = clCream @@ -885,5 +885,5 @@ Left = 0 Top = 19 - Width = 265 + Width = 414 Height = 94 Align = alTop @@ -934,6 +934,6 @@ Left = 0 Top = 116 - Width = 265 - Height = 32 + Width = 414 + Height = 134 Align = alClient BevelOuter = bvNone @@ -1448,5 +1448,5 @@ LangData = { 080066726D4E6F746573010200000001000000070043617074696F6E02000000 - 080048656C7046696C6501A30000000D0073687050616765426F74746F6D0000 + 080048656C7046696C6501A60000000D0073687050616765426F74746F6D0000 0700737074486F727A00000700706E6C4C65667400000800706E6C5269676874 000008006C626C4E6F746573010100000003000000070043617074696F6E0009 @@ -1605,5 +1605,40 @@ 9E000000040048696E74000C0062746E4261636B436F6C6F7201010000009F00 0000040048696E7400080062746E496D6167650101000000A000000004004869 - 6E7400} + 6E74000D00706F707570416464496D616765000016006D6E7553656C65637445 + 78697374696E67496D6167650101000000A1000000070043617074696F6E000E + 006D6E754164644E6577496D6167650101000000A2000000070043617074696F + 6E00} + end + object popupAddImage: TPopupMenu + Left = 444 + Top = 264 + object mnuSelectExistingImage: TMenuItem + Bitmap.Data = { + F6000000424DF600000000000000760000002800000010000000100000000100 + 0400000000008000000000000000000000001000000000000000000000000000 + 8000008000000080800080000000800080008080000080808000C0C0C0000000 + FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF00FFFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFF7000000000FFFFFF7CCCCCCCC0FFFFFF7CCCCCCCC + 0FFFFFF7CCCCCC220FFFFFF7EFEF22220FFFFFF7FEFEFE220FFFFFF7E88FEFEF + 0FFFFFF78FB8FEFE0FFFFFF78BF8EFEF0FFFFFF7F88EFEFE0FFFFFF7EFEFEFEF + 0FFFFFF7777777777FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF} + Caption = 'Select &Existing Image' + OnClick = mnuSelectExistingImageClick + end + object mnuAddNewImage: TMenuItem + Bitmap.Data = { + 36010000424D3601000000000000760000002800000014000000100000000100 + 040000000000C000000000000000000000001000000000000000000000000000 + 8000008000000080800080000000800080008080000080808000C0C0C0000000 + FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF00FFFFFFFFFFFF + FFFFFFFF0000FFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFF0000FFF0 + 000000000FFFFFFF0000FF00B8B8B8B8B0FFFFFF0000FF0F0B8B8B8B8B0FFFFF + 0000FF0BF0B8B8B8B8B0FFFF0000FF0FBF0000000000FFFF0000FF0BFBFBFBFB + 0FFFFFFF0000FF0FBFBFBFBF0FFFFFFF0000FF0BFBFBF000FFFFFFFF0000FFF0 + BFBF0FFFFFFFFFFF0000FFF700007FFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFF + 0000FFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFF0000} + Caption = '&Add New Image' + OnClick = mnuAddNewImageClick + end end end Index: cprs/branches/tmg-cprs/CPRS-Chart/fNotes.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/fNotes.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/fNotes.pas (revision 801) @@ -180,5 +180,8 @@ btnTextColor: TSpeedButton; //kt 8/09 btnBackColor: TSpeedButton; //kt 8/09 - btnImage: TSpeedButton; //kt 4/10 + btnImage: TSpeedButton; + popupAddImage: TPopupMenu; + mnuSelectExistingImage: TMenuItem; + mnuAddNewImage: TMenuItem; //kt 4/10 procedure mnuChartTabClick(Sender: TObject); procedure lstNotesClick(Sender: TObject); @@ -289,5 +292,7 @@ procedure cbFontSizeChange(Sender: TObject); //kt 8/09 procedure btnImageClick(Sender: TObject); //kt 4/10 - procedure popNoteMemoHTMLFormatClick(Sender: TObject); //kt 8/09 + procedure popNoteMemoHTMLFormatClick(Sender: TObject); + procedure mnuAddNewImageClick(Sender: TObject); + procedure mnuSelectExistingImageClick(Sender: TObject); //kt 8/09 private FNavigatingTab : Boolean; //Currently Using tab to navigate @@ -401,4 +406,5 @@ //fImages, {//kt added 9-20-05} fOptionsNotes, //kt 8/09 + fImagePickExisting, //kt 6/16/10 rHTMLTools, fImages, UploadImages; {//kt added 5-27-05 for IsHTMLDocument} @@ -4640,4 +4646,16 @@ procedure TfrmNotes.btnImageClick(Sender: TObject); //kt added function +begin + if frmImages.ImagesCount > 0 then begin + popupAddImage.Popup(Mouse.CursorPos.X, Mouse.CursorPos.Y); + //Will allow user to : + // Cancel, or trigger mnuAddNewImageClick or mnuSelectExistingImageClick + end else begin + mnuAddNewImageClick(self); + end; +end; + +procedure TfrmNotes.mnuAddNewImageClick(Sender: TObject); +//kt added function var i, AddResult: integer; @@ -4656,4 +4674,27 @@ end; end; + +procedure TfrmNotes.mnuSelectExistingImageClick(Sender: TObject); +//kt added function +var + oneImage: string; + ImageFName : string; +begin + inherited; + frmImagePickExisting := TfrmImagePickExisting.Create(Self); + if frmImagePickExisting.ShowModal = mrOK then begin + ImageFName := frmImagePickExisting.SelectedImageFName; + if ImageFName <> '' then begin + if frmImages.ThumbnailIndexForFName(ImageFName) = IMAGE_INDEX_IMAGE then begin + oneImage := ''; + end else begin + oneImage := ''; + end; + HTMLEditor.InsertHTMLAtCaret(oneImage+#13#10); + end; + end; + FreeAndNil(frmImagePickExisting); +end; + procedure TfrmNotes.btnCenterAlignClick(Sender: TObject); @@ -4849,4 +4890,6 @@ end; + + initialization uPCEEdit := TPCEData.Create; Index: cprs/branches/tmg-cprs/CPRS-Chart/fPtAdd.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/fPtAdd.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/fPtAdd.pas (revision 801) @@ -468,5 +468,6 @@ //CheckPost('PtType',PtType); - RPCBrokerV.Call; + //RPCBrokerV.Call; + CallBroker; tempResult := strtoint(piece(RPCBrokerV.Results.Strings[0],'^',1)); DFN := tempResult; Index: cprs/branches/tmg-cprs/CPRS-Chart/fSplash.dfm =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/fSplash.dfm (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/fSplash.dfm (revision 801) @@ -4139,8 +4139,8 @@ Left = 310 Top = 431 - Width = 162 + Width = 168 Height = 17 Alignment = taCenter - Caption = 'TMG Customization 2.0; 6.8.2010' + Caption = 'TMG Customization 2.0; 6.16.2010' Font.Charset = ANSI_CHARSET Font.Color = clGray Index: cprs/branches/tmg-cprs/CPRS-Chart/rCore.pas =================================================================== --- cprs/branches/tmg-cprs/CPRS-Chart/rCore.pas (revision 800) +++ cprs/branches/tmg-cprs/CPRS-Chart/rCore.pas (revision 801) @@ -238,7 +238,14 @@ //end vwpt Result := AnsiReplaceStr(Result,'-',''); //kt 6/9/10 -- fix when SSN passed from server with imbedded dashes + //kt start mod + if Length(Result) = 8 then begin + Result := Copy(Result,1,3) + '-' + Copy(Result,4,2) + '-' + Copy(Result,6,Length(Result)) + end; + //kt end mod + { //kt original block below if Length(x) > 8 then Result := Copy(x,1,3) + '-' + Copy(x,4,2) + '-' + Copy(x,6,Length(x)) else Result := x; + } end;