From: Steven Edwards Date: Fri, 8 Oct 2004 04:05:11 +0000 (+0000) Subject: Sync notepad with Winehq. It looks more like Windows notepad. X-Git-Tag: backups/new_headers@15094~37^2~193 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=ba571f2170e907813c76989ec9363b3b461576a5 Sync notepad with Winehq. It looks more like Windows notepad. svn path=/trunk/; revision=11223 --- diff --git a/rosapps/notepad/ChangeLog b/rosapps/notepad/ChangeLog new file mode 100644 index 00000000000..cd50462ca74 --- /dev/null +++ b/rosapps/notepad/ChangeLog @@ -0,0 +1,56 @@ + *** This file is obsolete. Changes are listed in the main + *** ChangeLog now. Please do not edit. + +Fri Jun 12 23:29:44 1998 Marcel Baur + - Fixed GetDateFormat()->GetTimeFormat() for locale time. + +Mon May 25 14:30:00 1998 Henrik Olsen + * [Da.rc] + - Added Danish language support. + +Fri May 15 23:59:22 1998 Marcel Baur + - Date/Time now uses locale-specific formats + - Language-specific window caption, displays file being edited. + - Started with parsing of command line settings + - Started with DoOpenFile, DoCloseFile, DoSaveFile logics + - Prompt user to save settings when closing a file + -> Introduced a new message box (not yet finished) + - Fixed minor features (missing IDS in main.h, ...) + +Sun Mar 29 20:29:41 1998 Laurent Buffler + * [Fr.rc] + - Added French language support. + +Fri Feb 27 21:03:37 1998 Karl Backström + - Fixed some minor features. + +Sat Feb 14 17:42:29 1998 Karl Backström + * NEW [language.c] [language.h] + - Takes care of all language related stuff. + - A new [programs] in .winerc is in use. + +Tue Feb 10 23:34:08 1998 Marcel Baur + - Fixed broken language menus + +Fri Feb 06 23.54.35 1998 Karl Backström + * [main.c] [main.h] [notepad.rc] + - Fixed language support for menus. + * NEW [dialog.c] [dialog.h] + - Moved all menu and dialog related stuff here. + +Sun Jan 18 23:05:04 1998 Karl Backström + * [Sw.rc] + - Added/updated Swedish language support. + +Tue Dec 23 23:35:04 1997 Marcel Baur + - Fixed lots of bugs w/ resources in *.rc + - moved [notepad.c] into [main.c] + - moved [notepad.h] into [main.h] + +Fri Dec 05 20:51:55 1997 Marcel Baur + * [notepad.c] [notepad.h] [notepad.rc] [En.rc] [De.rc] + [license.c] [license.h] [License_En.c] + [README] [TODO] [ChangeLog] + - Originals by Marcel Baur + + diff --git a/rosapps/notepad/Da.rc b/rosapps/notepad/Da.rc index ee68ae2b12c..5415e20c12f 100644 --- a/rosapps/notepad/Da.rc +++ b/rosapps/notepad/Da.rc @@ -68,7 +68,7 @@ POPUP "&Hj DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Sideopsætning" { LTEXT "&Sidehoved:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/De.rc b/rosapps/notepad/De.rc index b39cbc5cf8b..5f105394a6a 100644 --- a/rosapps/notepad/De.rc +++ b/rosapps/notepad/De.rc @@ -29,6 +29,7 @@ MAIN_MENU MENU MENUITEM "Ö&ffnen...", CMD_OPEN MENUITEM "&Speichern", CMD_SAVE MENUITEM "Speichern &unter...", CMD_SAVE_AS + MENUITEM SEPARATOR MENUITEM "&Drucken", CMD_PRINT MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP @@ -47,6 +48,7 @@ POPUP "&Bearbeiten" { MENUITEM "&Uhrzeit/Datum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Zeilenumbruch", CMD_WRAP + MENUITEM "&Schriftarten...", CMD_FONT } POPUP "&Suchen" { MENUITEM "Suchen...", CMD_SEARCH @@ -69,7 +71,7 @@ POPUP "&Hilfe" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Seite einrichten" { LTEXT "&Kopfzeile:", 0x140, 10, 07, 40, 15 @@ -95,15 +97,15 @@ PUSHBUTTON "&Hilfe", 0x153, 180, 39, 40, 15, WS_TABSTOP STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Page &s" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Seite &s" /* FIXME */ STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ STRING_NOTEPAD, "Editor" -STRING_ERROR, "FEHLER" -STRING_WARNING, "ACHTUNG" +STRING_ERROR, "Fehler" +STRING_WARNING, "Achtung" STRING_INFO, "Information" STRING_UNTITLED, "(unbenannt)" @@ -111,15 +113,15 @@ STRING_UNTITLED, "(unbenannt)" STRING_ALL_FILES, "Alle Dateien (*.*)" STRING_TEXT_FILES_TXT, "Textdateien (*.txt)" -STRING_TOOLARGE, "'%s' ist zu gross für den Editor\n \ +STRING_TOOLARGE, "Die Datei '%s' ist zu groß für den Editor\n \ Benutzen Sie bitte einen anderen Editor, um diese Datei zu bearbeiten." STRING_NOTEXT, "Sie haben keinen Text eingegeben, der \ gespeichert\n werden könnte. Geben Sie Text ein, und versuchen Sie es \ \nerneut." -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ -Do you want to create a new file ?" -STRING_NOTSAVED, "Datei %s\n wurde geaendert.\n\n \ -Moechten Sie die Aenderungen speichern ?" +STRING_DOESNOTEXIST, "Die Datei '%s'\nexistiert nicht.\n\n \ +Möchten Sie eine neue Datei erstellen ?" +STRING_NOTSAVED, "Datei %s\n wurde geändert.\n\n \ +Möchten Sie die Änderungen speichern ?" STRING_NOTFOUND, "'%s' kann nicht gefunden werden." STRING_OUT_OF_MEMORY, "Nicht genügend Arbeitsspeicher, \ um diese Funktion \nabzuschließen. Beenden Sie eine oder mehrere \ diff --git a/rosapps/notepad/En.rc b/rosapps/notepad/En.rc index 9debe253544..d13210a1ea4 100644 --- a/rosapps/notepad/En.rc +++ b/rosapps/notepad/En.rc @@ -71,7 +71,7 @@ POPUP "&Help" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Page Setup" { LTEXT "&Header:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Es.rc b/rosapps/notepad/Es.rc index 635479d1e79..45d5e9e9253 100644 --- a/rosapps/notepad/Es.rc +++ b/rosapps/notepad/Es.rc @@ -5,7 +5,7 @@ * Proofread 1998 by David Lee Lambert * Proofread 1999 by Jose Marcos Lopez * Copyright 2002 Sylvain Petreolle - * Copyright 2003 José Manuel Ferrer Ortiz + * Copyright 2003,2004 José Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,42 +27,44 @@ LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT MAIN_MENU MENU { POPUP "&Archivo" { - MENUITEM "&Nuevo", CMD_NEW - MENUITEM "&Abrir", CMD_OPEN - MENUITEM "&Guardar", CMD_SAVE - MENUITEM "Guardar &como...", CMD_SAVE_AS - MENUITEM "&Imprimir", CMD_PRINT - MENUITEM "Configurar &página...", CMD_PAGE_SETUP - MENUITEM "Configuración &impresora...", CMD_PRINTER_SETUP + MENUITEM "&Nuevo...", CMD_NEW + MENUITEM "&Abrir\tCtrl+O", CMD_OPEN + MENUITEM "&Guardar\tCtrl+S", CMD_SAVE + MENUITEM "Guardar &como...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "&Salir", CMD_EXIT + MENUITEM "&Imprimir", CMD_PRINT + MENUITEM "Configurar &página...", CMD_PAGE_SETUP + MENUITEM "Configuración &impresora...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Salir", CMD_EXIT } POPUP "&Editar" { - MENUITEM "&Deshacer\tCtrl+Z", CMD_UNDO + MENUITEM "&Deshacer\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "Cor&tar\tCtrl+X", CMD_CUT - MENUITEM "&Copiar\tCtrl+C", CMD_COPY - MENUITEM "&Pegar\tCtrl+V", CMD_PASTE - MENUITEM "&Borrar\tDel", CMD_DELETE + MENUITEM "Cor&tar\tCtrl+X", CMD_CUT + MENUITEM "&Copiar\tCtrl+C", CMD_COPY + MENUITEM "&Pegar\tCtrl+V", CMD_PASTE + MENUITEM "&Borrar\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Seleccionar t&odo", CMD_SELECT_ALL - MENUITEM "&Hora y Fecha\tF5", CMD_TIME_DATE + MENUITEM "Seleccionar t&odo\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Hora y fecha\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Ajuste de línea automático", CMD_WRAP + MENUITEM "&Ajuste de línea", CMD_WRAP + MENUITEM "Tipo de &letra...", CMD_FONT } POPUP "&Buscar" { - MENUITEM "&Buscar...", CMD_SEARCH - MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT + MENUITEM "&Buscar\tCtrl+F", CMD_SEARCH + MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT } -POPUP "&Ayuda" { - MENUITEM "Í&ndice", CMD_HELP_CONTENTS - MENUITEM "&Buscar...", CMD_HELP_SEARCH - MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP +POPUP "A&yuda" { + MENUITEM "Í&ndice", CMD_HELP_CONTENTS + MENUITEM "&Buscar...", CMD_HELP_SEARCH + MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "&Información..." { - MENUITEM "&Licencia", CMD_LICENSE - MENUITEM "SIN &GARANTÍA", CMD_NO_WARRANTY - MENUITEM "&Acerca de Wine", CMD_ABOUT_WINE + MENUITEM "&Licencia", CMD_LICENSE + MENUITEM "SIN &GARANTÍA", CMD_NO_WARRANTY + MENUITEM "&Acerca de Wine", CMD_ABOUT_WINE } } } @@ -71,8 +73,8 @@ POPUP "&Ayuda" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" -CAPTION "&Ajuste de página" +FONT 8, "MS Shell Dlg" +CAPTION "Ajuste de página" { LTEXT "&Cabecera:", 0x140, 10, 07, 40, 15 EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP @@ -96,35 +98,34 @@ PUSHBUTTON "&Ayuda", 0x153, 180, 39, 40, 15, WS_TABSTOP STRINGTABLE DISCARDABLE { -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Página &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ - -STRING_NOTEPAD, "Bloc de Notas" -STRING_ERROR, "ERROR" -STRING_WARNING, "ADVERTENCIA" -STRING_INFO, "Información" +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Página &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ -STRING_UNTITLED, "(sin título)" +STRING_NOTEPAD, "Bloc de notas" +STRING_ERROR, "ERROR" +STRING_WARNING, "ADVERTENCIA" +STRING_INFO, "Información" -STRING_ALL_FILES, "Todos los archivos (*.*)" -STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" +STRING_UNTITLED, "(sin título)" -STRING_TOOLARGE, "El archivo '%s' es demasiado grande para el bloc de notas.\n \ -Use otro editor." -STRING_NOTEXT, "No escribió nada. \ -\nPor favor escriba algo y pruebe de nuevo" -STRING_DOESNOTEXIST, "El archivo '%s'\nno existe\n\n \ -¿Desea crear un nuevo archivo?" -STRING_NOTSAVED, "El texto en el archivo '%s' ha cambiado\n\n \ -¿Desea guardar los cambios?" -STRING_NOTFOUND, "no se encontró '%s'." -STRING_OUT_OF_MEMORY, "No hay suficiente memoria para terminar \ -esta tarea. \nCierre una o más aplicaciones para aumentar la cantidad \nde \ -memoria libre." +STRING_ALL_FILES, "Todos los archivos (*.*)" +STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" +STRING_TOOLARGE, "El archivo '%s' es demasiado grande para el \ + bloc de notas.\n Use otro editor." +STRING_NOTEXT, "No escribió nada. \nPor favor escriba algo e \ + inténtelo de nuevo" +STRING_DOESNOTEXIST, "El archivo '%s'\nno existe\n\n ¿Desea crear \ + un nuevo archivo?" +STRING_NOTSAVED, "El texto en el archivo '%s' ha cambiado\n\n \ + ¿Desea guardar los cambios?" +STRING_NOTFOUND, "No se encontró '%s'." +STRING_OUT_OF_MEMORY, "No hay suficiente memoria para terminar esta \ + tarea. \nCierre una o más aplicaciones para \ + aumentar la cantidad \nde memoria libre." } diff --git a/rosapps/notepad/Fi.rc b/rosapps/notepad/Fi.rc index ffefa707925..ee9ab785c1c 100644 --- a/rosapps/notepad/Fi.rc +++ b/rosapps/notepad/Fi.rc @@ -68,7 +68,7 @@ POPUP "&Apua" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Sivun asetukset" { LTEXT "&Yläotsikko:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Fr.rc b/rosapps/notepad/Fr.rc index 8aa233ecfcb..0a6103098f5 100644 --- a/rosapps/notepad/Fr.rc +++ b/rosapps/notepad/Fr.rc @@ -71,7 +71,7 @@ POPUP "&Aide" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Mise en page" { LTEXT "&En-tête :", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Hu.rc b/rosapps/notepad/Hu.rc index 0ea976cc197..c8d388bed1c 100644 --- a/rosapps/notepad/Hu.rc +++ b/rosapps/notepad/Hu.rc @@ -70,7 +70,7 @@ POPUP "&S DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Oldalbeállítás" { LTEXT "&Fejléc:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/It.rc b/rosapps/notepad/It.rc index 65a86012581..cea4b824f5f 100644 --- a/rosapps/notepad/It.rc +++ b/rosapps/notepad/It.rc @@ -5,7 +5,7 @@ * Proofread 1998 by David Lee Lambert * Copyright 2002 Sylvain Petreolle * Copyright 2003 Marcelo Duarte - * Copyright 2003 Ivan Leo Murray-Smith + * Copyright 2003-2004 Ivan Leo Puoti * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,7 +34,7 @@ MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Stampa", CMD_PRINT MENUITEM "&Imposta pagina...", CMD_PAGE_SETUP - MENUITEM "&Configurazione di stampa...", CMD_PRINTER_SETUP + MENUITEM "&Configurazione stampante...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "E&sci", CMD_EXIT } @@ -73,7 +73,7 @@ POPUP "&Aiuto" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Setup di pagina" { LTEXT "&Note a inizio pagina:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Ja.rc b/rosapps/notepad/Ja.rc new file mode 100644 index 00000000000..36c4a8170e1 --- /dev/null +++ b/rosapps/notepad/Ja.rc @@ -0,0 +1,129 @@ +/* + * Notepad (Japanese resources) + * + * Copyright 1997,98 Marcel Baur + * Proofread 1998 by David Lee Lambert + * Copyright 2002 Sylvain Petreolle + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "ƒtƒ@ƒCƒ‹(&F)" { + MENUITEM "V‹Kì¬(&N)...", CMD_NEW + MENUITEM "ŠJ‚­(&O)\tCtrl+O", CMD_OPEN + MENUITEM "•Û‘¶(&S)\tCtrl+S", CMD_SAVE + MENUITEM "–¼‘O‚ð•t‚¯‚Ä•Û‘¶(&a)...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "ˆóü(&P)", CMD_PRINT + MENUITEM "ƒy[ƒWÝ’è(&t)...", CMD_PAGE_SETUP + MENUITEM "ƒvƒŠƒ“ƒ^‚̐ݒè(&r)...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "I—¹(&x)", CMD_EXIT + } +POPUP "•ÒW(&E)" { + MENUITEM "ƒAƒ“ƒhƒD(&U)\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Ø‚èŽæ‚è(&t)\tCtrl+X", CMD_CUT + MENUITEM "ƒRƒs[(&C)\tCtrl+C", CMD_COPY + MENUITEM "ƒy[ƒXƒg(&P)\tCtrl+V", CMD_PASTE + MENUITEM "íœ(&D)\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "‘S‚Ä‘I‘ð(&a)\tCtrl+A", CMD_SELECT_ALL + MENUITEM "“ú•t‚ÆŽž(&T)\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "’·‚¢s‚ðÜ‚è•Ô‚·(&W)", CMD_WRAP + MENUITEM "ƒtƒHƒ“ƒg(&F)...", CMD_FONT + } +POPUP "ŒŸõ(&S)" { + MENUITEM "ŒŸõ(&S)\tCtrl+F", CMD_SEARCH + MENUITEM "ŽŸ‚ÌŒó•â‚ðŒŸõ(&S)\tF3", CMD_SEARCH_NEXT + } +POPUP "ƒwƒ‹ƒv(&H)" { + MENUITEM "–ÚŽŸ(&C)", CMD_HELP_CONTENTS + MENUITEM "ŒŸõ(&S)...", CMD_HELP_SEARCH + MENUITEM "ƒwƒ‹ƒv‚ÌŽg‚¢•û(&H)", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + POPUP "î•ñ(&o)..." { + MENUITEM "ƒ‰ƒCƒZƒ“ƒX(&L)", CMD_LICENSE + MENUITEM "–¢•ÛØ(&N)", CMD_NO_WARRANTY + MENUITEM "Wine‚ɂ‚¢‚Ä(&A)", CMD_ABOUT_WINE + } + } +} + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 9, "MS UI Gothic" +CAPTION "ƒy[ƒWÝ’è" +{ +LTEXT "ƒwƒbƒ_(&H):", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "ƒtƒbƒ^(&F):", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "ƒ}[ƒWƒ“(&M):", 0x144, 10, 43,160, 45 +LTEXT "¶(&L):", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "ã(&T):", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "‰E(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "‰º(&B):", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", 0x152, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "ƒwƒ‹ƒv(&H)", 0x153, 180, 39, 40, 15, WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "&s ƒy[ƒW" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ + +STRING_NOTEPAD, "ƒƒ‚’ " +STRING_ERROR, "ƒGƒ‰[" +STRING_WARNING, "Œx" +STRING_INFO, "î•ñ" + +STRING_UNTITLED, "(–³‘è)" + +STRING_ALL_FILES, "‘S‚Ẵtƒ@ƒCƒ‹ (*.*)" +STRING_TEXT_FILES_TXT, "ƒeƒLƒXƒgƒtƒ@ƒCƒ‹ (*.txt)" + +STRING_TOOLARGE, "ƒtƒ@ƒCƒ‹ '%s' ‚̃TƒCƒY‚Í‘å‚«‚·‚¬‚邽‚߁Aƒƒ‚’ ‚ł͕ҏW‚Å‚«‚Ü‚¹‚ñB\n \ +•Ê‚̃GƒfƒBƒ^‚ðŽg—p‚µ‚ĉº‚³‚¢B" +STRING_NOTEXT, "‰½‚à“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB\ +\n‰½‚©“ü—Í‚µ‚Ä‚©‚çŽÀs‚µ‚ĉº‚³‚¢B" +STRING_DOESNOTEXIST, "ƒtƒ@ƒCƒ‹ '%s'\n‚Í‘¶Ý‚µ‚Ü‚¹‚ñ\n\n \ +V‚µ‚¢ƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·‚© ?" +STRING_NOTSAVED, "ƒtƒ@ƒCƒ‹ '%s'\n‚͕ύX‚³‚ê‚Ä‚¢‚Ü‚·\n\n \ +•ÏX‚ð•Û‘¶‚µ‚Ü‚·‚© ?" +STRING_NOTFOUND, "'%s' ‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½" +STRING_OUT_OF_MEMORY, "‚±‚Ì‘€ì‚ðŽÀs‚·‚邽‚߂̃ƒ‚ƒŠ‚ª\ +‘«‚è‚Ü‚¹‚ñB \nƒƒ‚ƒŠ‚̋󂫂𑝂₷‚½‚ß‚É‚¢‚­‚‚©‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ð\nI—¹‚µ‚Ä\ +‰º‚³‚¢B" + +} diff --git a/rosapps/notepad/Makefile.in b/rosapps/notepad/Makefile.in new file mode 100644 index 00000000000..de0505f881a --- /dev/null +++ b/rosapps/notepad/Makefile.in @@ -0,0 +1,21 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = notepad.exe +APPMODE = -mwindows +IMPORTS = comdlg32 shell32 user32 gdi32 msvcrt advapi32 kernel32 +EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt +EXTRADEFS = -DNO_LIBWINE_PORT + +C_SRCS = \ + License_En.c \ + dialog.c \ + license.c \ + main.c + +RC_SRCS = rsrc.rc + +@MAKE_PROG_RULES@ + +### Dependencies: diff --git a/rosapps/notepad/Nl.rc b/rosapps/notepad/Nl.rc index fe932bb417d..28a8aa1c417 100644 --- a/rosapps/notepad/Nl.rc +++ b/rosapps/notepad/Nl.rc @@ -69,7 +69,7 @@ POPUP "&Help" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Pagina-instelling" { LTEXT "&Koptekst:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Pl.rc b/rosapps/notepad/Pl.rc new file mode 100644 index 00000000000..a634dd189b5 --- /dev/null +++ b/rosapps/notepad/Pl.rc @@ -0,0 +1,129 @@ +/* + * Notepad (Polish resources) + * + * Copyright 1997,98 Marcel Baur + * Proofread 1998 by David Lee Lambert + * Copyright 2002 Sylvain Petreolle + * Copyright 2004 Jacek Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "&Plik" { + MENUITEM "&Nowy...", CMD_NEW + MENUITEM "&Otwórz\tCtrl+O", CMD_OPEN + MENUITEM "&Zapisz\tCtrl+S", CMD_SAVE + MENUITEM "Z&apisz jako...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Drukuj", CMD_PRINT + MENUITEM "&Ustawienia strony...", CMD_PAGE_SETUP + MENUITEM "Ustawienia &drukarki...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "Zakoñ&cz", CMD_EXIT + } +POPUP "&Edycja" { + MENUITEM "&Cofnij\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Wytnij\tCtrl+X", CMD_CUT + MENUITEM "&Kopiuj\tCtrl+C", CMD_COPY + MENUITEM "Wkl&ej\tCtrl+V", CMD_PASTE + MENUITEM "&Usuñ\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Zaznacz w&szystko\tCtrl+A", CMD_SELECT_ALL + MENUITEM "Godzina/&Data\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Zawijanie wierszy", CMD_WRAP + MENUITEM "Czci&onka...", CMD_FONT + } +POPUP "&ZnajdŸ" { + MENUITEM "&ZnajdŸ\tCtrl+F", CMD_SEARCH + MENUITEM "Z&najdŸ nastêpny\tF3", CMD_SEARCH_NEXT + } +POPUP "Pomo&c" { + MENUITEM "&Tematy pomocy", CMD_HELP_CONTENTS + MENUITEM "&Szukaj...", CMD_HELP_SEARCH + MENUITEM "&Pomoc", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + POPUP "In&fo..." { + MENUITEM "&Licencja", CMD_LICENSE + MENUITEM "&BEZ GWARANCJI", CMD_NO_WARRANTY + MENUITEM "&O Wine...", CMD_ABOUT_WINE + } + } +} + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Ustawienia strony" +{ +LTEXT "&Nag³ówek:", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&Stopka:", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "&Marginesy:", 0x144, 10, 43,160, 45 +LTEXT "&Lewy:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Górny:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "P&rawy:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Dolny:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Anuluj", 0x152, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Pomoc", 0x153, 180, 39, 40, 15, WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Strona &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ + +STRING_NOTEPAD, "Notatnik" +STRING_ERROR, "B£¥D" +STRING_WARNING, "OSTRZE¯ENIE" +STRING_INFO, "Informacja" + +STRING_UNTITLED, "(bez tytu³u)" + +STRING_ALL_FILES, "Wszystkie piki (*.*)" +STRING_TEXT_FILES_TXT, "Pliki tekstowe (*.txt)" + +STRING_TOOLARGE, "Plik '%s' jest za du¿y dla notatnika.\n \ +Proszê u¿yæ innego edytora." +STRING_NOTEXT, "Nie wprowadzi³eœ ¿adnego tekstu. \ +\nProszê coœ wpisaæ i spróbowaæ ponownie." +STRING_DOESNOTEXIST, "Plik '%s' nie istnieje\n\n \ +Czy chcesz utworzyæ nowy plik ?" +STRING_NOTSAVED, "Plik '%s'\nzosta³ zmodyfikowany\n\n \ +Czy chcesz zachowaæ zmiany ?" +STRING_NOTFOUND, "Nie mo¿na odnaleŸæ '%s'." +STRING_OUT_OF_MEMORY, "Za ma³o pamiêci do wykonania tego zadania.\n \ +Zamknij jedn¹ lub wiêcej aplikacji aby zwiêkszyæ iloœæ wolnej pamiêci." + +} diff --git a/rosapps/notepad/Pt.rc b/rosapps/notepad/Pt.rc index 5ff963645b2..111e8756cc7 100644 --- a/rosapps/notepad/Pt.rc +++ b/rosapps/notepad/Pt.rc @@ -72,7 +72,7 @@ POPUP "&Ajuda" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Configurar página" { LTEXT "&Cabeçalho:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Ru.rc b/rosapps/notepad/Ru.rc index e40145d0ecd..cbce8d1ba33 100644 --- a/rosapps/notepad/Ru.rc +++ b/rosapps/notepad/Ru.rc @@ -67,7 +67,7 @@ POPUP "& DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Ïàðàìåòðû ñòðàíèöû" { LTEXT "Â&åðõíèé êîëîíòèòóë:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Si.rc b/rosapps/notepad/Si.rc index 60fe9a15201..f97187731ff 100644 --- a/rosapps/notepad/Si.rc +++ b/rosapps/notepad/Si.rc @@ -68,7 +68,7 @@ POPUP "&Pomo DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Priprava strani" +FONT 8, "MS Shell Dlg" CAPTION "Page Setup" { LTEXT "&Glava:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Sk.rc b/rosapps/notepad/Sk.rc index 8e429ef9a1e..f54bdbc9a1b 100644 --- a/rosapps/notepad/Sk.rc +++ b/rosapps/notepad/Sk.rc @@ -69,7 +69,7 @@ POPUP "&Help" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Page Setup" { LTEXT "&Header:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Sw.rc b/rosapps/notepad/Sw.rc index 4999aa6d043..c582eebc77d 100644 --- a/rosapps/notepad/Sw.rc +++ b/rosapps/notepad/Sw.rc @@ -69,7 +69,7 @@ POPUP "&Hj DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Sid Layout" { LTEXT "&Huvudnot:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Th.rc b/rosapps/notepad/Th.rc index fb0cb107943..415d934bfc4 100644 --- a/rosapps/notepad/Th.rc +++ b/rosapps/notepad/Th.rc @@ -69,7 +69,7 @@ MAIN_MENU MENU DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "»ÃѺáµè§Ë¹éÒ" { LTEXT "ËÑÇ:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Wa.rc b/rosapps/notepad/Wa.rc index 01f391c4525..440d6b8213f 100644 --- a/rosapps/notepad/Wa.rc +++ b/rosapps/notepad/Wa.rc @@ -71,7 +71,7 @@ POPUP "&Aide" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" CAPTION "Arindjmint del Pådje" { LTEXT "&Tite:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/Zh.rc b/rosapps/notepad/Zh.rc index 8f2b554c2a6..5ceb2c05fac 100644 --- a/rosapps/notepad/Zh.rc +++ b/rosapps/notepad/Zh.rc @@ -66,7 +66,7 @@ POPUP " DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 10, "Helv" +FONT 10, "MS Shell Dlg" CAPTION "Ò³ÃæÉèÖÃ" { LTEXT "ҳü£¨&H£©:", 0x140, 10, 07, 40, 15 diff --git a/rosapps/notepad/dialog.c b/rosapps/notepad/dialog.c index 7cbee4fe87f..9659097a93f 100644 --- a/rosapps/notepad/dialog.c +++ b/rosapps/notepad/dialog.c @@ -360,7 +360,8 @@ VOID DIALOG_FilePrint(VOID) PRINTDLG printer; SIZE szMetric; int cWidthPels, cHeightPels, border; - int xLeft, yTop, i, pagecount, dopage, copycount; + int xLeft, yTop, pagecount, dopage, copycount; + unsigned int i; LOGFONT hdrFont; HFONT font, old_font=0; DWORD size; diff --git a/rosapps/notepad/main.c b/rosapps/notepad/main.c index a63f0535d24..a783681bceb 100644 --- a/rosapps/notepad/main.c +++ b/rosapps/notepad/main.c @@ -127,8 +127,8 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, static const WCHAR editW[] = { 'e','d','i','t',0 }; RECT rc; GetClientRect(hWnd, &rc); - Globals.hEdit = CreateWindow(editW, NULL, - WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | + Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, + WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0, 0, rc.right, rc.bottom, hWnd, NULL, Globals.hInstance, NULL); @@ -199,14 +199,13 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName) static void HandleCommandLine(LPWSTR cmdline) { WCHAR delimiter; + int opt_print=0; /* skip white space */ - while (*cmdline && *cmdline == ' ') cmdline++; + while (*cmdline == ' ') cmdline++; /* skip executable name */ - delimiter = ' '; - if (*cmdline == '"') - delimiter = '"'; + delimiter = (*cmdline == '"' ? '"' : ' '); do { @@ -215,7 +214,7 @@ static void HandleCommandLine(LPWSTR cmdline) while (*cmdline && *cmdline != delimiter); if (*cmdline == delimiter) cmdline++; - while (*cmdline && (*cmdline == ' ' || *cmdline == '-')) + while (*cmdline == ' ' || *cmdline == '-' || *cmdline == '/') { WCHAR option; @@ -223,14 +222,14 @@ static void HandleCommandLine(LPWSTR cmdline) option = *cmdline; if (option) cmdline++; - while (*cmdline && *cmdline == ' ') cmdline++; + while (*cmdline == ' ') cmdline++; switch(option) { case 'p': - case 'P': printf("Print file: "); - /* TODO - not yet able to print a file */ - break; + case 'P': + opt_print=1; + break; } } @@ -275,6 +274,8 @@ static void HandleCommandLine(LPWSTR cmdline) { DoOpenFile(file_name); InvalidateRect(Globals.hMainWnd, NULL, FALSE); + if (opt_print) + DIALOG_FilePrint(); } else { diff --git a/rosapps/notepad/rsrc.rc b/rosapps/notepad/rsrc.rc index abb0b08b26b..8dc59476fcd 100644 --- a/rosapps/notepad/rsrc.rc +++ b/rosapps/notepad/rsrc.rc @@ -47,7 +47,9 @@ ID_ACCEL ACCELERATORS #include "Fr.rc" #include "Hu.rc" #include "It.rc" +#include "Ja.rc" #include "Nl.rc" +#include "Pl.rc" #include "Pt.rc" #include "Ru.rc" #include "Si.rc"