From 7a41bea055e4533c1ba6af6693aeac75d18dcfe7 Mon Sep 17 00:00:00 2001 From: Klaas van Gend Date: Fri, 3 Sep 1999 12:41:23 +0000 Subject: [PATCH] Completed PrintDlg32 resource stringtable. --- dlls/commdlg/cdlg.h | 49 ++++++++++++++++++++++- dlls/commdlg/cdlg_En.rc | 87 +++++++++++++++++++++++------------------ dlls/commdlg/printdlg.c | 24 +++++++----- 3 files changed, 111 insertions(+), 49 deletions(-) diff --git a/dlls/commdlg/cdlg.h b/dlls/commdlg/cdlg.h index da3207f6429..359240166f9 100644 --- a/dlls/commdlg/cdlg.h +++ b/dlls/commdlg/cdlg.h @@ -37,8 +37,53 @@ typedef struct { } COMDLG32_FR_Data; #define PD32_PRINT_TITLE 7000 -#define PD32_PRINT_ALL_X_PAGES 7001 -#define PD32_INVALID_PAGE_RANGE 7003 + +#define PD32_VALUE_UREADABLE 1104 +#define PD32_INVALID_PAGE_RANGE 1105 +#define PD32_FROM_NOT_ABOVE_TO 1106 +#define PD32_MARGINS_OVERLAP 1107 +#define PD32_NR_OF_COPIES_EMPTY 1108 +#define PD32_TOO_LARGE_COPIES 1109 +#define PD32_PRINT_ERROR 1110 +#define PD32_NO_DEFAULT_PRINTER 1111 +#define PD32_CANT_FIND_PRINTER 1112 +#define PD32_OUT_OF_MEMORY 1113 +#define PD32_GENERIC_ERROR 1114 +#define PD32_DRIVER_UNKNOWN 1115 + +#define PD32_PRINTER_STATUS_READY 1536 +#define PD32_PRINTER_STATUS_PAUSED 1537 +#define PD32_PRINTER_STATUS_ERROR 1538 +#define PD32_PRINTER_STATUS_PENDING_DELETION 1539 +#define PD32_PRINTER_STATUS_PAPER_JAM 1540 +#define PD32_PRINTER_STATUS_PAPER_OUT 1541 +#define PD32_PRINTER_STATUS_MANUAL_FEED 1542 +#define PD32_PRINTER_STATUS_PAPER_PROBLEM 1543 +#define PD32_PRINTER_STATUS_OFFLINE 1544 +#define PD32_PRINTER_STATUS_IO_ACTIVE 1545 +#define PD32_PRINTER_STATUS_BUSY 1546 +#define PD32_PRINTER_STATUS_PRINTING 1547 +#define PD32_PRINTER_STATUS_OUTPUT_BIN_FULL 1548 +#define PD32_PRINTER_STATUS_NOT_AVAILABLE 1549 +#define PD32_PRINTER_STATUS_WAITING 1550 +#define PD32_PRINTER_STATUS_PROCESSING 1551 +#define PD32_PRINTER_STATUS_INITIALIZING 1552 +#define PD32_PRINTER_STATUS_WARMING_UP 1553 +#define PD32_PRINTER_STATUS_TONER_LOW 1554 +#define PD32_PRINTER_STATUS_NO_TONER 1555 +#define PD32_PRINTER_STATUS_PAGE_PUNT 1556 +#define PD32_PRINTER_STATUS_USER_INTERVENTION 1557 +#define PD32_PRINTER_STATUS_OUT_OF_MEMORY 1558 +#define PD32_PRINTER_STATUS_DOOR_OPEN 1559 +#define PD32_PRINTER_STATUS_SERVER_UNKNOWN 1560 +#define PD32_PRINTER_STATUS_POWER_SAVE 1561 + +#define PD32_DEFAULT_PRINTER 1582 +#define PD32_NR_OF_DOCUMENTS_IN_QUEUE 1583 +#define PD32_PRINT_ALL_X_PAGES 1584 +#define PD32_MARGINS_IN_INCHES 1585 +#define PD32_MARGINS_IN_MILIMETERS 1586 +#define PD32_MILIMETERS 1587 #include "commctrl.h" #include "wine/undocshell.h" diff --git a/dlls/commdlg/cdlg_En.rc b/dlls/commdlg/cdlg_En.rc index b13fbeeece6..98e19fb111a 100644 --- a/dlls/commdlg/cdlg_En.rc +++ b/dlls/commdlg/cdlg_En.rc @@ -195,7 +195,6 @@ FONT 8, "Helv" } -/* NOTE: Please, do not translate the PRINT32 dialog box yet! */ PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK @@ -356,46 +355,58 @@ aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa a2 00 43 02'} - -#if 0 - -/* - * DO NOT ENABLE! - * These IDs are out of range. - */ - -/* NOTE: Please, do not translate these texts yet! */ STRINGTABLE DISCARDABLE { - PD32_PRINT_ALL_X_PAGES "&All %d pages" PD32_PRINT_TITLE "Print" + + PD32_VALUE_UREADABLE "Unreadable Entry" PD32_INVALID_PAGE_RANGE "This value lies not within Page range\n\ Please enter a value between %d and %d" - PRINTER_STATUS_PAUSED "Paused" - PRINTER_STATUS_ERROR "Error" - PRINTER_STATUS_PENDING_DELETION "Pending deletion" - PRINTER_STATUS_PAPER_JAM "Paper jam" - PRINTER_STATUS_PAPER_OUT "Out of paper" - PRINTER_STATUS_MANUAL_FEED "Feed paper manual" - PRINTER_STATUS_PAPER_PROBLEM "Paper problem" - PRINTER_STATUS_OFFLINE "Printer offline" - PRINTER_STATUS_IO_ACTIVE "I/O Active" - PRINTER_STATUS_BUSY "Busy" - PRINTER_STATUS_PRINTING "Printing" - PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full" - PRINTER_STATUS_NOT_AVAILABLE "Not available" - PRINTER_STATUS_WAITING "Waiting" - PRINTER_STATUS_PROCESSING "Processing" - PRINTER_STATUS_INITIALIZING "Initialising" - PRINTER_STATUS_WARMING_UP "Warming up" - PRINTER_STATUS_TONER_LOW "Toner low" - PRINTER_STATUS_NO_TONER "No toner" - PRINTER_STATUS_PAGE_PUNT "Page punt" - PRINTER_STATUS_USER_INTERVENTION "User intervention required" - PRINTER_STATUS_OUT_OF_MEMORY "Out of memory" - PRINTER_STATUS_DOOR_OPEN "The printer door is open" - PRINTER_STATUS_SERVER_UNKNOWN "Print server unknown" - PRINTER_STATUS_POWER_SAVE "Power safe mode" -} + PD32_FROM_NOT_ABOVE_TO "The FROM entry cannot exceed TO:" + PD32_MARGINS_OVERLAP "Margins overlap or fall outside \ +Paper boundaries.\nPlease reenter margins" + PD32_NR_OF_COPIES_EMPTY "The NumberOfCopies entry cannot \ +be empty" + PD32_TOO_LARGE_COPIES "This large amount of prints is not \ +supported by your printer.\nPlease enter a value between 1 and %d" + PD32_PRINT_ERROR "A printer error occurred" + PD32_NO_DEFAULT_PRINTER "There is not default printer" + PD32_CANT_FIND_PRINTER "Cannot find the printer" + PD32_OUT_OF_MEMORY "Out of memory" + PD32_GENERIC_ERROR "Some error occurred" + PD32_DRIVER_UNKNOWN "Unknown printer driver" -#endif + PD32_DEFAULT_PRINTER "Default Printer; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in queue" + PD32_PRINT_ALL_X_PAGES "&All %d pages" + PD32_MARGINS_IN_INCHES "Margins [inches]" + PD32_MARGINS_IN_MILIMETERS "Margins [mm]" + PD32_MILIMETERS "mm" + + PD32_PRINTER_STATUS_READY "Ready" + PD32_PRINTER_STATUS_PAUSED "Paused; " + PD32_PRINTER_STATUS_ERROR "Error; " + PD32_PRINTER_STATUS_PENDING_DELETION "Pending deletion; " + PD32_PRINTER_STATUS_PAPER_JAM "Paper jam; " + PD32_PRINTER_STATUS_PAPER_OUT "Out of paper; " + PD32_PRINTER_STATUS_MANUAL_FEED "Feed paper manual; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "Paper problem; " + PD32_PRINTER_STATUS_OFFLINE "Printer offline; " + PD32_PRINTER_STATUS_IO_ACTIVE "I/O Active; " + PD32_PRINTER_STATUS_BUSY "Busy; " + PD32_PRINTER_STATUS_PRINTING "Printing; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "Not available; " + PD32_PRINTER_STATUS_WAITING "Waiting; " + PD32_PRINTER_STATUS_PROCESSING "Processing; " + PD32_PRINTER_STATUS_INITIALIZING "Initialising; " + PD32_PRINTER_STATUS_WARMING_UP "Warming up; " + PD32_PRINTER_STATUS_TONER_LOW "Toner low; " + PD32_PRINTER_STATUS_NO_TONER "No toner; " + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " + PD32_PRINTER_STATUS_USER_INTERVENTION "Interrupted by user; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Out of memory; " + PD32_PRINTER_STATUS_DOOR_OPEN "The printer door is open; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "Print server unknown; " + PD32_PRINTER_STATUS_POWER_SAVE "Power safe mode; " +} diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c index ff5749461bd..dfabe2262c8 100644 --- a/dlls/commdlg/printdlg.c +++ b/dlls/commdlg/printdlg.c @@ -286,32 +286,38 @@ BOOL WINAPI PrintDlgW( LPPRINTDLGW printdlg ) /*********************************************************************** * PRINTDLG_UpdatePrinterInfoTexts [internal] */ -static void PRINTDLG_UpdatePrinterInfoTexts(HWND hDlg, PRINT_PTRA* PrintStructures) +void PRINTDLG_UpdatePrinterInfoTexts(HWND hDlg, PRINT_PTRA* PrintStructures) { char StatusMsg[256]; char ResourceString[256]; int i; LPPRINTER_INFO_2A lpPi = &(PrintStructures->lpPrinterInfo [PrintStructures->CurrentPrinter]); - + /* Status Message */ StatusMsg[0]='\0'; + /* FIXME: if default printer, add this first */ + ; + /* add all status messages */ for (i=0; i< 25; i++) { if (lpPi->Status & (1<pDriverName); if (lpPi->pLocation != NULL && lpPi->pLocation[0]!='\0') SendDlgItemMessageA(hDlg, stc14, WM_SETTEXT, 0,(LPARAM)lpPi->pLocation);