Changeset 522
- Timestamp:
- Jul 31, 2016, 9:14:35 PM (5 years ago)
- Location:
- trunk/Lucide
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Lucide/gui/fontsInfoDlg.cpp
r407 r522 46 46 #include "cpconv.h" 47 47 48 #define INCL_EXCEPTQ_CLASS 49 #define INCL_LOADEXCEPTQ 50 #include "exceptq.h" 51 48 52 49 53 FontsInfoDlg::FontsInfoDlg( HWND hWndFrame, LuDocument *_doc ) … … 56 60 type = newstrdupL( FONTINFO_TYPE ); 57 61 embed = newstrdupL( FONTINFO_EMBEDDED ); 62 subname = newstrdupL( FONTINFO_SUBNAME ); 58 63 emb_notembedded = newstrdupL( FONTINFO_EMBED_NOT_EMBEDDED ); 59 64 emb_embedded = newstrdupL( FONTINFO_EMBED_EMBEDDED ); … … 66 71 delete type; 67 72 delete embed; 73 delete subname; 68 74 delete emb_notembedded; 69 75 delete emb_embedded; … … 84 90 PSZ type; 85 91 PSZ embed; 92 PSZ subname; 86 93 }; 87 94 … … 119 126 break; 120 127 } 121 128 r->subname = newstrdup( fonts->_buffer[i].subname ); 129 122 130 RECORDINSERT ri; 123 131 ri.cb = sizeof( RECORDINSERT ); … … 136 144 void FontsInfoDlg::loadthread( void *p ) 137 145 { 146 ScopedExceptqLoader sel; 138 147 FontsInfoDlg *_this = (FontsInfoDlg *)p; 148 139 149 HAB thab = WinInitialize( 0 ); 140 150 HMQ thmq = WinCreateMsgQueue( thab, 0 ); … … 162 172 *str += " | "; 163 173 *str += rec->embed; 174 *str += " | "; 175 *str += rec->subname; 164 176 return true; 165 177 } … … 208 220 209 221 PFIELDINFO pFieldInfo = (PFIELDINFO)WinSendMsg( _this->hContainer, CM_ALLOCDETAILFIELDINFO, 210 MPFROMSHORT( 3), MPVOID );222 MPFROMSHORT( 4 ), MPVOID ); 211 223 PFIELDINFO pFldInfo = pFieldInfo; 212 224 pFldInfo->cb = sizeof( FIELDINFO ); … … 227 239 pFldInfo->pTitleData = (PVOID)_this->embed; 228 240 pFldInfo->offStruct = FIELDOFFSET( ListRec, embed ); 241 pFldInfo = pFldInfo->pNextFieldInfo; 242 pFldInfo->cb = sizeof( FIELDINFO ); 243 pFldInfo->flData = CFA_STRING | CFA_HORZSEPARATOR | CFA_SEPARATOR; 244 pFldInfo->flTitle = CFA_CENTER; 245 pFldInfo->pTitleData = (PVOID)_this->subname; 246 pFldInfo->offStruct = FIELDOFFSET( ListRec, subname ); 229 247 230 248 FIELDINFOINSERT fieldInfoInsert; 231 249 fieldInfoInsert.cb = sizeof( FIELDINFOINSERT ); 232 250 fieldInfoInsert.pFieldInfoOrder = (PFIELDINFO)CMA_FIRST; 233 fieldInfoInsert.cFieldInfoInsert = 3;251 fieldInfoInsert.cFieldInfoInsert = 4; 234 252 fieldInfoInsert.fInvalidateFieldInfo = TRUE; 235 253 WinSendMsg( _this->hContainer, CM_INSERTDETAILFIELDINFO, … … 252 270 delete pr->type; 253 271 delete pr->embed; 272 delete pr->subname; 254 273 pr = (ListRec *)WinSendMsg( _this->hContainer, CM_QUERYRECORD, 255 274 MPFROMP( pr ), MPFROM2SHORT( CMA_NEXT, CMA_ITEMORDER ) ); -
trunk/Lucide/gui/fontsInfoDlg.h
r367 r522 63 63 64 64 // columns titles 65 PSZ name, type, embed ;65 PSZ name, type, embed, subname; 66 66 // embed values 67 67 PSZ emb_notembedded, emb_embedded, emb_embeddedsubset; -
trunk/Lucide/gui/messages.cpp
r459 r522 96 96 const char *FONTINFO_TYPE = "FONTINFO_TYPE"; 97 97 const char *FONTINFO_EMBEDDED = "FONTINFO_EMBEDDED"; 98 const char *FONTINFO_SUBNAME = "FONTINFO_SUBNAME"; 98 99 // 'Fonts Info' Embedded types 99 100 const char *FONTINFO_EMBED_NOT_EMBEDDED = "FONTINFO_EMBED_NOT_EMBEDDED"; -
trunk/Lucide/gui/messages.h
r459 r522 97 97 extern const char *FONTINFO_TYPE; 98 98 extern const char *FONTINFO_EMBEDDED; 99 extern const char *FONTINFO_SUBNAME; 99 100 // 'Fonts Info' Embedded types 100 101 extern const char *FONTINFO_EMBED_NOT_EMBEDDED; -
trunk/Lucide/plugins/ludoc/lutypes.h
r367 r522 82 82 char *type; 83 83 short embedded; 84 char *subname; 84 85 }; 85 86 -
trunk/Lucide/plugins/lupoppler/lupoppler.cpp
r520 r522 871 871 fonts->_buffer[i].type = NULL; 872 872 fonts->_buffer[i].embedded = NULL; 873 fonts->_buffer[i].subname = NULL; 873 874 874 875 FontInfo *info = (FontInfo *)items->get( i ); … … 919 920 fonts->_buffer[i].embedded = LU_FONTEMBED_NOT_EMBEDDED; 920 921 } 922 // SubstituteName 923 GooString *ggnm = info->getSubstituteName(); 924 if ( ggnm != NULL ) 925 { 926 fonts->_buffer[i].subname = somstrdup( ggnm->getCString() ); 927 } 921 928 } 922 929
Note: See TracChangeset
for help on using the changeset viewer.