Rev 496 | Rev 499 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 496 | Rev 498 | ||
|---|---|---|---|
| Line 341... | Line 341... | ||
| 341 | extern int previewerr; |
341 | extern int previewerr; |
| 342 | 342 | ||
| 343 | StandardFileReply sfr; |
343 | StandardFileReply sfr; |
| 344 | NavReplyRecord reply; |
344 | NavReplyRecord reply; |
| 345 | static OSType types[] = {TEXT_FILETYPE,PS_FILTER_FILETYPE}; |
345 | static OSType types[] = {TEXT_FILETYPE,PS_FILTER_FILETYPE}; |
| 346 | TCHAR*reason; |
346 | TCHAR*reason = NULL; |
| 347 | HINSTANCE hShellRes; |
347 | HINSTANCE hShellRes; |
| 348 | InternalState bakState; |
348 | InternalState bakState; |
| 349 | 349 | ||
| 350 | switch(item){ |
350 | switch(item){ |
| 351 | #ifdef MAC_ENV |
351 | #ifdef MAC_ENV |
| Line 409... | Line 409... | ||
| 409 | strcpy_advance(&tmp1, (TCHAR*)TEXT(" (*.*)")); tmp1++; |
409 | strcpy_advance(&tmp1, (TCHAR*)TEXT(" (*.*)")); tmp1++; |
| 410 | strcpy_advance(&tmp1, (TCHAR*)TEXT("*.*")); tmp1++; |
410 | strcpy_advance(&tmp1, (TCHAR*)TEXT("*.*")); tmp1++; |
| 411 | 411 | ||
| 412 | loadDlgRet = !gdata->standalone && choosefiletypes( |
412 | loadDlgRet = !gdata->standalone && choosefiletypes( |
| 413 | #ifdef MAC_ENV |
413 | #ifdef MAC_ENV |
| 414 | (StringPtr)_strdup("\pChoose filter settings"), // "\p" means "Pascal string" // TODO (Not important yet): TRANSLATE |
414 | "\pChoose filter settings", // "\p" means "Pascal string" // TODO (Not important yet): TRANSLATE |
| 415 | &sfr, &reply, types, 2, |
415 | &sfr, &reply, types, 2, |
| 416 | filters |
416 | filters |
| 417 | #else |
417 | #else |
| 418 | title, &sfr, &reply, types, 2, |
418 | title, &sfr, &reply, types, 2, |
| 419 | filters, gdata->hWndMainDlg |
419 | filters, gdata->hWndMainDlg |
| Line 435... | Line 435... | ||
| 435 | alertuser_id(MSG_CANNOT_LOAD_SETTINGS_ID, reason); |
435 | alertuser_id(MSG_CANNOT_LOAD_SETTINGS_ID, reason); |
| 436 | 436 | ||
| 437 | // Restore |
437 | // Restore |
| 438 | restoreInternalState(bakState); |
438 | restoreInternalState(bakState); |
| 439 | } |
439 | } |
| - | 440 | if (reason) FF_GetMsg_Free(reason); |
|
| 440 | } |
441 | } |
| 441 | break; |
442 | break; |
| 442 | } |
443 | } |
| 443 | case SAVEITEM: |
444 | case SAVEITEM: |
| 444 | { |
445 | { |
| Line 476... | Line 477... | ||
| 476 | strcpy_advance(&tmp1, (TCHAR*)TEXT(" (*.*)")); tmp1++; |
477 | strcpy_advance(&tmp1, (TCHAR*)TEXT(" (*.*)")); tmp1++; |
| 477 | strcpy_advance(&tmp1, (TCHAR*)TEXT("*.*")); tmp1++; |
478 | strcpy_advance(&tmp1, (TCHAR*)TEXT("*.*")); tmp1++; |
| 478 | 479 | ||
| 479 | saveDlgRet = !gdata->standalone && putfile( |
480 | saveDlgRet = !gdata->standalone && putfile( |
| 480 | #ifdef MAC_ENV |
481 | #ifdef MAC_ENV |
| 481 | (StringPtr)_strdup("\pSave filter settings"), // "\p" means "Pascal string" // TODO (Not important yet): TRANSLATE |
482 | "\pSave filter settings", // "\p" means "Pascal string" // TODO (Not important yet): TRANSLATE |
| 482 | (StringPtr)_strdup("\0"), |
483 | "\0", |
| 483 | TEXT_FILETYPE, SIG_SIMPLETEXT, &reply, &sfr, |
484 | TEXT_FILETYPE, SIG_SIMPLETEXT, &reply, &sfr, |
| 484 | "afs", |
485 | "afs", |
| 485 | filters, 1 |
486 | filters, 1 |
| 486 | #else |
487 | #else |
| 487 | title, |
488 | title, |