Index: abi/src/af/xap/win/xap_Win32Dlg_About.cpp =================================================================== RCS file: /cvsroot/abi/src/af/xap/win/xap_Win32Dlg_About.cpp,v retrieving revision 1.21 diff -u -r1.21 xap_Win32Dlg_About.cpp --- abi/src/af/xap/win/xap_Win32Dlg_About.cpp 2001/02/06 22:54:23 1.21 +++ abi/src/af/xap/win/xap_Win32Dlg_About.cpp 2001/07/22 14:59:55 @@ -29,6 +29,8 @@ #include "xap_Win32App.h" #include "xap_Win32Frame.h" +#include "xap_Strings.h" +#include "xap_Dialog_Id.h" #include "xap_Dlg_About.h" #include "xap_Win32Dlg_About.h" @@ -126,7 +128,9 @@ pWin32App->enableAllTopLevelWindows(FALSE); char buf[1024]; - sprintf(buf, XAP_ABOUT_TITLE, m_pApp->getApplicationName()); + const XAP_StringSet* pSS = m_pApp->getStringSet(); + sprintf(buf, pSS->getValue(XAP_STRING_ID_DLG_ABOUT_Title), + m_pApp->getApplicationName()); HWND hwndAbout = CreateWindow( wndclassAbout.lpszClassName, buf, WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU, @@ -153,7 +157,7 @@ const int iHeight = rcClient.bottom; HWND hwndOK = CreateWindow("BUTTON", - "OK", // TODO isn't this in the strings file? + pSS->getValue(XAP_STRING_ID_DLG_OK), WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_DEFPUSHBUTTON, iWidth - BUTTON_WIDTH - BUTTON_GAP, iHeight - BUTTON_HEIGHT - BUTTON_GAP, Index: abi/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp =================================================================== RCS file: /cvsroot/abi/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp,v retrieving revision 1.21 diff -u -r1.21 xap_Win32Dlg_FileOpenSaveAs.cpp --- abi/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp 2001/07/03 14:08:11 1.21 +++ abi/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp 2001/07/22 14:59:58 @@ -254,23 +254,24 @@ } } + const XAP_StringSet* pSS = m_pApp->getStringSet(); + switch (m_id) { case XAP_DIALOG_ID_FILE_OPEN: - // TODO shouldn't we put a localized string into ofn.lpstrTitle? + ofn.lpstrTitle = pSS->getValue(XAP_STRING_ID_DLG_FOSA_OpenTitle); ofn.Flags |= OFN_FILEMUSTEXIST; bDialogResult = GetOpenFileName(&ofn); break; case XAP_DIALOG_ID_PRINTTOFILE: - // TODO localize - ofn.lpstrTitle = "Print To File"; + ofn.lpstrTitle = pSS->getValue(XAP_STRING_ID_DLG_FOSA_PrintToFileTitle); ofn.Flags |= OFN_OVERWRITEPROMPT; bDialogResult = GetSaveFileName(&ofn); break; case XAP_DIALOG_ID_FILE_SAVEAS: - // TODO shouldn't we put a localized string into ofn.lpstrTitle? + ofn.lpstrTitle = pSS->getValue(XAP_STRING_ID_DLG_FOSA_SaveAsTitle); ofn.lpfnHook = (LPOFNHOOKPROC) s_hookSaveAsProc; ofn.Flags |= OFN_OVERWRITEPROMPT; ofn.Flags |= OFN_EXPLORER; @@ -278,8 +279,7 @@ bDialogResult = GetSaveFileName(&ofn); break; case XAP_DIALOG_ID_INSERT_PICTURE: - // TODO localize - ofn.lpstrTitle = "Insert Picture"; + ofn.lpstrTitle = pSS->getValue(XAP_STRING_ID_DLG_IP_Title); ofn.hInstance = pWin32App->getInstance(); ofn.lpTemplateName = MAKEINTRESOURCE(XAP_RID_DIALOG_INSERT_PICTURE); ofn.lpfnHook = (LPOFNHOOKPROC) s_hookInsertPicProc; @@ -591,8 +591,6 @@ XAP_Win32Frame* pWin32Frame = (XAP_Win32Frame *) ( GetWindowLong(hFrame,GWL_USERDATA) ); XAP_App* pApp = pWin32Frame->getApp(); const XAP_StringSet* pSS = pApp->getStringSet(); - - SetWindowText( hDlg, pSS->getValue(XAP_STRING_ID_DLG_IP_Title) ); SetDlgItemText( hDlg, XAP_RID_DIALOG_INSERT_PICTURE_IMAGE_PREVIEW, Index: abi/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp =================================================================== RCS file: /cvsroot/abi/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp,v retrieving revision 1.21 diff -u -r1.21 xap_Win32Dlg_FontChooser.cpp --- abi/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp 2001/06/19 22:18:23 1.21 +++ abi/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp 2001/07/22 14:59:59 @@ -286,6 +286,7 @@ } #define _DS(c,s) SetDlgItemText(hWnd,XAP_RID_DIALOG_##c,pSS->getValue(XAP_STRING_ID_##s)) + BOOL XAP_Win32Dialog_FontChooser::_onInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) { HWND hFrame = GetParent(hWnd); @@ -296,10 +297,21 @@ SetWindowText(hWnd, pSS->getValue(XAP_STRING_ID_DLG_UFS_FontTitle)); // localize controls + _DS(FONT_TEXT_FONT, DLG_UFS_FontLabel); + _DS(FONT_TEXT_FONT_STYLE, DLG_UFS_StyleLabel); + _DS(FONT_TEXT_SIZE, DLG_UFS_SizeLabel); + _DS(FONT_TEXT_EFFECTS, DLG_UFS_EffectsFrameLabel); + _DS(FONT_BTN_STRIKEOUT, DLG_UFS_StrikeoutCheck); + _DS(FONT_BTN_UNDERLINE, DLG_UFS_UnderlineCheck); _DS(FONT_CHK_OVERLINE, DLG_UFS_OverlineCheck); -// _DS(FONT_CHK_TOPLINE, ); -// _DL(FONT_CHK_BOTTOMLINE, ); -// _DL(FONT_CHK_SMALLCAPS, ); + _DS(FONT_CHK_TOPLINE, DLG_UFS_ToplineCheck); + _DS(FONT_CHK_BOTTOMLINE, DLG_UFS_BottomlineCheck); + _DS(FONT_CHK_SMALLCAPS, DLG_UFS_SmallCapsCheck); + _DS(FONT_TEXT_COLOR, DLG_UFS_ColorLabel); + _DS(FONT_TEXT_SCRIPT, DLG_UFS_ScriptLabel); + _DS(FONT_TEXT_SAMPLE, DLG_UFS_SampleFrameLabel); + _DS(FONT_BTN_OK, DLG_OK); + _DS(FONT_BTN_CANCEL, DLG_Cancel); // set initial state if( m_bWin32Overline ) Index: abi/src/af/xap/win/xap_Win32Res_DlgFont.rc2 =================================================================== RCS file: /cvsroot/abi/src/af/xap/win/xap_Win32Res_DlgFont.rc2,v retrieving revision 1.1 diff -u -r1.1 xap_Win32Res_DlgFont.rc2 --- abi/src/af/xap/win/xap_Win32Res_DlgFont.rc2 2001/05/17 23:13:15 1.1 +++ abi/src/af/xap/win/xap_Win32Res_DlgFont.rc2 2001/07/22 15:00:00 @@ -27,11 +27,22 @@ // ////////////////////////////////////////////////////////////////// +#define XAP_RID_DIALOG_FONT_TEXT_FONT 1088 +#define XAP_RID_DIALOG_FONT_TEXT_FONT_STYLE 1089 +#define XAP_RID_DIALOG_FONT_TEXT_SIZE 1090 +#define XAP_RID_DIALOG_FONT_TEXT_EFFECTS 1072 +#define XAP_RID_DIALOG_FONT_BTN_STRIKEOUT 1040 +#define XAP_RID_DIALOG_FONT_BTN_UNDERLINE 1041 +#define XAP_RID_DIALOG_FONT_TEXT_COLOR 1091 +#define XAP_RID_DIALOG_FONT_TEXT_SCRIPT 1094 +#define XAP_RID_DIALOG_FONT_TEXT_SAMPLE 1073 #define XAP_RID_DIALOG_FONT_CHK_OVERLINE 1001 #define XAP_RID_DIALOG_FONT_CHK_TOPLINE 1002 #define XAP_RID_DIALOG_FONT_CHK_BOTTOMLINE 1003 #define XAP_RID_DIALOG_FONT_CHK_SMALLCAPS 1004 #define XAP_RID_DIALOG_FONT_PREVIEW 1005 +#define XAP_RID_DIALOG_FONT_BTN_OK IDOK +#define XAP_RID_DIALOG_FONT_BTN_CANCEL IDCANCEL #ifdef RC_INVOKED // NOTE -- these placeholder strings get overridden at runtime @@ -43,14 +54,15 @@ CAPTION "Font" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Font:",1088,7,7,40,9 + LTEXT "&Font:",XAP_RID_DIALOG_FONT_TEXT_FONT,7,7,84,9 COMBOBOX 1136,7,16,98,76,CBS_SIMPLE | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP - LTEXT "Font st&yle:",1089,110,7,44,9 + LTEXT "Font st&yle:",XAP_RID_DIALOG_FONT_TEXT_FONT_STYLE, + 110,7,51,9 COMBOBOX 1137,110,16,62,76,CBS_SIMPLE | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP - LTEXT "&Size:",1090,177,7,30,9 + LTEXT "&Size:",XAP_RID_DIALOG_FONT_TEXT_SIZE,177,7,30,9 COMBOBOX 1138,177,16,27,76,CBS_SIMPLE | CBS_OWNERDRAWFIXED | CBS_SORT | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP @@ -59,36 +71,37 @@ PUSHBUTTON "&Apply",1026,210,48,45,14,WS_GROUP PUSHBUTTON "&Help",1038,210,64,45,14,WS_GROUP GROUPBOX "Effects",1072,7,92,199,77,WS_GROUP - CONTROL "Stri&keout",1040,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 15,106,49,10 - CONTROL "&Underline",1041,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 15,118,51,10 - LTEXT "&Color:",1091,113,114,30,9 + CONTROL "Stri&keout",XAP_RID_DIALOG_FONT_BTN_STRIKEOUT, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,106,84,10 + CONTROL "&Underline",XAP_RID_DIALOG_FONT_BTN_UNDERLINE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,118,84,10 + LTEXT "&Color:",XAP_RID_DIALOG_FONT_TEXT_COLOR,113,114,84,9 COMBOBOX 1139,113,125,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Sample",1073,7,173,198,36,WS_GROUP + GROUPBOX "Sample",XAP_RID_DIALOG_FONT_TEXT_SAMPLE,7,173,198,36, + WS_GROUP CTEXT "AaBbYyZz",1092,15,183,183,21,SS_NOPREFIX | NOT WS_VISIBLE // CONTROL "(preview)", XAP_RID_DIALOG_FONT_PREVIEW, // "Button", BS_OWNERDRAW, // 15,183,183,21 LTEXT "",1093,7,210,196,20,SS_NOPREFIX | NOT WS_GROUP - LTEXT "Sc&ript:",1094,113,141,30,9 + LTEXT "Sc&ript:",XAP_RID_DIALOG_FONT_TEXT_SCRIPT,113,141,84,9 COMBOBOX 1140,113,151,84,30,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP CONTROL "&Overline",XAP_RID_DIALOG_FONT_CHK_OVERLINE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 15,154,51,10 + 15,154,84,10 CONTROL "&Topline",XAP_RID_DIALOG_FONT_CHK_TOPLINE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15, - 130,51,10 + 130,84,10 CONTROL "&Bottomline",XAP_RID_DIALOG_FONT_CHK_BOTTOMLINE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 15,142,51,10 + 15,142,84,10 CONTROL "&Small Caps",XAP_RID_DIALOG_FONT_CHK_SMALLCAPS, "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, - 113,103,51,10 + 113,103,84,10 END #endif /* RC_INVOKED */ Index: abi/src/af/xap/xp/xap_String_Id.h =================================================================== RCS file: /cvsroot/abi/src/af/xap/xp/xap_String_Id.h,v retrieving revision 1.46 diff -u -r1.46 xap_String_Id.h --- abi/src/af/xap/xp/xap_String_Id.h 2001/07/05 17:19:52 1.46 +++ abi/src/af/xap/xp/xap_String_Id.h 2001/07/22 15:00:02 @@ -56,7 +56,7 @@ dcl(DLG_MW_MoreWindows, "Activate Window") dcl(DLG_MW_Activate, "Activate:") -/* Unix Font Selector dialog */ +/* Unix and Windows Font Selector dialog */ dcl(DLG_UFS_FontTitle, "Font") dcl(DLG_UFS_FontLabel, "Font:") dcl(DLG_UFS_StyleLabel, "Style:") @@ -74,6 +74,12 @@ dcl(DLG_UFS_StyleItalic, "Italic") dcl(DLG_UFS_StyleBold, "Bold") dcl(DLG_UFS_StyleBoldItalic, "Bold Italic") +dcl(DLG_UFS_ToplineCheck, "Topline") +dcl(DLG_UFS_BottomlineCheck, "Bottomline") +dcl(DLG_UFS_SmallCapsCheck, "Small Caps") +dcl(DLG_UFS_ColorLabel, "Color:") +dcl(DLG_UFS_ScriptLabel, "Script:") +dcl(DLG_UFS_SampleFrameLabel, "Sample") #ifdef BIDI_ENABLED dcl(DLG_UFS_Direction, "Right-to-left") #endif @@ -163,6 +169,9 @@ /* ClipArt Dialog */ dcl(DLG_CLIPART_Title, "Clip Art") + +/* About Dialog */ +dcl(DLG_ABOUT_Title, "About %s") /* Language property in different languages; alphabetical except English first */ dcl(LANG_0, "no proofing") Index: abi/src/wp/ap/win/ap_Win32Dialog_Lists.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_Lists.cpp,v retrieving revision 1.19 diff -u -r1.19 ap_Win32Dialog_Lists.cpp --- abi/src/wp/ap/win/ap_Win32Dialog_Lists.cpp 2001/07/20 15:32:04 1.19 +++ abi/src/wp/ap/win/ap_Win32Dialog_Lists.cpp 2001/07/22 15:00:17 @@ -146,9 +146,11 @@ { AP_RID_DIALOG_LIST_STATIC_TYPE , AP_STRING_ID_DLG_Lists_Type, AP_RID_DIALOG_LIST_STATIC_STYLE , AP_STRING_ID_DLG_Lists_Style, + AP_RID_DIALOG_LIST_GROUP_CUSTOM , AP_STRING_ID_DLG_Lists_Customize, AP_RID_DIALOG_LIST_BUTTON_DEFAULT , AP_STRING_ID_DLG_Lists_SetDefault, AP_RID_DIALOG_LIST_STATIC_FORMAT , AP_STRING_ID_DLG_Lists_Format, AP_RID_DIALOG_LIST_STATIC_FONT , AP_STRING_ID_DLG_Lists_Font, + AP_RID_DIALOG_LIST_BTN_FONT , AP_STRING_ID_DLG_Lists_ButtonFont, AP_RID_DIALOG_LIST_STATIC_LEVEL , AP_STRING_ID_DLG_Lists_Level, AP_RID_DIALOG_LIST_STATIC_START_AT , AP_STRING_ID_DLG_Lists_Start, AP_RID_DIALOG_LIST_STATIC_LIST_ALIGN , AP_STRING_ID_DLG_Lists_Align, Index: abi/src/wp/ap/win/ap_Win32Dialog_PageNumbers.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_PageNumbers.cpp,v retrieving revision 1.7 diff -u -r1.7 ap_Win32Dialog_PageNumbers.cpp --- abi/src/wp/ap/win/ap_Win32Dialog_PageNumbers.cpp 2001/03/19 03:52:20 1.7 +++ abi/src/wp/ap/win/ap_Win32Dialog_PageNumbers.cpp 2001/07/22 15:00:18 @@ -113,6 +113,10 @@ m_helper.selectComboItem(AP_RID_DIALOG_PAGENUMBERS_COMBO_ALIGN, 2); // localize controls +#define _DSX(c,s) SetDlgItemText(hWnd,AP_RID_DIALOG_##c,pSS->getValue(XAP_STRING_ID_##s)) + _DSX(PAGENUMBERS_BTN_OK, DLG_OK); + _DSX(PAGENUMBERS_BTN_CANCEL, DLG_Cancel); +#undef _DSX #define _DS(c,s) SetDlgItemText(hWnd,AP_RID_DIALOG_##c,pSS->getValue(AP_STRING_ID_##s)) _DS(PAGENUMBERS_STATIC_ALIGNMENT, DLG_PageNumbers_Alignment); _DS(PAGENUMBERS_STATIC_POSITION, DLG_PageNumbers_Position); Index: abi/src/wp/ap/win/ap_Win32Dialog_PageSetup.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_PageSetup.cpp,v retrieving revision 1.5 diff -u -r1.5 ap_Win32Dialog_PageSetup.cpp --- abi/src/wp/ap/win/ap_Win32Dialog_PageSetup.cpp 2001/03/10 08:12:21 1.5 +++ abi/src/wp/ap/win/ap_Win32Dialog_PageSetup.cpp 2001/07/22 15:00:20 @@ -260,6 +260,7 @@ } #define _DS(c,s) SetDlgItemText(hWnd,AP_RID_DIALOG_##c,pSS->getValue(AP_STRING_ID_##s)) +#define _DSX(c,s) SetDlgItemText(hWnd,XAP_RID_DIALOG_##c,pSS->getValue(XAP_STRING_ID_##s)) UINT AP_Win32Dialog_PageSetup::_onInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) { @@ -271,9 +272,25 @@ XAP_App* pApp = pWin32Frame->getApp(); const XAP_StringSet * pSS = pApp->getStringSet(); + SetWindowText(hWnd, pSS->getValue(AP_STRING_ID_DLG_PageSetup_Title)); + // localize controls + _DS(PAGE_SETUP_TEXT_PAPER, DLG_PageSetup_PaperWin); + _DS(PAGE_SETUP_TEXT_SIZE, DLG_PageSetup_Paper_Size); + _DS(PAGE_SETUP_TEXT_SOURCE, DLG_PageSetup_PaperSource); + _DS(PAGE_SETUP_TEXT_ORIENTATION,DLG_PageSetup_OrientWin); + _DS(PAGE_SETUP_BTN_LANDSCAPE, DLG_PageSetup_Landscape); + _DS(PAGE_SETUP_BTN_PORTRAIT, DLG_PageSetup_Portrait); + _DS(PAGE_SETUP_TEXT_TOP, DLG_PageSetup_Top); _DS(PAGE_SETUP_TEXT_HEADER, DLG_PageSetup_Header); _DS(PAGE_SETUP_TEXT_FOOTER, DLG_PageSetup_Footer); + _DS(PAGE_SETUP_TEXT_BOTTOM, DLG_PageSetup_Bottom); + _DS(PAGE_SETUP_TEXT_LEFT, DLG_PageSetup_Left); + _DS(PAGE_SETUP_TEXT_RIGHT, DLG_PageSetup_Right); + _DS(PAGE_SETUP_TEXT_MARGINS, DLG_PageSetup_MarginWin); + _DSX(PAGE_SETUP_BTN_OK, DLG_OK); + _DSX(PAGE_SETUP_BTN_CANCEL, DLG_Cancel); + _DS(PAGE_SETUP_BTN_PRINTER, DLG_PageSetup_ButtonPrinter); // Initialize Controls char buf[10]; Index: abi/src/wp/ap/win/ap_Win32Res_DlgPageSetup.rc2 =================================================================== RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_DlgPageSetup.rc2,v retrieving revision 1.1 diff -u -r1.1 ap_Win32Res_DlgPageSetup.rc2 --- abi/src/wp/ap/win/ap_Win32Res_DlgPageSetup.rc2 2001/03/10 10:56:09 1.1 +++ abi/src/wp/ap/win/ap_Win32Res_DlgPageSetup.rc2 2001/07/22 15:00:24 @@ -27,10 +27,24 @@ // ////////////////////////////////////////////////////////////////// +#define AP_RID_DIALOG_PAGE_SETUP_TEXT_PAPER grp2 +#define AP_RID_DIALOG_PAGE_SETUP_TEXT_SIZE stc2 +#define AP_RID_DIALOG_PAGE_SETUP_TEXT_SOURCE stc3 +#define AP_RID_DIALOG_PAGE_SETUP_TEXT_ORIENTATION grp1 +#define AP_RID_DIALOG_PAGE_SETUP_BTN_PORTRAIT rad1 +#define AP_RID_DIALOG_PAGE_SETUP_BTN_LANDSCAPE rad2 +#define AP_RID_DIALOG_PAGE_SETUP_TEXT_MARGINS grp4 +#define AP_RID_DIALOG_PAGE_SETUP_TEXT_LEFT stc15 +#define AP_RID_DIALOG_PAGE_SETUP_TEXT_RIGHT stc16 +#define AP_RID_DIALOG_PAGE_SETUP_TEXT_TOP stc17 +#define AP_RID_DIALOG_PAGE_SETUP_TEXT_BOTTOM stc18 #define AP_RID_DIALOG_PAGE_SETUP_TEXT_HEADER 1001 #define AP_RID_DIALOG_PAGE_SETUP_EDIT_HEADER 1002 #define AP_RID_DIALOG_PAGE_SETUP_TEXT_FOOTER 1003 #define AP_RID_DIALOG_PAGE_SETUP_EDIT_FOOTER 1004 +#define XAP_RID_DIALOG_PAGE_SETUP_BTN_OK IDOK +#define XAP_RID_DIALOG_PAGE_SETUP_BTN_CANCEL IDCANCEL +#define AP_RID_DIALOG_PAGE_SETUP_BTN_PRINTER psh3 #ifdef RC_INVOKED // NOTE -- these placeholder strings get overridden at runtime @@ -44,34 +58,45 @@ CONTROL "",rct1,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80 CONTROL "",rct2,"Static",SS_GRAYRECT | WS_GROUP,160,12,4,80 CONTROL "",rct3,"Static",SS_GRAYRECT | WS_GROUP,84,88,80,4 - GROUPBOX "Paper",grp2,8,96,224,56,WS_GROUP - LTEXT "Si&ze:",stc2,16,112,36,8 + GROUPBOX "Paper",AP_RID_DIALOG_PAGE_SETUP_TEXT_PAPER,8,96,224,56, + WS_GROUP + LTEXT "Si&ze:",AP_RID_DIALOG_PAGE_SETUP_TEXT_SIZE,16,112,36,8 COMBOBOX cmb2,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "&Source:",stc3,16,132,36,8 + LTEXT "&Source:",AP_RID_DIALOG_PAGE_SETUP_TEXT_SOURCE, + 16,132,36,8 COMBOBOX cmb3,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - GROUPBOX "Orientation",grp1,8,156,64,56,WS_GROUP - CONTROL "P&ortrait",rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | + GROUPBOX "Orientation",AP_RID_DIALOG_PAGE_SETUP_TEXT_ORIENTATION, + 8,156,64,56,WS_GROUP + CONTROL "P&ortrait",AP_RID_DIALOG_PAGE_SETUP_BTN_PORTRAIT, + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,170,52,12 - CONTROL "L&andscape",rad2,"Button",BS_AUTORADIOBUTTON,16,190,52, - 12 - GROUPBOX "Margins",grp4,80,156,152,76,WS_GROUP - LTEXT "&Left:",stc15,88,172,32,8 + CONTROL "L&andscape",AP_RID_DIALOG_PAGE_SETUP_BTN_LANDSCAPE, + "Button",BS_AUTORADIOBUTTON,16,190,52,12 + GROUPBOX "Margins",AP_RID_DIALOG_PAGE_SETUP_TEXT_MARGINS, + 80,156,152,76,WS_GROUP + LTEXT "&Left:",AP_RID_DIALOG_PAGE_SETUP_TEXT_LEFT,88,172,32,8 EDITTEXT edt4,120,170,28,12,WS_GROUP - LTEXT "&Right:",stc16,164,172,32,8 + LTEXT "&Right:",AP_RID_DIALOG_PAGE_SETUP_TEXT_RIGHT,164,172,32,8 EDITTEXT edt6,196,170,28,12,WS_GROUP - LTEXT "&Top:",stc17,88,192,32,8 + LTEXT "&Top:",AP_RID_DIALOG_PAGE_SETUP_TEXT_TOP,88,192,32,8 EDITTEXT edt5,120,190,28,12,WS_GROUP - LTEXT "&Bottom:",stc18,164,192,32,8 + LTEXT "&Bottom:",AP_RID_DIALOG_PAGE_SETUP_TEXT_BOTTOM, + 164,192,32,8 EDITTEXT edt7,196,190,28,12,WS_GROUP - LTEXT "&Header:",AP_RID_DIALOG_PAGE_SETUP_TEXT_HEADER,88,212,32,8,WS_GROUP - EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EDIT_HEADER,120,210,28,12,WS_GROUP - LTEXT "&Footer:",AP_RID_DIALOG_PAGE_SETUP_TEXT_FOOTER,164,212,32,8,WS_GROUP - EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EDIT_FOOTER,196,210,28,12,WS_GROUP + LTEXT "&Header:",AP_RID_DIALOG_PAGE_SETUP_TEXT_HEADER, + 88,212,32,8,WS_GROUP + EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EDIT_HEADER,120,210,28,12, + WS_GROUP + LTEXT "&Footer:",AP_RID_DIALOG_PAGE_SETUP_TEXT_FOOTER, + 164,212,32,8,WS_GROUP + EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EDIT_FOOTER,196,210,28,12, + WS_GROUP DEFPUSHBUTTON "OK",IDOK,80,240,48,14,WS_GROUP PUSHBUTTON "Cancel",IDCANCEL,132,240,48,14 - PUSHBUTTON "&Printer...",psh3,184,240,48,14 + PUSHBUTTON "&Printer...",AP_RID_DIALOG_PAGE_SETUP_BTN_PRINTER, + 184,240,48,14 END #endif /* RC_INVOKED */ Index: abi/src/wp/ap/xp/ap_String_Id.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_String_Id.h,v retrieving revision 1.99 diff -u -r1.99 ap_String_Id.h --- abi/src/wp/ap/xp/ap_String_Id.h 2001/07/12 19:48:41 1.99 +++ abi/src/wp/ap/xp/ap_String_Id.h 2001/07/22 15:00:32 @@ -430,6 +430,7 @@ dcl(DLG_Lists_Customize, "Customized List") dcl(DLG_Lists_Format, "Format:") dcl(DLG_Lists_Font, "Font:") +dcl(DLG_Lists_ButtonFont, "Font...") dcl(DLG_Lists_Level, "Level Delimiter:") dcl(DLG_Lists_Start, "Start At:") dcl(DLG_Lists_Align, "Text Align:") @@ -456,11 +457,14 @@ /* page setup dialog */ dcl(DLG_PageSetup_Title, "Page Setup") dcl(DLG_PageSetup_Paper, "Paper...") +dcl(DLG_PageSetup_PaperWin, "Paper") +dcl(DLG_PageSetup_PaperSource, "Source:") dcl(DLG_PageSetup_Width, "&Width:") dcl(DLG_PageSetup_Height, "&Height:") dcl(DLG_PageSetup_Paper_Size, "Paper Si&ze:") dcl(DLG_PageSetup_Units, "&Units:") dcl(DLG_PageSetup_Orient, "Orientation...") +dcl(DLG_PageSetup_OrientWin, "Orientation") dcl(DLG_PageSetup_Landscape, "&Landscape") dcl(DLG_PageSetup_Portrait, "&Portrait") dcl(DLG_PageSetup_Scale, "Scale...") @@ -474,6 +478,8 @@ dcl(DLG_PageSetup_Left, "&Left:") dcl(DLG_PageSetup_Right, "&Right:") dcl(DLG_PageSetup_Margin, "&Margin") +dcl(DLG_PageSetup_MarginWin, "Margins") +dcl(DLG_PageSetup_ButtonPrinter, "Pr&inter...") dcl(MSG_DirectionModeChg, "You have changed the direction mode.") dcl(MSG_DefaultDirectionChg,"You have changed the default direction.")