diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc index 1aebb5d28f7..6cc67477ba5 100644 --- a/programs/notepad/Da.rc +++ b/programs/notepad/Da.rc @@ -22,49 +22,49 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL { POPUP "&Filef" { - MENUITEM "&Ny...", 0x100 - MENUITEM "Å&bn\tEnter", 0x101 - MENUITEM "&Gem", 0x102 - MENUITEM "Gem so&m...", 0x103 - MENUITEM "&Udskriv", 0x104 - MENUITEM "Side&opsætning...", 0x105 - MENUITEM "&Indstil printer...", 0x106 + MENUITEM "&Ny...", CMD_NEW + MENUITEM "Å&bn\tEnter", CMD_OPEN + MENUITEM "&Gem", CMD_SAVE + MENUITEM "Gem so&m...", CMD_SAVE_AS + MENUITEM "&Udskriv", CMD_PRINT + MENUITEM "Side&opsætning...", CMD_PAGE_SETUP + MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "&Afslut", 0x108 + MENUITEM "&Afslut", CMD_EXIT } POPUP "&Rediger" { - MENUITEM "&Fortryd\tCtrl+Z", 0x110 + MENUITEM "&Fortryd\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "&Klip\tCtrl+X", 0x111 - MENUITEM "K&opier\tCtrl+C", 0x112 - MENUITEM "Sæt &ind\tCtrl+V", 0x113 - MENUITEM "&Slet\tDel", 0x114 + MENUITEM "&Klip\tCtrl+X", CMD_CUT + MENUITEM "K&opier\tCtrl+C", CMD_COPY + MENUITEM "Sæt &ind\tCtrl+V", CMD_PASTE + MENUITEM "&Slet\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Marker &alt", 0x116 - MENUITEM "&Dato/tid\tF5", 0x117 + MENUITEM "Marker &alt", CMD_SELECT_ALL + MENUITEM "&Dato/tid\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "Automatisk &linjeskift", 0x119 + MENUITEM "Automatisk &linjeskift", CMD_WRAP } POPUP "&Søg" { - MENUITEM "&Søg...", 0x120 - MENUITEM "&Find næste\tF3", 0x121 + MENUITEM "&Søg...", CMD_SEARCH + MENUITEM "&Find næste\tF3", CMD_SEARCH_NEXT } POPUP "&Hjælp" { - MENUITEM "&Indhold", 0x130 - MENUITEM "&Søg efter hjælp om...", 0x131 - MENUITEM "&Brug af Hjælp", 0x132 + MENUITEM "&Indhold", CMD_HELP_CONTENTS + MENUITEM "&Søg efter hjælp om...", CMD_HELP_SEARCH + MENUITEM "&Brug af Hjælp", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "&Om Notesblok..." { - MENUITEM "&Licens", 0x135 - MENUITEM "&NO WARRANTY", 0x136 - MENUITEM "&Om WINE", 0x137 + MENUITEM "&Licens", CMD_LICENSE + MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY + MENUITEM "&Om WINE", CMD_ABOUT_WINE } } } /* Dialog `Page setup' */ -DIALOG_PAGESETUP_ DIALOG 0, 0, 225, 95 +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "Helv" @@ -92,33 +92,33 @@ PUSHBUTTON "&Hj STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL { -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Page &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_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Page &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, "Notesblok" -STRING_ERROR, "FEJL" -STRING_WARNING, "ADVARSEL" -STRING_INFO, "Information" +STRING_NOTEPAD, "Notesblok" +STRING_ERROR, "FEJL" +STRING_WARNING, "ADVARSEL" +STRING_INFO, "Information" -STRING_UNTITLED, "(ikke-navngivet)" +STRING_UNTITLED, "(ikke-navngivet)" -STRING_ALL_FILES, "Alle filer (*.*)" -STRING_TEXT_FILES_TXT, "Tekst filer (*.txt)" +STRING_ALL_FILES, "Alle filer (*.*)" +STRING_TEXT_FILES_TXT, "Tekst filer (*.txt)" -STRING_TOOLARGE, "Filen '%s' er for stor til Notesblok. \ +STRING_TOOLARGE, "Filen '%s' er for stor til Notesblok. \ \nBrug en anden editor til at redigere filen." -STRING_NOTEXT, "Du har ikke skrevet noget tekst. \ +STRING_NOTEXT, "Du har ikke skrevet noget tekst. \ \nSkriv noget tekst, og prøv så igen" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ +STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ +STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ Would you like to save the changes ?" -STRING_NOTFOUND, "Kan ikke finde '%s'." -STRING_OUT_OF_MEMORY, "Der er ikke nok hukommelse til at udføre \ +STRING_NOTFOUND, "Kan ikke finde '%s'." +STRING_OUT_OF_MEMORY, "Der er ikke nok hukommelse til at udføre \ denne operation. \nAfslut et eller flere aktive programmer for at frigøre \ hukommelse, og prøv så igen." diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc index 03e610e9f0f..6e2624537a7 100644 --- a/programs/notepad/De.rc +++ b/programs/notepad/De.rc @@ -23,49 +23,49 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { POPUP "&Datei" { - MENUITEM "&Neu...", 0x100 - MENUITEM "Ö&ffnen...", 0x101 - MENUITEM "&Speichern", 0x102 - MENUITEM "Speichern &unter...", 0x103 - MENUITEM "&Drucken", 0x104 - MENUITEM "Seite ein&richten...", 0x105 - MENUITEM "Drucker&einrichtung...", 0x106 + MENUITEM "&Neu...", CMD_NEW + MENUITEM "Ö&ffnen...", CMD_OPEN + MENUITEM "&Speichern", CMD_SAVE + MENUITEM "Speichern &unter...", CMD_SAVE_AS + MENUITEM "&Drucken", CMD_PRINT + MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP + MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "&Beenden", 0x108 + MENUITEM "&Beenden", CMD_EXIT } POPUP "&Bearbeiten" { - MENUITEM "&Rückgängig\tStrg+Z", 0x110 + MENUITEM "&Rückgängig\tStrg+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "&Ausschneiden\tStrg+X", 0x111 - MENUITEM "&Kopieren\tStrg+C", 0x112 - MENUITEM "&Einfügen\tStrg+V", 0x113 - MENUITEM "&Löschen\tEntf", 0x114 + MENUITEM "&Ausschneiden\tStrg+X", CMD_CUT + MENUITEM "&Kopieren\tStrg+C", CMD_COPY + MENUITEM "&Einfügen\tStrg+V", CMD_PASTE + MENUITEM "&Löschen\tEntf", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Alles &markieren", 0x116 - MENUITEM "&Uhrzeit/Datum\tF5", 0x117 + MENUITEM "Alles &markieren", CMD_SELECT_ALL + MENUITEM "&Uhrzeit/Datum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Zeilenumbruch", 0x119 + MENUITEM "&Zeilenumbruch", CMD_WRAP } POPUP "&Suchen" { - MENUITEM "Suchen...", 0x120 - MENUITEM "&Weitersuchen\tF3", 0x121 + MENUITEM "Suchen...", CMD_SEARCH + MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT } POPUP "&Hilfe" { - MENUITEM "&Inhalt", 0x130 - MENUITEM "&Suchen...", 0x131 - MENUITEM "&Hilfe benutzen", 0x132 + MENUITEM "&Inhalt", CMD_HELP_CONTENTS + MENUITEM "&Suchen...", CMD_HELP_SEARCH + MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "Inf&o..." { - MENUITEM "&Lizenz", 0x135 - MENUITEM "&KEINE GARANTIE", 0x136 - MENUITEM "&Über Wine", 0x137 + MENUITEM "&Lizenz", CMD_LICENSE + MENUITEM "&KEINE GARANTIE", CMD_NO_WARRANTY + MENUITEM "&Über Wine", CMD_ABOUT_WINE } } } /* Dialog `Page setup' */ -DIALOG_PAGESETUP_ DIALOG 0, 0, 225, 95 +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "Helv" @@ -93,34 +93,34 @@ PUSHBUTTON "&Hilfe", 0x153, 180, 39, 40, 15, WS_TABSTOP STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Page &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_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Page &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_INFO, "Information" +STRING_NOTEPAD, "Editor" +STRING_ERROR, "FEHLER" +STRING_WARNING, "ACHTUNG" +STRING_INFO, "Information" -STRING_UNTITLED, "(unbenannt)" +STRING_UNTITLED, "(unbenannt)" -STRING_ALL_FILES, "Alle Dateien (*.*)" -STRING_TEXT_FILES_TXT, "Textdateien (*.txt)" +STRING_ALL_FILES, "Alle Dateien (*.*)" +STRING_TEXT_FILES_TXT, "Textdateien (*.txt)" -STRING_TOOLARGE, "'%s' ist zu gross für den Editor\n \ +STRING_TOOLARGE, "'%s' ist zu gross für den Editor\n \ Benutzen Sie bitte einen anderen Editor, um diese Datei zu bearbeiten." -STRING_NOTEXT, "Sie haben keinen Text eingegeben, der \ +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 \ +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 \ +STRING_NOTSAVED, "Datei %s\n wurde geaendert.\n\n \ Moechten Sie die Aenderungen speichern ?" -STRING_NOTFOUND, "'%s' kann nicht gefunden werden." -STRING_OUT_OF_MEMORY, "Nicht genügend Arbeitsspeicher, \ +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 \ \nAnwendungen, um den verfügbaren Arbeitsspeicher zu \nerhöhen." diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index 30a714f9c91..54ef8a15d32 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -23,49 +23,49 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL { POPUP "&File" { - MENUITEM "&New...", 0x100 - MENUITEM "&Open", 0x101 - MENUITEM "&Save", 0x102 - MENUITEM "Save &as...", 0x103 - MENUITEM "&Print", 0x104 - MENUITEM "Page Se&tup...", 0x105 - MENUITEM "P&rinter Setup...", 0x106 + MENUITEM "&New...", CMD_NEW + MENUITEM "&Open", CMD_OPEN + MENUITEM "&Save", CMD_SAVE + MENUITEM "Save &as...", CMD_SAVE_AS + MENUITEM "&Print", CMD_PRINT + MENUITEM "Page Se&tup...", CMD_PAGE_SETUP + MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "&Exit", 0x108 + MENUITEM "&Exit", CMD_EXIT } POPUP "&Edit" { - MENUITEM "&Undo\tCtrl+Z", 0x110 + MENUITEM "&Undo\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", 0x111 - MENUITEM "&Copy\tCtrl+C", 0x112 - MENUITEM "&Paste\tCtrl+V", 0x113 - MENUITEM "&Delete\tDel", 0x114 + MENUITEM "Cu&t\tCtrl+X", CMD_CUT + MENUITEM "&Copy\tCtrl+C", CMD_COPY + MENUITEM "&Paste\tCtrl+V", CMD_PASTE + MENUITEM "&Delete\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Select &all", 0x116 - MENUITEM "&Time/Date\tF5", 0x117 + MENUITEM "Select &all", CMD_SELECT_ALL + MENUITEM "&Time/Date\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Wrap long lines", 0x119 + MENUITEM "&Wrap long lines", CMD_WRAP } POPUP "&Search" { - MENUITEM "&Search", 0x120 - MENUITEM "&Search next\tF3", 0x121 + MENUITEM "&Search", CMD_SEARCH + MENUITEM "&Search next\tF3", CMD_SEARCH_NEXT } POPUP "&Help" { - MENUITEM "&Contents", 0x130 - MENUITEM "&Search...", 0x131 - MENUITEM "&Help on help", 0x132 + MENUITEM "&Contents", CMD_HELP_CONTENTS + MENUITEM "&Search...", CMD_HELP_SEARCH + MENUITEM "&Help on help", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "Inf&o..." { - MENUITEM "&License", 0x135 - MENUITEM "&NO WARRANTY", 0x136 - MENUITEM "&About Wine", 0x137 + MENUITEM "&License", CMD_LICENSE + MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY + MENUITEM "&About Wine", CMD_ABOUT_WINE } } } /* Dialog `Page setup' */ -DIALOG_PAGESETUP_ DIALOG 0, 0, 225, 95 +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "Helv" @@ -93,33 +93,33 @@ PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15, WS_TABSTOP STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL { -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Page &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_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Page &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, "Notepad" -STRING_ERROR, "ERROR" -STRING_WARNING, "WARNING" -STRING_INFO, "Information" +STRING_NOTEPAD, "Notepad" +STRING_ERROR, "ERROR" +STRING_WARNING, "WARNING" +STRING_INFO, "Information" -STRING_UNTITLED, "(untitled)" +STRING_UNTITLED, "(untitled)" -STRING_ALL_FILES, "All files (*.*)" -STRING_TEXT_FILES_TXT, "Text files (*.txt)" +STRING_ALL_FILES, "All files (*.*)" +STRING_TEXT_FILES_TXT, "Text files (*.txt)" -STRING_TOOLARGE, "File '%s' is too large for notepad.\n \ +STRING_TOOLARGE, "File '%s' is too large for notepad.\n \ Please use a different editor." -STRING_NOTEXT, "You didn't enter any text. \ +STRING_NOTEXT, "You didn't enter any text. \ \nPlease type something and try again" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ +STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ +STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ Would you like to save the changes ?" -STRING_NOTFOUND, "'%s' can not be found." -STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ +STRING_NOTFOUND, "'%s' can not be found." +STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ task. \nClose one or more applications to increase the amount of \nfree \ memory." diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc index 7fdcc68d131..2e0ce923796 100644 --- a/programs/notepad/Es.rc +++ b/programs/notepad/Es.rc @@ -24,49 +24,49 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL { POPUP "&Archivo" { - MENUITEM "&Nuevo", 0x100 - MENUITEM "&Abrir", 0x101 - MENUITEM "&Guardar", 0x102 - MENUITEM "Guardar co&mo...", 0x103 - MENUITEM "&Imprimir", 0x104 - MENUITEM "&Configurar página...", 0x105 - MENUITEM "&Configuraciķn impresora...", 0x106 + MENUITEM "&Nuevo", CMD_NEW + MENUITEM "&Abrir", CMD_OPEN + MENUITEM "&Guardar", CMD_SAVE + MENUITEM "Guardar co&mo...", CMD_SAVE_AS + MENUITEM "&Imprimir", CMD_PRINT + MENUITEM "&Configurar página...", CMD_PAGE_SETUP + MENUITEM "&Configuraciķn impresora...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "&Salir", 0x108 + MENUITEM "&Salir", CMD_EXIT } POPUP "&Editar" { - MENUITEM "&Deshacer\tCtrl+Z", 0x110 + MENUITEM "&Deshacer\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "Cor&tar\tCtrl+X", 0x111 - MENUITEM "&Copiar\tCtrl+C", 0x112 - MENUITEM "&Pegar\tCtrl+V", 0x113 - MENUITEM "&Borrar\tDel", 0x114 + 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", 0x116 - MENUITEM "&Hora y Fecha\tF5", 0x117 + MENUITEM "Seleccionar t&odo", CMD_SELECT_ALL + MENUITEM "&Hora y Fecha\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Ajuste de línea automático", 0x119 + MENUITEM "&Ajuste de línea automático", CMD_WRAP } POPUP "&Buscar" { - MENUITEM "&Buscar...", 0x120 - MENUITEM "Buscar &siguiente\tF3", 0x121 + MENUITEM "&Buscar...", CMD_SEARCH + MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT } POPUP "&Ayuda" { - MENUITEM "&Indice", 0x130 - MENUITEM "&Buscar...", 0x131 - MENUITEM "Ayuda sobre la ayuda", 0x132 + MENUITEM "&Indice", CMD_HELP_CONTENTS + MENUITEM "&Buscar...", CMD_HELP_SEARCH + MENUITEM "Ayuda sobre la ayuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "Inf&ormaciķn..." { - MENUITEM "&Licencia", 0x135 - MENUITEM "SIN &GARANTÍA", 0x136 - MENUITEM "&Acerca de Wine", 0x137 + MENUITEM "&Licencia", CMD_LICENSE + MENUITEM "SIN &GARANTÍA", CMD_NO_WARRANTY + MENUITEM "&Acerca de Wine", CMD_ABOUT_WINE } } } /* Dialog `Page setup' */ -DIALOG_PAGESETUP_ DIALOG 0, 0, 225, 95 +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "Helv" @@ -94,33 +94,33 @@ PUSHBUTTON "&Ayuda", 0x153, 180, 39, 40, 15, WS_TABSTOP STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL { -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_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, "CUIDADO" -STRING_INFO, "Informaciķn" +STRING_NOTEPAD, "Bloc de Notas" +STRING_ERROR, "ERROR" +STRING_WARNING, "CUIDADO" +STRING_INFO, "Informaciķn" -STRING_UNTITLED, "(sin título)" +STRING_UNTITLED, "(sin título)" -STRING_ALL_FILES, "Todos los archivos (*.*)" -STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" +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 \ +STRING_TOOLARGE, "El archivo '%s' es demasiado grande para el bloc de notas.\n \ Use otro editor." -STRING_NOTEXT, "Ud. no escribiķ nada. \ +STRING_NOTEXT, "Ud. no escribiķ nada. \ \nPor favor escriba algo y pruebe de nuevo" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ +STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ Do you want to create a new file ?" -STRING_NOTSAVED, "El texto en el archivo '%s' ha cambiado\n\n \ +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 \ +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/programs/notepad/Fi.rc b/programs/notepad/Fi.rc index 57d3f05ef34..41f5e128f5e 100644 --- a/programs/notepad/Fi.rc +++ b/programs/notepad/Fi.rc @@ -22,49 +22,49 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL { POPUP "&Tiedosto" { - MENUITEM "&Uusi...", 0x100 - MENUITEM "&Avaa", 0x101 - MENUITEM "Ta&lleta", 0x102 - MENUITEM "Talleta &nimellä...", 0x103 - MENUITEM "T&ulosta", 0x104 - MENUITEM "&Sivun asetukset...", 0x105 - MENUITEM "&Kirjoittimen asetukset...", 0x106 + MENUITEM "&Uusi...", CMD_NEW + MENUITEM "&Avaa", CMD_OPEN + MENUITEM "Ta&lleta", CMD_SAVE + MENUITEM "Talleta &nimellä...", CMD_SAVE_AS + MENUITEM "T&ulosta", CMD_PRINT + MENUITEM "&Sivun asetukset...", CMD_PAGE_SETUP + MENUITEM "&Kirjoittimen asetukset...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "&Poistu", 0x108 + MENUITEM "&Poistu", CMD_EXIT } POPUP "&Muokkaa" { - MENUITEM "&Palauta\tCtrl+Z", 0x110 + MENUITEM "&Palauta\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "&Leikkaa\tCtrl+X", 0x111 - MENUITEM "&Kopioi\tCtrl+C", 0x112 - MENUITEM "L&iitä\tCtrl+V", 0x113 - MENUITEM "P&oista\tDel", 0x114 + MENUITEM "&Leikkaa\tCtrl+X", CMD_CUT + MENUITEM "&Kopioi\tCtrl+C", CMD_COPY + MENUITEM "L&iitä\tCtrl+V", CMD_PASTE + MENUITEM "P&oista\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "&Valitse kaikki", 0x116 - MENUITEM "&Aika/Päivämäärä\tF5", 0x117 + MENUITEM "&Valitse kaikki", CMD_SELECT_ALL + MENUITEM "&Aika/Päivämäärä\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "Ka&tkaise pitkä rivi", 0x119 + MENUITEM "Ka&tkaise pitkä rivi", CMD_WRAP } POPUP "&Etsi" { - MENUITEM "Etsi...", 0x120 - MENUITEM "Etsi &seuraava\tF3", 0x121 + MENUITEM "Etsi...", CMD_SEARCH + MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT } POPUP "&Apua" { - MENUITEM "&Sisältö", 0x130 - MENUITEM "&Etsi...", 0x131 - MENUITEM "Apua &Opastuksesta", 0x132 + MENUITEM "&Sisältö", CMD_HELP_CONTENTS + MENUITEM "&Etsi...", CMD_HELP_SEARCH + MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "Inf&o..." { - MENUITEM "&Lisenssi", 0x135 - MENUITEM "&EI TAKUUTA", 0x136 - MENUITEM "&Tietoja Wine:ista", 0x137 + MENUITEM "&Lisenssi", CMD_LICENSE + MENUITEM "&EI TAKUUTA", CMD_NO_WARRANTY + MENUITEM "&Tietoja Wine:ista", CMD_ABOUT_WINE } } } /* Dialog `Page setup' */ -DIALOG_PAGESETUP_ DIALOG 0, 0, 225, 95 +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "Helv" diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc index 3fbbd2f54e2..9ebece492c3 100644 --- a/programs/notepad/Fr.rc +++ b/programs/notepad/Fr.rc @@ -23,49 +23,49 @@ MAIN_MENU MENU LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { POPUP "&Fichier" { - MENUITEM "&Nouveau...", 0x100 - MENUITEM "&Ouvrir", 0x101 - MENUITEM "&Enregistrer", 0x102 - MENUITEM "Enregistrer &sous...", 0x103 - MENUITEM "Im&primer", 0x104 - MENUITEM "&Mise en page...", 0x105 - MENUITEM "&Configuration de l'imprimante...", 0x106 + MENUITEM "&Nouveau...", CMD_NEW + MENUITEM "&Ouvrir", CMD_OPEN + MENUITEM "&Enregistrer", CMD_SAVE + MENUITEM "Enregistrer &sous...", CMD_SAVE_AS + MENUITEM "Im&primer", CMD_PRINT + MENUITEM "&Mise en page...", CMD_PAGE_SETUP + MENUITEM "&Configuration de l'imprimante...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "&Quitter", 0x108 + MENUITEM "&Quitter", CMD_EXIT } POPUP "&Edition" { - MENUITEM "&Annuler\tCtrl+Z", 0x110 + MENUITEM "&Annuler\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "Co&uper\tCtrl+X", 0x111 - MENUITEM "&Copier\tCtrl+C", 0x112 - MENUITEM "&Coller\tCtrl+V", 0x113 - MENUITEM "&Effacer\tDel", 0x114 + MENUITEM "Co&uper\tCtrl+X", CMD_CUT + MENUITEM "&Copier\tCtrl+C", CMD_COPY + MENUITEM "&Coller\tCtrl+V", CMD_PASTE + MENUITEM "&Effacer\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Tout &sélectionner", 0x116 - MENUITEM "&Heure/Date\tF5", 0x117 + MENUITEM "Tout &sélectionner", CMD_SELECT_ALL + MENUITEM "&Heure/Date\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Retour ā la ligne", 0x119 + MENUITEM "&Retour ā la ligne", CMD_WRAP } POPUP "&Rechercher" { - MENUITEM "&Rechercher", 0x120 - MENUITEM "&Suivant\tF3", 0x121 + MENUITEM "&Rechercher", CMD_SEARCH + MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT } POPUP "&Aide" { - MENUITEM "&Sommaire", 0x130 - MENUITEM "&Rechercher...", 0x131 - MENUITEM "&Aide sur l'aide", 0x132 + MENUITEM "&Sommaire", CMD_HELP_CONTENTS + MENUITEM "&Rechercher...", CMD_HELP_SEARCH + MENUITEM "&Aide sur l'aide", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "Inf&o..." { - MENUITEM "&Licence", 0x135 - MENUITEM "&AUCUNE GARANTIE", 0x136 - MENUITEM "&A propos de Wine", 0x137 + MENUITEM "&Licence", CMD_LICENSE + MENUITEM "&AUCUNE GARANTIE", CMD_NO_WARRANTY + MENUITEM "&A propos de Wine", CMD_ABOUT_WINE } } } /* Dialog `Page setup' */ -DIALOG_PAGESETUP_ DIALOG 0, 0, 225, 95 +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "Helv" @@ -93,33 +93,33 @@ PUSHBUTTON "&Aide", 0x153, 180, 39, 40, 15, WS_TABSTOP STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Page &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_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Page &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, "Notepad" -STRING_ERROR, "ERREUR" -STRING_WARNING, "ATTENTION" -STRING_INFO, "Information" +STRING_NOTEPAD, "Notepad" +STRING_ERROR, "ERREUR" +STRING_WARNING, "ATTENTION" +STRING_INFO, "Information" -STRING_UNTITLED, "(sans-titre)" +STRING_UNTITLED, "(sans-titre)" -STRING_ALL_FILES, "Tous fichiers (*.*)" -STRING_TEXT_FILES_TXT, "Fichiers texte (*.txt)" +STRING_ALL_FILES, "Tous fichiers (*.*)" +STRING_TEXT_FILES_TXT, "Fichiers texte (*.txt)" -STRING_TOOLARGE, "Le fichier '%s' est trop grand pour le bloc-notes.\n \ +STRING_TOOLARGE, "Le fichier '%s' est trop grand pour le bloc-notes.\n \ Veuillez utiliser un autre éditeur." -STRING_NOTEXT, "Vous n'avez pas entré de texte. Veuillez taper quelque chose et recommencer\ +STRING_NOTEXT, "Vous n'avez pas entré de texte. Veuillez taper quelque chose et recommencer\ \n" -STRING_DOESNOTEXIST, "Le fichier '%s'\n\'existe pas.\n\n \ +STRING_DOESNOTEXIST, "Le fichier '%s'\n\'existe pas.\n\n \ Voulez vous créer un nouveau fichier ?" -STRING_NOTSAVED, "Le fichier '%s'\na été modifié\n\n \ +STRING_NOTSAVED, "Le fichier '%s'\na été modifié\n\n \ Voulez vous enregistrer vos modifications ?" -STRING_NOTFOUND, "'%s' non trouvé." -STRING_OUT_OF_MEMORY, "Pas assez de mémoire pour finir cette tâche. \ +STRING_NOTFOUND, "'%s' non trouvé." +STRING_OUT_OF_MEMORY, "Pas assez de mémoire pour finir cette tâche. \ task. \n Fermez une ou plusier applications pour libérer\n\ de la mémoire." diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index ef1b5c84acf..0d98c9a0926 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -6,15 +6,11 @@ MODULE = notepad.exe APPMODE = gui IMPORTS = comdlg32 shell32 user32 gdi32 kernel32 -LICENSELANG = En - C_SRCS = \ + License_En.c \ dialog.c \ - language.c \ license.c \ - main.c \ - search.c \ - $(LICENSELANG:%=License_%.c) + main.c RC_SRCS = rsrc.rc diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index fdd039eacba..57a0462eb78 100644 --- a/programs/notepad/Pt.rc +++ b/programs/notepad/Pt.rc @@ -22,49 +22,49 @@ MAIN_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL { POPUP "&Arquivo" { - MENUITEM "&Novo...", 0x100 - MENUITEM "A&brir", 0x101 - MENUITEM "&Salvar", 0x102 - MENUITEM "Salvar &como...", 0x103 - MENUITEM "&Imprimir", 0x104 - MENUITEM "C&onfigurar Página...", 0x105 - MENUITEM "Configurar I&mpressora...", 0x106 + MENUITEM "&Novo...", CMD_NEW + MENUITEM "A&brir", CMD_OPEN + MENUITEM "&Salvar", CMD_SAVE + MENUITEM "Salvar &como...", CMD_SAVE_AS + MENUITEM "&Imprimir", CMD_PRINT + MENUITEM "C&onfigurar Página...", CMD_PAGE_SETUP + MENUITEM "Configurar I&mpressora...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "&Sair", 0x108 + MENUITEM "&Sair", CMD_EXIT } POPUP "&Editar" { - MENUITEM "&Desfazer\tCtrl+Z", 0x110 + MENUITEM "&Desfazer\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "C&ortar\tCtrl+X", 0x111 - MENUITEM "&Copiar\tCtrl+C", 0x112 - MENUITEM "Co&lar\tCtrl+V", 0x113 - MENUITEM "&Delete\tDel", 0x114 + MENUITEM "C&ortar\tCtrl+X", CMD_CUT + MENUITEM "&Copiar\tCtrl+C", CMD_COPY + MENUITEM "Co&lar\tCtrl+V", CMD_PASTE + MENUITEM "&Delete\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Selecionar &Tudo", 0x116 - MENUITEM "&Data/Hora\tF5", 0x117 + MENUITEM "Selecionar &Tudo", CMD_SELECT_ALL + MENUITEM "&Data/Hora\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Quebrar linhas longas", 0x119 + MENUITEM "&Quebrar linhas longas", CMD_WRAP } POPUP "&Pesquisa" { - MENUITEM "Pesquisar...", 0x120 - MENUITEM "&Procurar Prķxima\tF3", 0x121 + MENUITEM "Pesquisar...", CMD_SEARCH + MENUITEM "&Procurar Prķxima\tF3", CMD_SEARCH_NEXT } POPUP "&Ajuda" { - MENUITEM "&Conteúdo", 0x130 - MENUITEM "&Procurar...", 0x131 - MENUITEM "&Ajuda na ajuda", 0x132 + MENUITEM "&Conteúdo", CMD_HELP_CONTENTS + MENUITEM "&Procurar...", CMD_HELP_SEARCH + MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "Inf&ormaįões..." { - MENUITEM "&Licenįa", 0x135 - MENUITEM "&SEM GARANTIA", 0x136 - MENUITEM "&Sobre Wine", 0x137 + MENUITEM "&Licenįa", CMD_LICENSE + MENUITEM "&SEM GARANTIA", CMD_NO_WARRANTY + MENUITEM "&Sobre Wine", CMD_ABOUT_WINE } } } /* Dialog `Page setup' */ -DIALOG_PAGESETUP_ DIALOG 0, 0, 225, 95 +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "Helv" diff --git a/programs/notepad/README b/programs/notepad/README deleted file mode 100644 index 0abead9100b..00000000000 --- a/programs/notepad/README +++ /dev/null @@ -1,16 +0,0 @@ - -NOTEPAD for WINE -================ - -There is now a web page dedicated to Notepad for Wine I am maintaing. -Please see http://www.vis.inf.ethz.ch/students/mbaur/notepad for -latest info about Notepad. This page also includes screenshots. - -This is an early release of notepad and most of the code is still -broken. It will probably compile but the application will not make -much sense yet. - -Please see file TODO for things to do and keep the file ChangeLog -up to date. - -I also try to read wine-devel@winehq.com frequently. diff --git a/programs/notepad/Sk.rc b/programs/notepad/Sk.rc index ef0353919c2..e71c6fa41c9 100644 --- a/programs/notepad/Sk.rc +++ b/programs/notepad/Sk.rc @@ -23,49 +23,49 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_NEUTRAL { POPUP "&File" { - MENUITEM "&New...", 0x100 - MENUITEM "&Open", 0x101 - MENUITEM "&Save", 0x102 - MENUITEM "Save &as...", 0x103 - MENUITEM "&Print", 0x104 - MENUITEM "Page Se&tup...", 0x105 - MENUITEM "P&rinter Setup...", 0x106 + MENUITEM "&New...", CMD_NEW + MENUITEM "&Open", CMD_OPEN + MENUITEM "&Save", CMD_SAVE + MENUITEM "Save &as...", CMD_SAVE_AS + MENUITEM "&Print", CMD_PRINT + MENUITEM "Page Se&tup...", CMD_PAGE_SETUP + MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "&Exit", 0x108 + MENUITEM "&Exit", CMD_EXIT } POPUP "&Edit" { - MENUITEM "&Undo\tCtrl+Z", 0x110 + MENUITEM "&Undo\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", 0x111 - MENUITEM "&Copy\tCtrl+C", 0x112 - MENUITEM "&Paste\tCtrl+V", 0x113 - MENUITEM "&Delete\tDel", 0x114 + MENUITEM "Cu&t\tCtrl+X", CMD_CUT + MENUITEM "&Copy\tCtrl+C", CMD_COPY + MENUITEM "&Paste\tCtrl+V", CMD_PASTE + MENUITEM "&Delete\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Select &all", 0x116 - MENUITEM "&Time/Date\tF5", 0x117 + MENUITEM "Select &all", CMD_SELECT_ALL + MENUITEM "&Time/Date\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Wrap long lines", 0x119 + MENUITEM "&Wrap long lines", CMD_WRAP } POPUP "&Search" { - MENUITEM "&Search", 0x120 - MENUITEM "&Search next\tF3", 0x121 + MENUITEM "&Search", CMD_SEARCH + MENUITEM "&Search next\tF3", CMD_SEARCH_NEXT } POPUP "&Help" { - MENUITEM "&Contents", 0x130 - MENUITEM "&Search...", 0x131 - MENUITEM "&Help on help", 0x132 + MENUITEM "&Contents", CMD_HELP_CONTENTS + MENUITEM "&Search...", CMD_HELP_SEARCH + MENUITEM "&Help on help", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "Inf&o..." { - MENUITEM "&License", 0x135 - MENUITEM "&NO WARRANTY", 0x136 - MENUITEM "&About Wine", 0x137 + MENUITEM "&License", CMD_LICENSE + MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY + MENUITEM "&About Wine", CMD_ABOUT_WINE } } } /* Dialog `Page setup' */ -DIALOG_PAGESETUP_ DIALOG 0, 0, 225, 95 +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_SLOVAK, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "Helv" diff --git a/programs/notepad/Sw.rc b/programs/notepad/Sw.rc index a37e5e6f18e..67ca44a5e12 100644 --- a/programs/notepad/Sw.rc +++ b/programs/notepad/Sw.rc @@ -23,49 +23,49 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { POPUP "&Arkiv" { - MENUITEM "&Ny...", 0x100 - MENUITEM "Ö&ppna", 0x101 - MENUITEM "&Spara", 0x102 - MENUITEM "Spara &som...", 0x103 - MENUITEM "&Skriv ut", 0x104 - MENUITEM "Sid La&yout...", 0x105 - MENUITEM "Skrivar &inställningar...", 0x106 + MENUITEM "&Ny...", CMD_NEW + MENUITEM "Ö&ppna", CMD_OPEN + MENUITEM "&Spara", CMD_SAVE + MENUITEM "Spara &som...", CMD_SAVE_AS + MENUITEM "&Skriv ut", CMD_PRINT + MENUITEM "Sid La&yout...", CMD_PAGE_SETUP + MENUITEM "Skrivar &inställningar...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "&Avsluta", 0x108 + MENUITEM "&Avsluta", CMD_EXIT } POPUP "&Redigera" { - MENUITEM "&Undo\tCtrl+Z", 0x110 + MENUITEM "&Undo\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "Klippa\tCtrl+X", 0x111 - MENUITEM "&Kopiera\tCtrl+C", 0x112 - MENUITEM "&Klistra in\tCtrl+V", 0x113 - MENUITEM "&Ta bort\tDel", 0x114 + MENUITEM "Klippa\tCtrl+X", CMD_CUT + MENUITEM "&Kopiera\tCtrl+C", CMD_COPY + MENUITEM "&Klistra in\tCtrl+V", CMD_PASTE + MENUITEM "&Ta bort\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Markera &allt", 0x116 - MENUITEM "&Tid/Datum\tF5", 0x117 + MENUITEM "Markera &allt", CMD_SELECT_ALL + MENUITEM "&Tid/Datum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Dela långa meningar", 0x119 + MENUITEM "&Dela långa meningar", CMD_WRAP } POPUP "&Sök" { - MENUITEM "Sök...", 0x120 - MENUITEM "&Sök nästa\tF3", 0x121 + MENUITEM "Sök...", CMD_SEARCH + MENUITEM "&Sök nästa\tF3", CMD_SEARCH_NEXT } POPUP "&Hjälp" { - MENUITEM "&Innehåll", 0x130 - MENUITEM "&Sök...", 0x131 - MENUITEM "Användningen &av hjälp", 0x132 + MENUITEM "&Innehåll", CMD_HELP_CONTENTS + MENUITEM "&Sök...", CMD_HELP_SEARCH + MENUITEM "Användningen &av hjälp", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "Inf&ormation..." { - MENUITEM "&Licens", 0x135 - MENUITEM "&INGEN GARANTI", 0x136 - MENUITEM "&Om Wine", 0x137 + MENUITEM "&Licens", CMD_LICENSE + MENUITEM "&INGEN GARANTI", CMD_NO_WARRANTY + MENUITEM "&Om Wine", CMD_ABOUT_WINE } } } /* Dialog `Page setup' */ -DIALOG_PAGESETUP_ DIALOG 0, 0, 225, 95 +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "Helv" @@ -93,33 +93,33 @@ PUSHBUTTON "&Hj STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Page &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_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Page &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, "Anteckningar" -STRING_ERROR, "FEL" -STRING_WARNING, "WARNING" -STRING_INFO, "Information" +STRING_NOTEPAD, "Anteckningar" +STRING_ERROR, "FEL" +STRING_WARNING, "WARNING" +STRING_INFO, "Information" -STRING_UNTITLED, "(untitled)" +STRING_UNTITLED, "(untitled)" -STRING_ALL_FILES, "Alla filer (*.*)" -STRING_TEXT_FILES_TXT, "Text filer (*.txt)" +STRING_ALL_FILES, "Alla filer (*.*)" +STRING_TEXT_FILES_TXT, "Text filer (*.txt)" -STRING_TOOLARGE, "Filen '%s' är för stor för notepad.\n \ +STRING_TOOLARGE, "Filen '%s' är för stor för notepad.\n \ Använd en annan editor." -STRING_NOTEXT, "Du skrev inte in någon text. \ +STRING_NOTEXT, "Du skrev inte in någon text. \ \nSkriv något och försök sedan igen" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ +STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ +STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ Would you like to save the changes ?" -STRING_NOTFOUND, "'%s' hittades inte." -STRING_OUT_OF_MEMORY, "Inte tillräkligt med minne för att slutföra \ +STRING_NOTFOUND, "'%s' hittades inte." +STRING_OUT_OF_MEMORY, "Inte tillräkligt med minne för att slutföra \ den här uppgiften. \nAvsluta ett eller flera program för att öka mängden \nfritt \ minne." diff --git a/programs/notepad/TODO b/programs/notepad/TODO deleted file mode 100644 index 81979037380..00000000000 --- a/programs/notepad/TODO +++ /dev/null @@ -1,9 +0,0 @@ - - - Logfile feature - if Notepad opens a file with ".LOG" (really?) in the first line, the - current date/time should automatically be inserted into the last line - of the file at startup. - - - Notepad segfaults when selecting "Find" button in "Search" dialog. - - - create new *.rc files for all languages you know. diff --git a/programs/notepad/Wa.rc b/programs/notepad/Wa.rc index 91bd298259a..9a2d9e96b52 100644 --- a/programs/notepad/Wa.rc +++ b/programs/notepad/Wa.rc @@ -23,49 +23,49 @@ MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_NEUTRAL { POPUP "&Fitchî" { - MENUITEM "&Novea...", 0x100 - MENUITEM "&Drovî", 0x101 - MENUITEM "&Schaper", 0x102 - MENUITEM "Schaper čt r&lomer...", 0x103 - MENUITEM "&Rexhe", 0x104 - MENUITEM "Arrandjmint del &Pådje...", 0x105 - MENUITEM "&Apontiaedje del scrirece...", 0x106 + MENUITEM "&Novea...", CMD_NEW + MENUITEM "&Drovî", CMD_OPEN + MENUITEM "&Schaper", CMD_SAVE + MENUITEM "Schaper čt r&lomer...", CMD_SAVE_AS + MENUITEM "&Rexhe", CMD_PRINT + MENUITEM "Arrandjmint del &Pådje...", CMD_PAGE_SETUP + MENUITEM "&Apontiaedje del scrirece...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "Moussî &Foû", 0x108 + MENUITEM "Moussî &Foû", CMD_EXIT } POPUP "&Candjî" { - MENUITEM "&Disfé\tCtrl+Z", 0x110 + MENUITEM "&Disfé\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "Cô&per\tCtrl+X", 0x111 - MENUITEM "&Copyî\tCtrl+C", 0x112 - MENUITEM "C&laper\tCtrl+V", 0x113 - MENUITEM "&Rafacer\tDel", 0x114 + MENUITEM "Cô&per\tCtrl+X", CMD_CUT + MENUITEM "&Copyî\tCtrl+C", CMD_COPY + MENUITEM "C&laper\tCtrl+V", CMD_PASTE + MENUITEM "&Rafacer\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "&Tchwezi totafwait", 0x116 - MENUITEM "&Eure/Date\tF5", 0x117 + MENUITEM "&Tchwezi totafwait", CMD_SELECT_ALL + MENUITEM "&Eure/Date\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "Côper les ro&yes", 0x119 + MENUITEM "Côper les ro&yes", CMD_WRAP } POPUP "C&werî" { - MENUITEM "Cwerî...", 0x120 - MENUITEM "&Shûvant\tF3", 0x121 + MENUITEM "Cwerî...", CMD_SEARCH + MENUITEM "&Shûvant\tF3", CMD_SEARCH_NEXT } POPUP "&Aide" { - MENUITEM "Å&dvins", 0x130 - MENUITEM "C&werî...", 0x131 - MENUITEM "&Aide so l' Aide", 0x132 + MENUITEM "Å&dvins", CMD_HELP_CONTENTS + MENUITEM "C&werî...", CMD_HELP_SEARCH + MENUITEM "&Aide so l' Aide", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "&Informåcion..." { - MENUITEM "&Licinse", 0x135 - MENUITEM "&NOLE WARANTEYE", 0x136 - MENUITEM "Å &dfait di Wine", 0x137 + MENUITEM "&Licinse", CMD_LICENSE + MENUITEM "&NOLE WARANTEYE", CMD_NO_WARRANTY + MENUITEM "Å &dfait di Wine", CMD_ABOUT_WINE } } } /* Dialog `Page setup' */ -DIALOG_PAGESETUP_ DIALOG 0, 0, 225, 95 +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 LANGUAGE LANG_WALON, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "Helv" @@ -93,33 +93,33 @@ PUSHBUTTON "&Aide", 0x153, 180, 39, 40, 15, WS_TABSTOP STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_NEUTRAL { -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Pådje &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_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Pådje &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, "Notepad" -STRING_ERROR, "AROKE" -STRING_WARNING, "ADVERTIXHMINT" -STRING_INFO, "Informåcion" +STRING_NOTEPAD, "Notepad" +STRING_ERROR, "AROKE" +STRING_WARNING, "ADVERTIXHMINT" +STRING_INFO, "Informåcion" -STRING_UNTITLED, "(sin tite)" +STRING_UNTITLED, "(sin tite)" -STRING_ALL_FILES, "Tos les fitchîs (*.*)" -STRING_TEXT_FILES_TXT, "Fitchîs tekse (*.txt)" +STRING_ALL_FILES, "Tos les fitchîs (*.*)" +STRING_TEXT_FILES_TXT, "Fitchîs tekse (*.txt)" -STRING_TOOLARGE, "Li fitchî '%s' est trop gros pol notepad.\n \ +STRING_TOOLARGE, "Li fitchî '%s' est trop gros pol notepad.\n \ Eployoz on ôte aspougneu di tekse." -STRING_NOTEXT, "Vos n' avoz rén sicrît. \ +STRING_NOTEXT, "Vos n' avoz rén sicrît. \ \nTapez ene sacwe čt rasayez" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ +STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ Do you want to create a new file ?" -STRING_NOTSAVED, "Li fitchî '%s'\na candjî\n\n \ +STRING_NOTSAVED, "Li fitchî '%s'\na candjî\n\n \ El voloz schaper ?" -STRING_NOTFOUND, "'%s' pout nén esse trové." -STRING_OUT_OF_MEMORY, "Li memwere est plinne. \n\ +STRING_NOTFOUND, "'%s' pout nén esse trové." +STRING_OUT_OF_MEMORY, "Li memwere est plinne. \n\ Cloyoz on programe ou pus po monter li memwere libe." } diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 7daa511e760..0a8fb2cdca2 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -3,6 +3,7 @@ * * Copyright 1998,99 Marcel Baur * Copyright 2002 Sylvain Petreolle + * Copyright 2002 Andriy Palamarchuk * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,13 +28,57 @@ #include "main.h" #include "license.h" -#include "language.h" #include "dialog.h" static LRESULT WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); +void ShowLastError() +{ + DWORD error = GetLastError(); + if (error != NO_ERROR) + { + LPVOID lpMsgBuf; + CHAR szTitle[MAX_STRING_LEN]; + + LoadString(Globals.hInstance, STRING_ERROR, szTitle, sizeof(szTitle)); + FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, error, 0, + (LPTSTR) &lpMsgBuf, 0, NULL); + MessageBox(NULL, (char*)lpMsgBuf, szTitle, MB_OK | MB_ICONERROR); + LocalFree(lpMsgBuf); + } +} + +/** + * Sets the caption of the main window according to Globals.szFileTitle: + * Notepad - (untitled) if no file is open + * Notepad - [filename] if a file is given + */ +void UpdateWindowCaption(void) { + CHAR szCaption[MAX_STRING_LEN]; + CHAR szUntitled[MAX_STRING_LEN]; + + LoadString(Globals.hInstance, STRING_NOTEPAD, szCaption, sizeof(szCaption)); + + if (Globals.szFileTitle[0] != '\0') { + lstrcat(szCaption, " - ["); + lstrcat(szCaption, Globals.szFileTitle); + lstrcat(szCaption, "]"); + } + else + { + LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, sizeof(szUntitled)); + lstrcat(szCaption, " - "); + lstrcat(szCaption, szUntitled); + } + + SetWindowText(Globals.hMainWnd, szCaption); +} + + int AlertIDS(UINT ids_message, UINT ids_caption, WORD type) { /* * Given some ids strings, this acts as a language-aware wrapper for @@ -95,37 +140,68 @@ VOID AlertOutOfMemory(void) { } -BOOL FileExists(LPCSTR szFilename) { -/* - * Returns: TRUE - if "szFileName" exists - * FALSE - if it does not +/** + * Returns: + * TRUE - if file exists + * FALSE - if file does not exist */ +BOOL FileExists(LPSTR szFilename) { WIN32_FIND_DATA entry; HANDLE hFile; hFile = FindFirstFile(szFilename, &entry); + FindClose(hFile); - return (hFile!=INVALID_HANDLE_VALUE); + return (hFile != INVALID_HANDLE_VALUE); } + VOID DoSaveFile(VOID) { + HANDLE hFile; + DWORD dwNumWrite; + BOOL bTest; + CHAR *pTemp; + int size; - /* FIXME: Really Save the file */ - /* ... (Globals.szFileName); */ + hFile = CreateFile(Globals.szFileName, GENERIC_WRITE, FILE_SHARE_WRITE, + NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if(hFile == INVALID_HANDLE_VALUE) + { + ShowLastError(); + return; + } + + size = GetWindowTextLength(Globals.hEdit); + pTemp = (LPSTR) GlobalAlloc(GMEM_FIXED, size); + if (!pTemp) + { + ShowLastError(); + return; + } + GetWindowText(Globals.hEdit, pTemp, size); + + bTest = WriteFile(hFile, pTemp, size, &dwNumWrite, NULL); + if(bTest == FALSE) + { + ShowLastError(); + } + CloseHandle(hFile); + GlobalFree(pTemp); } - +/** + * Returns: + * TRUE - User agreed to close (both save/don't save) + * FALSE - User cancelled close by selecting "Cancel" + */ BOOL DoCloseFile(void) { -/* Return value: TRUE - User agreed to close (both save/don't save) */ -/* FALSE - User cancelled close by selecting "Cancel" */ - int nResult; - if (strlen(Globals.szFileName)>0) { + if (Globals.szFileName[0] != 0) { /* prompt user to save changes */ nResult = AlertFileNotSaved(Globals.szFileName); switch (nResult) { - case IDYES: DoSaveFile(); + case IDYES: DIALOG_FileSave(); break; case IDNO: break; @@ -138,147 +214,145 @@ BOOL DoCloseFile(void) { } /* switch */ } /* if */ - /* Forget file name */ - lstrcpy(Globals.szFileName, ""); - LANGUAGE_UpdateWindowCaption(); + SetFileName(""); + + UpdateWindowCaption(); return(TRUE); } -void DoOpenFile(LPCSTR szFileName) { - +void DoOpenFile(LPSTR szFileName) { /* Close any files and prompt to save changes */ - if (DoCloseFile()) { - GetFileTitle(szFileName, Globals.szFileName, sizeof(Globals.szFileName)); - LANGUAGE_UpdateWindowCaption(); + if (DoCloseFile()) + { + HANDLE hFile; + CHAR *pTemp; + DWORD size; + DWORD dwNumRead; - LoadBufferFromFile(szFileName); + hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(hFile == INVALID_HANDLE_VALUE) + { + ShowLastError(); + return; + } + + size = GetFileSize(hFile, NULL); + if (size == 0xFFFFFFFF) + { + ShowLastError(); + return; + } + size++; + pTemp = (LPSTR) GlobalAlloc(GMEM_FIXED, size); + if (!pTemp) + { + ShowLastError(); + return; + } + if (!ReadFile(hFile, pTemp, size, &dwNumRead, NULL)) + { + ShowLastError(); + return; + } + CloseHandle(hFile); + pTemp[dwNumRead] = '\0'; + if (!SetWindowText(Globals.hEdit, pTemp)) + { + GlobalFree(pTemp); + ShowLastError(); + return; + } + SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); + GlobalFree(pTemp); + SetFocus(Globals.hEdit); + + SetFileName(szFileName); + UpdateWindowCaption(); } } - VOID DIALOG_FileNew(VOID) { /* Close any files and promt to save changes */ if (DoCloseFile()) { - TrashBuffer(); + SetWindowText(Globals.hEdit, ""); + SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); + SetFocus(Globals.hEdit); } } VOID DIALOG_FileOpen(VOID) { - OPENFILENAME openfilename; - CHAR szPath[MAX_PATHNAME_LEN]; - CHAR szDir[MAX_PATHNAME_LEN]; - CHAR szzFilter[2 * MAX_STRING_LEN + 100]; - CHAR szDefaultExt[4]; - LPSTR p = szzFilter; + OPENFILENAME openfilename; - lstrcpy(szDefaultExt, "txt"); + CHAR szPath[MAX_PATH]; + CHAR szDir[MAX_PATH]; + CHAR szDefaultExt[] = "txt"; - LoadString(Globals.hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN); - p += strlen(p) + 1; - lstrcpy(p, "*.txt"); - p += strlen(p) + 1; - LoadString(Globals.hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN); - p += strlen(p) + 1; - lstrcpy(p, "*.*"); - p += strlen(p) + 1; - *p = '\0'; + ZeroMemory(&openfilename, sizeof(openfilename)); - GetCurrentDirectory(sizeof(szDir), szDir); - lstrcpy(szPath,"*.txt"); + GetCurrentDirectory(sizeof(szDir), szDir); + lstrcpy(szPath,"*.txt"); - openfilename.lStructSize = sizeof(OPENFILENAME); - openfilename.hwndOwner = Globals.hMainWnd; - openfilename.hInstance = Globals.hInstance; - openfilename.lpstrFilter = szzFilter; - openfilename.lpstrCustomFilter = 0; - openfilename.nMaxCustFilter = 0; - openfilename.nFilterIndex = 0; - openfilename.lpstrFile = szPath; - openfilename.nMaxFile = sizeof(szPath); - openfilename.lpstrFileTitle = 0; - openfilename.nMaxFileTitle = 0; - openfilename.lpstrInitialDir = szDir; - openfilename.lpstrTitle = 0; - openfilename.Flags = OFN_FILEMUSTEXIST + OFN_PATHMUSTEXIST; - openfilename.nFileOffset = 0; - openfilename.nFileExtension = 0; - openfilename.lpstrDefExt = szDefaultExt; - openfilename.lCustData = 0; - openfilename.lpfnHook = 0; - openfilename.lpTemplateName = 0; + openfilename.lStructSize = sizeof(openfilename); + openfilename.hwndOwner = Globals.hMainWnd; + openfilename.hInstance = Globals.hInstance; + openfilename.lpstrFilter = Globals.szFilter; + openfilename.lpstrFile = szPath; + openfilename.nMaxFile = sizeof(szPath); + openfilename.lpstrInitialDir = szDir; + openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | + OFN_HIDEREADONLY; + openfilename.lpstrDefExt = szDefaultExt; - if (GetOpenFileName(&openfilename)) { - if (FileExists(openfilename.lpstrFile)) - DoOpenFile(openfilename.lpstrFile); - else - AlertFileNotFound(openfilename.lpstrFile); - - } + if (GetOpenFileName(&openfilename)) { + if (FileExists(openfilename.lpstrFile)) + DoOpenFile(openfilename.lpstrFile); + else + AlertFileNotFound(openfilename.lpstrFile); + } } + VOID DIALOG_FileSave(VOID) { - /* FIXME: Save File */ - + if (Globals.szFileName[0] == '\0') DIALOG_FileSaveAs(); + else + DoSaveFile(); } VOID DIALOG_FileSaveAs(VOID) { - OPENFILENAME saveas; - CHAR szPath[MAX_PATHNAME_LEN]; - CHAR szDir[MAX_PATHNAME_LEN]; - CHAR szDefaultExt[4]; - CHAR szzFilter[2 * MAX_STRING_LEN + 100]; + OPENFILENAME saveas; + CHAR szPath[MAX_PATH]; + CHAR szDir[MAX_PATH]; + CHAR szDefaultExt[] = "txt"; - LPSTR p = szzFilter; + ZeroMemory(&saveas, sizeof(saveas)); - lstrcpy(szDefaultExt, "txt"); + GetCurrentDirectory(sizeof(szDir), szDir); + lstrcpy(szPath,"*.*"); - LoadString(Globals.hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN); - p += strlen(p) + 1; - lstrcpy(p, "*.txt"); - p += strlen(p) + 1; - LoadString(Globals.hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN); - p += strlen(p) + 1; - lstrcpy(p, "*.*"); - p += strlen(p) + 1; - *p = '\0'; + saveas.lStructSize = sizeof(OPENFILENAME); + saveas.hwndOwner = Globals.hMainWnd; + saveas.hInstance = Globals.hInstance; + saveas.lpstrFilter = Globals.szFilter; + saveas.lpstrFile = szPath; + saveas.nMaxFile = sizeof(szPath); + saveas.lpstrInitialDir = szDir; + saveas.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | + OFN_HIDEREADONLY; + saveas.lpstrDefExt = szDefaultExt; - lstrcpy(szPath,"*.*"); - - GetCurrentDirectory(sizeof(szDir), szDir); - - saveas.lStructSize = sizeof(OPENFILENAME); - saveas.hwndOwner = Globals.hMainWnd; - saveas.hInstance = Globals.hInstance; - saveas.lpstrFilter = szzFilter; - saveas.lpstrCustomFilter = 0; - saveas.nMaxCustFilter = 0; - saveas.nFilterIndex = 0; - saveas.lpstrFile = szPath; - saveas.nMaxFile = sizeof(szPath); - saveas.lpstrFileTitle = 0; - saveas.nMaxFileTitle = 0; - saveas.lpstrInitialDir = szDir; - saveas.lpstrTitle = 0; - saveas.Flags = OFN_PATHMUSTEXIST + OFN_OVERWRITEPROMPT + OFN_HIDEREADONLY; - saveas.nFileOffset = 0; - saveas.nFileExtension = 0; - saveas.lpstrDefExt = szDefaultExt; - saveas.lCustData = 0; - saveas.lpfnHook = 0; - saveas.lpTemplateName = 0; - - if (GetSaveFileName(&saveas)) { - lstrcpy(Globals.szFileName, saveas.lpstrFile); - LANGUAGE_UpdateWindowCaption(); - DIALOG_FileSave(); - } + if (GetSaveFileName(&saveas)) { + SetFileName(szPath); + UpdateWindowCaption(); + DoSaveFile(); + } } VOID DIALOG_FilePrint(VOID) @@ -302,34 +376,16 @@ VOID DIALOG_FilePrint(VOID) /* hDevNames = GlobalAlloc(GMEM_MOVEABLE + GMEM_ZEROINIT, sizeof(DEVNAMES)); */ /* Get Current Settings */ - - printer.lStructSize = sizeof(PRINTDLG); + ZeroMemory(&printer, sizeof(printer)); + printer.lStructSize = sizeof(printer); printer.hwndOwner = Globals.hMainWnd; printer.hInstance = Globals.hInstance; - /* Let PrintDlg create a DEVMODE structure */ - printer.hDevMode = 0; - printer.hDevNames = 0; - printer.hDC = 0; - printer.Flags = PD_RETURNDEFAULT; - printer.nFromPage = 0; - printer.nToPage = 0; - printer.nMinPage = 0; - printer.nMaxPage = 0; - printer.nCopies = 0; - printer.lCustData = 0; - printer.lpfnPrintHook = 0; - printer.lpfnSetupHook = 0; - printer.lpPrintTemplateName = 0; - printer.lpSetupTemplateName = 0; - printer.hPrintTemplate = 0; - printer.hSetupTemplate = 0; - nResult = PrintDlg(&printer); /* hContext = CreateDC(, szDeviceName, "TEST.TXT", 0); */ - /* Congratulations to those Microsoft Engineers responsable */ + /* Congratulations to those Microsoft Engineers responsible */ /* for the following pointer acrobatics */ assert(printer.hDevNames!=0); @@ -337,13 +393,13 @@ VOID DIALOG_FilePrint(VOID) nBase = (LONG)(printer.hDevNames); nOffset = (WORD)((LPDEVNAMES) printer.hDevNames)->wDriverOffset; - lstrcpy(szPrinterName, (LPCSTR) (nBase + nOffset)); + lstrcpy(szPrinterName, (LPSTR) (nBase + nOffset)); nOffset = (WORD)((LPDEVNAMES) printer.hDevNames)->wDeviceOffset; - lstrcpy(szDeviceName, (LPCSTR) (nBase + nOffset)); + lstrcpy(szDeviceName, (LPSTR) (nBase + nOffset)); nOffset = (WORD)((LPDEVNAMES) printer.hDevNames)->wOutputOffset; - lstrcpy(szOutput, (LPCSTR) (nBase + nOffset)); + lstrcpy(szOutput, (LPSTR) (nBase + nOffset)); MessageBox(Globals.hMainWnd, szPrinterName, "Printer Name", MB_ICONEXCLAMATION); MessageBox(Globals.hMainWnd, szDeviceName, "Device Name", MB_ICONEXCLAMATION); @@ -433,45 +489,31 @@ VOID DIALOG_FilePageSetup(VOID) VOID DIALOG_FilePrinterSetup(VOID) { - PRINTDLG printer; + PRINTDLG printer; - printer.lStructSize = sizeof(PRINTDLG); - printer.hwndOwner = Globals.hMainWnd; - printer.hInstance = Globals.hInstance; - printer.hDevMode = 0; - printer.hDevNames = 0; - printer.hDC = 0; - printer.Flags = PD_PRINTSETUP; - printer.nFromPage = 0; - printer.nToPage = 0; - printer.nMinPage = 0; - printer.nMaxPage = 0; - printer.nCopies = 1; - printer.lCustData = 0; - printer.lpfnPrintHook = 0; - printer.lpfnSetupHook = 0; - printer.lpPrintTemplateName = 0; - printer.lpSetupTemplateName = 0; - printer.hPrintTemplate = 0; - printer.hSetupTemplate = 0; - - if (PrintDlg(&printer)) { - /* do nothing */ - }; + ZeroMemory(&printer, sizeof(printer)); + printer.lStructSize = sizeof(printer); + printer.hwndOwner = Globals.hMainWnd; + printer.hInstance = Globals.hInstance; + printer.Flags = PD_PRINTSETUP; + printer.nCopies = 1; + if (PrintDlg(&printer)) { + /* do nothing */ + }; } VOID DIALOG_FileExit(VOID) { - if (DoCloseFile()) { - PostQuitMessage(0); - } + if (DoCloseFile()) + { + PostQuitMessage(0); + } } VOID DIALOG_EditUndo(VOID) { - MessageBox(Globals.hMainWnd, "Undo", "Debug", MB_ICONEXCLAMATION); - /* undo */ + SendMessage(Globals.hEdit, EM_UNDO, 0, 0); } VOID DIALOG_EditCut(VOID) @@ -532,6 +574,7 @@ VOID DIALOG_EditSelectAll(VOID) /* Select all */ } + VOID DIALOG_EditTimeDate(VOID) { SYSTEMTIME st; @@ -542,29 +585,24 @@ VOID DIALOG_EditTimeDate(VOID) GetLocalTime(&st); GetDateFormat(LOCALE_USER_DEFAULT, LOCALE_SLONGDATE, lpst, NULL, date, MAX_STRING_LEN); GetTimeFormat(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, lpst, NULL, date, MAX_STRING_LEN); - } VOID DIALOG_EditWrap(VOID) { - Globals.bWrapLongLines = !Globals.bWrapLongLines; - CheckMenuItem(Globals.hEditMenu, 0x119, MF_BYCOMMAND | - (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED)); + Globals.bWrapLongLines = !Globals.bWrapLongLines; + CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_WRAP, + MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED)); } VOID DIALOG_Search(VOID) { + ZeroMemory(&Globals.find, sizeof(Globals.find)); Globals.find.lStructSize = sizeof(Globals.find); Globals.find.hwndOwner = Globals.hMainWnd; Globals.find.hInstance = Globals.hInstance; Globals.find.lpstrFindWhat = (CHAR *) &Globals.szFindText; Globals.find.wFindWhatLen = sizeof(Globals.szFindText); - Globals.find.lpstrReplaceWith = 0; - Globals.find.wReplaceWithLen = 0; Globals.find.Flags = FR_DOWN; - Globals.find.lCustData = 0; - Globals.find.lpfnHook = 0; - Globals.find.lpTemplateName = 0; /* We only need to create the modal FindReplace dialog which will */ /* notify us of incoming events using hMainWnd Window Messages */ @@ -611,6 +649,7 @@ VOID DIALOG_HelpAboutWine(VOID) ShellAbout(Globals.hMainWnd, szNotepad, "Notepad\n" WINE_RELEASE_INFO, 0); } + /*********************************************************************** * * DIALOG_PageSetup @@ -621,7 +660,8 @@ VOID DIALOG_PageSetup(VOID) WNDPROC lpfnDlg; lpfnDlg = MakeProcInstance(DIALOG_PAGESETUP_DlgProc, Globals.hInstance); - DialogBox(Globals.hInstance, STRING_PAGESETUP_Xx, Globals.hMainWnd, (DLGPROC)lpfnDlg); + DialogBox(Globals.hInstance, MAKEINTRESOURCE(DIALOG_PAGESETUP), + Globals.hMainWnd, (DLGPROC)lpfnDlg); FreeProcInstance(lpfnDlg); } diff --git a/programs/notepad/dialog.h b/programs/notepad/dialog.h index 45f61a3e59e..7a495ff2392 100644 --- a/programs/notepad/dialog.h +++ b/programs/notepad/dialog.h @@ -18,8 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "windows.h" - VOID DIALOG_FileNew(VOID); VOID DIALOG_FileOpen(VOID); VOID DIALOG_FileSave(VOID); @@ -51,3 +49,7 @@ VOID DIALOG_HelpAboutWine(VOID); VOID DIALOG_PageSetup(VOID); VOID DIALOG_TimeDate(VOID); +/* utility functions */ +BOOL FileExists(LPSTR szFilename); +BOOL DoCloseFile(void); +void DoOpenFile(LPSTR szFileName); diff --git a/programs/notepad/language.c b/programs/notepad/language.c deleted file mode 100644 index 78558047fdd..00000000000 --- a/programs/notepad/language.c +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Notepad - * - * Copyright 1997,98 Marcel Baur - * Copyright 1998 Karl Backstrm - * 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 - */ - -#include -#include "windows.h" -#include "main.h" -#include "language.h" - -CHAR STRING_MENU_Xx[] = "MENU_Xx"; -CHAR STRING_PAGESETUP_Xx[] = "DIALOG_PAGESETUP_Xx"; - -void LANGUAGE_UpdateWindowCaption(void) { - /* Sets the caption of the main window according to Globals.szFileName: - Notepad - (untitled) if no file is open - Notepad - [filename] if a file is given - */ - - CHAR szCaption[MAX_STRING_LEN]; - CHAR szUntitled[MAX_STRING_LEN]; - - LoadString(Globals.hInstance, STRING_NOTEPAD, szCaption, sizeof(szCaption)); - - if (strlen(Globals.szFileName)>0) { - lstrcat(szCaption, " - ["); - lstrcat(szCaption, Globals.szFileName); - lstrcat(szCaption, "]"); - } - else - { - LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, sizeof(szUntitled)); - lstrcat(szCaption, " - "); - lstrcat(szCaption, szUntitled); - } - - SetWindowText(Globals.hMainWnd, szCaption); - -} - - - - -VOID LANGUAGE_LoadMenus(VOID) -{ - HMENU hMainMenu; - - /* Set frame caption */ - LANGUAGE_UpdateWindowCaption(); - - /* Change Resource names */ - /*lstrcpyn(STRING_MENU_Xx + sizeof(STRING_MENU_Xx) - 3, lang, 3);*/ - /*lstrcpyn(STRING_PAGESETUP_Xx + sizeof(STRING_PAGESETUP_Xx) - 3, lang, 3);*/ - - /* Create menu */ - hMainMenu = LoadMenu(Globals.hInstance, MAKEINTRESOURCE(MAIN_MENU)); - Globals.hFileMenu = GetSubMenu(hMainMenu, 0); - Globals.hEditMenu = GetSubMenu(hMainMenu, 1); - Globals.hSearchMenu = GetSubMenu(hMainMenu, 2); - Globals.hLanguageMenu = GetSubMenu(hMainMenu, 3); - Globals.hHelpMenu = GetSubMenu(hMainMenu, 4); - - SetMenu(Globals.hMainWnd, hMainMenu); - - /* Destroy old menu */ - if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu); - Globals.hMainMenu = hMainMenu; -} - -/*VOID LANGUAGE_DefaultHandle(WPARAM wParam) -{ - if ((wParam >=NP_FIRST_LANGUAGE) && (wParam<=NP_LAST_LANGUAGE)) - LANGUAGE_SelectByNumber(wParam - NP_FIRST_LANGUAGE); - else printf("Unimplemented menu command %i\n", wParam); -} -*/ diff --git a/programs/notepad/language.h b/programs/notepad/language.h deleted file mode 100644 index 50c0bc72b65..00000000000 --- a/programs/notepad/language.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Notepad - * - * Copyright 1997,98 Marcel Baur - * Copyright 1998 Karl Backstrm - * 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 - */ - -VOID LANGUAGE_UpdateWindowCaption(VOID); -VOID LANGUAGE_LoadMenus(VOID); -/*VOID LANGUAGE_DefaultHandle(WPARAM wParam);*/ diff --git a/programs/notepad/main.c b/programs/notepad/main.c index f6d0c012677..d798251697a 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -4,6 +4,7 @@ * Copyright 2000 Mike McCormack * Copyright 1997,98 Marcel Baur * Copyright 2002 Sylvain Petreolle + * Copyright 2002 Andriy Palamarchuk * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,692 +20,28 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * FIXME,TODO list: - * - Use wine Heap instead of malloc/free (done) - * - use scroll bars (vertical done) - * - cut 'n paste (clipboard) - * - save file - * - print file - * - find dialog - * - encapsulate data structures (?) - half done - * - free unused memory - * - solve Open problems - * - smoother scrolling - * - separate view code and document code - * - * This program is intended as a testbed for winelib as much as - * a useful application. */ +#include +#include #include -#include "windows.h" #include "main.h" -#include "license.h" #include "dialog.h" -#include "language.h" - -extern BOOL FileExists(LPCSTR szFilename); -extern BOOL DoCloseFile(void); -extern void DoOpenFile(LPCSTR szFileName); +#include "notepad_res.h" NOTEPAD_GLOBALS Globals; - -/* Using a pointer to pointer data structure to - achieve a little more efficiency. Hopefully - it will be worth it, because it complicates the - code - mjm 26 Jun 2000 */ - -#define BUFFERCHUNKSIZE 0xe0 -typedef struct TAGLine { - LPSTR lpLine; - DWORD dwWidth; - DWORD dwMaxWidth; -} LINE, *LPLINE; - -/* FIXME: make this info into a structure */ -/* typedef struct tagBUFFER { */ -DWORD dwVOffset=0; -DWORD dwLines=0; -DWORD dwMaxLines=0; -LPLINE lpBuffer=NULL; -DWORD dwXpos=0,dwYpos=0; /* position of caret in char coords */ -DWORD dwCaretXpos=0,dwCaretYpos=0; /* position of caret in pixel coords */ -TEXTMETRIC tm; /* textmetric for current font */ -RECT rectClient; /* client rectangle of the window we're drawing in */ -/* } BUFFER, *LPBUFFER */ - -VOID InitFontInfo(HWND hWnd) -{ - HDC hDC = GetDC(hWnd); - - if(hDC) - { - GetTextMetrics(hDC, &tm); - ReleaseDC(hWnd,hDC); - } -} - -void InitBuffer(void) -{ - lpBuffer = NULL; - dwLines = 0; - dwMaxLines = 0; - dwXpos=0; - dwYpos=0; -} - -/* convert x,y character co-ords into x pixel co-ord */ -DWORD CalcStringWidth(HDC hDC, DWORD x, DWORD y) -{ - DWORD len; - SIZE size; - - size.cx = 0; - size.cy = 0; - - if(y>dwLines) - return size.cx; - if(lpBuffer == NULL) - return size.cx; - if(lpBuffer[y].lpLine == NULL) - return size.cx; - len = (x(dwYpos+1); i--) - { - lpBuffer[i] = lpBuffer[i-1]; - RenderLine(hDC,i); - } - ZeroMemory(&lpBuffer[dwYpos+1],sizeof(LINE)); - - /* copy the characters after the carat (if any) to the next line */ - src = &lpBuffer[dwYpos].lpLine[dwXpos]; - cnt = lpBuffer[dwYpos].dwWidth-dwXpos; - if(!ValidateLine(dwYpos+1,cnt)) /* allocates the buffer */ - return FALSE; /* FIXME */ - dst = &lpBuffer[dwYpos+1].lpLine[0]; - memcpy(dst, src, cnt); - lpBuffer[dwYpos+1].dwWidth = cnt; - lpBuffer[dwYpos].dwWidth -= cnt; - - /* move the cursor */ - dwLines++; - dwXpos = 0; - dwYpos++; - - /* update the window */ - RenderLine(hDC, dwYpos-1); - RenderLine(hDC, dwYpos); - CalcCaretPos(hDC, dwXpos, dwYpos); - /* FIXME: don't use globals */ - SetScrollRange(Globals.hMainWnd, SB_VERT, 0, dwLines, TRUE); - - return TRUE; -} - -/* - * Attempt a basic edit buffer - */ -BOOL AddCharToBuffer(HDC hDC, char ch) -{ - /* we can use lpBuffer[dwYpos] */ - if(!ValidateLine(dwYpos,0)) - return FALSE; - - /* shuffle the rest of the line*/ - if(!ValidateLine(dwYpos, lpBuffer[dwYpos].dwWidth)) - return FALSE; - lpBuffer[dwYpos].dwWidth++; - memmove(&lpBuffer[dwYpos].lpLine[dwXpos+1], - &lpBuffer[dwYpos].lpLine[dwXpos], - lpBuffer[dwYpos].dwWidth-dwXpos); - - /* add the character */ - lpBuffer[dwYpos].lpLine[dwXpos] = ch; - if(dwLines == 0) - dwLines++; - dwXpos++; - - /* update the window and cursor position */ - RenderLine(hDC,dwYpos); - CalcCaretPos(hDC,dwXpos,dwYpos); - - return TRUE; -} - - -/* erase a character */ -BOOL DoBackSpace(HDC hDC) -{ - DWORD i; - - if(lpBuffer == NULL) - return FALSE; - if(lpBuffer[dwYpos].lpLine && (dwXpos>0)) - { - dwXpos --; - /* FIXME: use memmove */ - for(i=dwXpos; i<(lpBuffer[dwYpos].dwWidth-1); i++) - lpBuffer[dwYpos].lpLine[i]=lpBuffer[dwYpos].lpLine[i+1]; - - lpBuffer[dwYpos].dwWidth--; - RenderLine(hDC, dwYpos); - CalcCaretPos(hDC,dwXpos,dwYpos); - } - else - { - /* Erase a newline. To do this we join two lines */ - LPSTR src, dest; - DWORD len, oldlen; - - if(dwYpos==0) - return FALSE; - - oldlen = lpBuffer[dwYpos-1].dwWidth; - if(lpBuffer[dwYpos-1].lpLine&&lpBuffer[dwYpos].lpLine) - { - /* concatonate to the end of the line above line */ - src = &lpBuffer[dwYpos].lpLine[0]; - dest = &lpBuffer[dwYpos-1].lpLine[lpBuffer[dwYpos-1].dwWidth]; - len = lpBuffer[dwYpos].dwWidth; - - /* check the length of the new line */ - if(!ValidateLine(dwYpos-1,lpBuffer[dwYpos-1].dwWidth + len)) - return FALSE; - - memcpy(dest,src,len); - lpBuffer[dwYpos-1].dwWidth+=len; - GlobalFree( (HGLOBAL)lpBuffer[dwYpos].lpLine); - } - else if (!lpBuffer[dwYpos-1].lpLine) - { - lpBuffer[dwYpos-1]=lpBuffer[dwYpos]; - } /* else both are NULL */ - RenderLine(hDC,dwYpos-1); - - /* don't zero - it's going to get trashed anyhow */ - - /* shuffle up all the lines below this one */ - for(i=dwYpos; i<(dwLines-1); i++) - { - lpBuffer[i] = lpBuffer[i+1]; - RenderLine(hDC,i); - } - - /* clear the last line */ - ZeroMemory(&lpBuffer[dwLines-1],sizeof (LINE)); - RenderLine(hDC,dwLines-1); - dwLines--; - - /* adjust the cursor position to joining point */ - dwYpos--; - dwXpos = oldlen; - - CalcCaretPos(hDC,dwXpos,dwYpos); - SetScrollRange(Globals.hMainWnd, SB_VERT, 0, dwLines, TRUE); - } - return TRUE; -} - -/* as used by File->New */ -void TrashBuffer(void) -{ - DWORD i; - - /* variables belonging to the buffer */ - if(lpBuffer) - { - for(i=0; i= dwLines) - { - return FALSE; - } - dwYpos++; - if (dwXpos>lpBuffer[dwYpos].dwWidth) - GotoEndOfLine(hWnd); - return TRUE; -} - -BOOL GotoUp(HWND hWnd) -{ - if(dwYpos==0) - return FALSE; - dwYpos--; - if (dwXpos>lpBuffer[dwYpos].dwWidth) - GotoEndOfLine(hWnd); - return TRUE; -} - -BOOL GotoLeft(HWND hWnd) -{ - if(dwXpos > 0) - { - dwXpos--; - return TRUE; - } - if(GotoUp(hWnd)) - return GotoEndOfLine(hWnd); - return FALSE; -} - -BOOL GotoRight(HWND hWnd) -{ - if(dwXpos(dwVOffset+GetLinesPerPage(hWnd))) - { - dwVOffset = dwYpos - GetLinesPerPage(hWnd) + 1; - return TRUE; - } - return FALSE; -} - -/* FIXME: move the window around so we can still see the caret */ -VOID DoEdit(HWND hWnd, WPARAM wParam, LPARAM lParam) -{ - HDC hDC; - - if(lpBuffer==NULL) - return; - switch(wParam) - { - case VK_HOME: GotoHome(hWnd); - break; - - case VK_END: GotoEndOfLine(hWnd); - break; - - case VK_LEFT: GotoLeft(hWnd); - break; - - case VK_RIGHT: GotoRight(hWnd); - break; - - case VK_DOWN: GotoDown(hWnd); - break; - - case VK_UP: GotoUp(hWnd); - break; - - default: - return; - } - - hDC = GetDC(hWnd); - if(hDC) - { - CalcCaretPos(hDC, dwXpos, dwYpos); - ReleaseDC(hWnd,hDC); - } - if(ScrollABit(hWnd)) - InvalidateRect(hWnd, NULL, FALSE); -} - -void ButtonDownToCaretPos(HWND hWnd, WPARAM wParam, LPARAM lParam) -{ - DWORD x, y, caretx, carety; - BOOL refine_guess = TRUE; - HDC hDC; - - x = LOWORD(lParam); - y = HIWORD(lParam); - - caretx = x/tm.tmAveCharWidth; /* guess */ - carety = dwVOffset + y/tm.tmHeight; - - hDC = GetDC(hWnd); - - if(lpBuffer == NULL) - { - caretx = 0; - carety = 0; - refine_guess = FALSE; - } - - /* if the cursor is past the bottom, put it after the last char */ - if(refine_guess && (carety>=dwLines) ) - { - carety=dwLines-1; - caretx=lpBuffer[carety].dwWidth; - refine_guess = FALSE; - } - - /* cursor past end of line? */ - if(refine_guess && (x>CalcStringWidth(hDC,lpBuffer[carety].dwWidth,carety))) - { - caretx = lpBuffer[carety].dwWidth; - refine_guess = FALSE; - } - - /* FIXME: doesn't round properly */ - if(refine_guess) - { - if(CalcStringWidth(hDC,caretx,carety)0)&&(CalcStringWidth(hDC,caretx-1,carety)>x)) - caretx--; - } - } - - /* set the caret's position */ - dwXpos = caretx; - dwYpos = carety; - CalcCaretPos(hDC, caretx, carety); - ReleaseDC(hWnd,hDC); -} - -void DoScroll(HWND hWnd, WPARAM wParam, LPARAM lParam) -{ - DWORD dy = GetLinesPerPage(hWnd); - - switch(wParam) /* vscroll code */ - { - case SB_LINEUP: - if(dwVOffset) - dwVOffset--; - break; - case SB_LINEDOWN: - if(dwVOffset dwLines) - dwVOffset = dwLines - 1; - break; - case SB_PAGEDOWN: - if( dy > dwVOffset) - dwVOffset=0; - break; - } - /* position scroll */ - SetScrollPos(hWnd, SB_VERT, dwVOffset, TRUE); + lstrcpy(Globals.szFileName, szFileName); + GetFileTitle(szFileName, Globals.szFileTitle, sizeof(Globals.szFileTitle)); } /*********************************************************************** @@ -714,146 +51,128 @@ void DoScroll(HWND hWnd, WPARAM wParam, LPARAM lParam) * All handling of main menu events */ -int NOTEPAD_MenuCommand (WPARAM wParam) +int NOTEPAD_MenuCommand(WPARAM wParam) { - switch (wParam) { - case 0x100: DIALOG_FileNew(); break; - case 0x101: DIALOG_FileOpen(); break; - case 0x102: DIALOG_FileSave(); break; - case 0x103: DIALOG_FileSaveAs(); break; - case 0x104: DIALOG_FilePrint(); break; - case 0x105: DIALOG_FilePageSetup(); break; - case 0x106: DIALOG_FilePrinterSetup();break; - case 0x108: DIALOG_FileExit(); break; + switch (wParam) + { + case CMD_NEW: DIALOG_FileNew(); break; + case CMD_OPEN: DIALOG_FileOpen(); break; + case CMD_SAVE: DIALOG_FileSave(); break; + case CMD_SAVE_AS: DIALOG_FileSaveAs(); break; + case CMD_PRINT: DIALOG_FilePrint(); break; + case CMD_PAGE_SETUP: DIALOG_FilePageSetup(); break; + case CMD_PRINTER_SETUP: DIALOG_FilePrinterSetup();break; + case CMD_EXIT: DIALOG_FileExit(); break; - case 0x110: DIALOG_EditUndo(); break; - case 0x111: DIALOG_EditCut(); break; - case 0x112: DIALOG_EditCopy(); break; - case 0x113: DIALOG_EditPaste(); break; - case 0x114: DIALOG_EditDelete(); break; - case 0x116: DIALOG_EditSelectAll(); break; - case 0x117: DIALOG_EditTimeDate();break; - case 0x119: DIALOG_EditWrap(); break; + case CMD_UNDO: DIALOG_EditUndo(); break; + case CMD_CUT: DIALOG_EditCut(); break; + case CMD_COPY: DIALOG_EditCopy(); break; + case CMD_PASTE: DIALOG_EditPaste(); break; + case CMD_DELETE: DIALOG_EditDelete(); break; + case CMD_SELECT_ALL: DIALOG_EditSelectAll(); break; + case CMD_TIME_DATE: DIALOG_EditTimeDate();break; + case CMD_WRAP: DIALOG_EditWrap(); break; - case 0x120: DIALOG_Search(); break; - case 0x121: DIALOG_SearchNext(); break; + case CMD_SEARCH: DIALOG_Search(); break; + case CMD_SEARCH_NEXT: DIALOG_SearchNext(); break; - case 0x130: DIALOG_HelpContents(); break; - case 0x131: DIALOG_HelpSearch(); break; - case 0x132: DIALOG_HelpHelp(); break; - case 0x135: DIALOG_HelpLicense(); break; - case 0x136: DIALOG_HelpNoWarranty(); break; - case 0x137: DIALOG_HelpAboutWine(); break; - - /* default: */ - /* LANGUAGE_DefaultHandle(wParam); */ - } + case CMD_HELP_CONTENTS: DIALOG_HelpContents(); break; + case CMD_HELP_SEARCH: DIALOG_HelpSearch(); break; + case CMD_HELP_ON_HELP: DIALOG_HelpHelp(); break; + case CMD_LICENSE: DIALOG_HelpLicense(); break; + case CMD_NO_WARRANTY: DIALOG_HelpNoWarranty(); break; + case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; + } return 0; } +/*********************************************************************** + * Data Initialization + */ +VOID NOTEPAD_InitData(VOID) +{ + LPSTR p = Globals.szFilter; + LoadString(Globals.hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN); + p += strlen(p) + 1; + lstrcpy(p, "*.txt"); + p += strlen(p) + 1; + LoadString(Globals.hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN); + p += strlen(p) + 1; + lstrcpy(p, "*.*"); + p += strlen(p) + 1; + *p = '\0'; +} /*********************************************************************** * * NOTEPAD_WndProc */ - -LRESULT WINAPI NOTEPAD_WndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, + LPARAM lParam) { - PAINTSTRUCT ps; - HDC hContext; - HANDLE hDrop; /* drag & drop */ - CHAR szFileName[MAX_STRING_LEN]; - RECT Windowsize; - - lstrcpy(szFileName, ""); - switch (msg) { - case WM_CREATE: - GetClientRect(hWnd, &rectClient); - InitFontInfo(hWnd); - break; + case WM_CREATE: + { + RECT rc; + GetClientRect(hWnd, &rc); + LoadLibrary("RichEd32.dll"); - case WM_SETFOCUS: - CreateCaret(Globals.hMainWnd, 0, 1, tm.tmHeight); - SetCaretPos(dwCaretXpos, dwCaretYpos); - ShowCaret(Globals.hMainWnd); - break; + Globals.hEdit = + CreateWindow("RICHEDIT", "", + WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | + ES_AUTOVSCROLL | ES_MULTILINE, + 0, 0, rc.right, rc.bottom, hWnd, + NULL, Globals.hInstance, NULL); + NOTEPAD_InitData(); + DIALOG_FileNew(); + break; + } - case WM_KILLFOCUS: - DestroyCaret(); - break; - - case WM_PAINT: - GetClientRect(hWnd, &rectClient); - hContext = BeginPaint(hWnd, &ps); - RenderWindow(hContext); - EndPaint(hWnd, &ps); + case WM_COMMAND: + NOTEPAD_MenuCommand(wParam); break; - case WM_KEYDOWN: - DoEdit(hWnd, wParam, lParam); - break; + case WM_DESTROYCLIPBOARD: + MessageBox(Globals.hMainWnd, "Empty clipboard", "Debug", MB_ICONEXCLAMATION); + break; - case WM_CHAR: - GetClientRect(hWnd, &rectClient); - HideCaret(hWnd); - hContext = GetDC(hWnd); - DoInput(hContext,wParam,lParam); - ReleaseDC(hWnd,hContext); - ShowCaret(hWnd); - break; + case WM_CLOSE: + if (DoCloseFile()) { + PostQuitMessage(0); + } + DestroyWindow(hWnd); + break; - case WM_LBUTTONDOWN: - /* figure out where the mouse was clicked */ - ButtonDownToCaretPos(hWnd, wParam, lParam); - break; + case WM_DESTROY: + PostQuitMessage(0); + break; - case WM_VSCROLL: - DoScroll(hWnd, wParam, lParam); - InvalidateRect(hWnd, NULL, FALSE); /* force a redraw */ - break; - - case WM_COMMAND: - /* FIXME: this is a bit messy */ - NOTEPAD_MenuCommand(wParam); - InvalidateRect(hWnd, NULL, FALSE); /* force a redraw */ - hContext = GetDC(hWnd); - CalcCaretPos(hContext,dwXpos,dwYpos); - ReleaseDC(hWnd,hContext); - break; - - case WM_DESTROYCLIPBOARD: - MessageBox(Globals.hMainWnd, "Empty clipboard", "Debug", MB_ICONEXCLAMATION); - break; - - case WM_CLOSE: - if (DoCloseFile()) { - PostQuitMessage(0); - } - break; - - case WM_DESTROY: - PostQuitMessage (0); - break; - - case WM_SIZE: - GetClientRect(Globals.hMainWnd, &Windowsize); - break; - - case WM_DROPFILES: - /* User has dropped a file into main window */ - hDrop = (HANDLE) wParam; - DragQueryFile(hDrop, 0, (CHAR *) &szFileName, sizeof(szFileName)); - DragFinish(hDrop); - DoOpenFile(szFileName); - break; - - default: - return DefWindowProc (hWnd, msg, wParam, lParam); + case WM_SIZE: + { + RECT rc; + GetClientRect(hWnd, &rc); + SetWindowPos(Globals.hEdit, NULL, 0, 0, rc.right, rc.bottom, + SWP_NOOWNERZORDER | SWP_NOZORDER); + break; } - return 0l; + + case WM_DROPFILES: + { + CHAR szFileName[MAX_PATH]; + HANDLE hDrop = (HANDLE) wParam; + + DragQueryFile(hDrop, 0, (CHAR *) &szFileName, sizeof(szFileName)); + DragFinish(hDrop); + DoOpenFile(szFileName); + break; + } + + default: + return DefWindowProc(hWnd, msg, wParam, lParam); + } + return 0; } int AlertFileDoesNotExist(LPSTR szFileName) { @@ -878,7 +197,6 @@ void HandleCommandLine(LPSTR cmdline) { while (*cmdline && (*cmdline == ' ' || *cmdline == '-')) - { CHAR option; @@ -892,7 +210,7 @@ void HandleCommandLine(LPSTR cmdline) { case 'p': case 'P': printf("Print file: "); - /* Not yet able to print a file */ + /* TODO - not yet able to print a file */ break; } } @@ -945,109 +263,48 @@ void HandleCommandLine(LPSTR cmdline) } } - /*********************************************************************** * * WinMain */ - -int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) { - MSG msg; - WNDCLASS class; - char className[] = "NPClass"; /* To make sure className >= 0x10000 */ + MSG msg; + WNDCLASSEX class; + char className[] = "NPClass"; char winName[] = "Notepad"; - /* setup buffer */ - InitBuffer(); - - /* Setup Globals */ - - Globals.lpszIniFile = "notepad.ini"; - Globals.lpszIcoFile = "notepad.ico"; - + ZeroMemory(&Globals, sizeof(Globals)); Globals.hInstance = hInstance; -#ifndef LCC - Globals.hMainIcon = ExtractIcon(Globals.hInstance, - Globals.lpszIcoFile, 0); -#endif - if (!Globals.hMainIcon) { - Globals.hMainIcon = LoadIcon(0, MAKEINTRESOURCE(DEFAULTICON)); - } + ZeroMemory(&class, sizeof(class)); + class.cbSize = sizeof(class); + class.lpfnWndProc = NOTEPAD_WndProc; + class.hInstance = Globals.hInstance; + class.hIcon = LoadIcon(0, IDI_APPLICATION); + class.hCursor = LoadCursor(0, IDC_ARROW); + class.hbrBackground = (HBRUSH)(COLOR_WINDOW); + class.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); + class.lpszClassName = className; - lstrcpy(Globals.szFindText, ""); - lstrcpy(Globals.szFileName, ""); - lstrcpy(Globals.szMarginTop, "25 mm"); - lstrcpy(Globals.szMarginBottom, "25 mm"); - lstrcpy(Globals.szMarginLeft, "20 mm"); - lstrcpy(Globals.szMarginRight, "20 mm"); - lstrcpy(Globals.szHeader, "&n"); - lstrcpy(Globals.szFooter, "Page &s"); - lstrcpy(Globals.Buffer, "Hello World"); - - if (!prev){ - class.style = CS_HREDRAW | CS_VREDRAW; - class.lpfnWndProc = NOTEPAD_WndProc; - class.cbClsExtra = 0; - class.cbWndExtra = 0; - class.hInstance = Globals.hInstance; - class.hIcon = LoadIcon (0, IDI_APPLICATION); - class.hCursor = LoadCursor (0, IDC_ARROW); - class.hbrBackground = GetStockObject (WHITE_BRUSH); - class.lpszMenuName = 0; - class.lpszClassName = className; - } - - if (!RegisterClass (&class)) return FALSE; + if (!RegisterClassEx(&class)) return FALSE; /* Setup windows */ + Globals.hMainWnd = + CreateWindow(className, winName, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, + NULL, NULL, Globals.hInstance, NULL); - Globals.hMainWnd = CreateWindow (className, winName, - WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, - CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, - LoadMenu(Globals.hInstance, STRING_MENU_Xx), - Globals.hInstance, 0); - - Globals.hFindReplaceDlg = 0; - - LANGUAGE_LoadMenus(); - - SetMenu(Globals.hMainWnd, Globals.hMainMenu); - - ShowWindow (Globals.hMainWnd, show); - UpdateWindow (Globals.hMainWnd); - - /* Set up dialogs */ - - /* Identify Messages originating from FindReplace */ - - Globals.nCommdlgFindReplaceMsg = RegisterWindowMessage("commdlg_FindReplace"); - if (Globals.nCommdlgFindReplaceMsg==0) { - MessageBox(Globals.hMainWnd, "Could not register commdlg_FindReplace window message", - "Error", MB_ICONEXCLAMATION); - } + ShowWindow(Globals.hMainWnd, show); + UpdateWindow(Globals.hMainWnd); + DragAcceptFiles(Globals.hMainWnd, TRUE); HandleCommandLine(cmdline); - /* Set up Drag&Drop */ - - DragAcceptFiles(Globals.hMainWnd, TRUE); - - /* now enter mesage loop */ - - while (GetMessage (&msg, 0, 0, 0)) { - if (IsDialogMessage(Globals.hFindReplaceDlg, &msg)!=0) { - /* Message belongs to FindReplace dialog */ - /* We just let IsDialogMessage handle it */ - } - else - { - /* Message belongs to the Notepad Main Window */ - TranslateMessage (&msg); - DispatchMessage (&msg); - } + while (GetMessage(&msg, 0, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); } - return 0; + return msg.wParam; } diff --git a/programs/notepad/main.h b/programs/notepad/main.h index a3da15d396d..96e4af4ccc7 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -22,11 +22,7 @@ #include "notepad_res.h" #define MAX_STRING_LEN 255 -#define MAX_PATHNAME_LEN 1024 -#define MAX_LANGUAGE_NUMBER (NP_LAST_LANGUAGE - NP_FIRST_LANGUAGE) - #define HELPFILE "notepad.hlp" -#define LOGPREFIX ".LOG" /* hide the following from winerc */ #ifndef RC_INVOKED @@ -35,6 +31,8 @@ #include "commdlg.h" +VOID SetFileName(LPSTR szFileName); + /***** Compatibility *****/ #ifndef OIC_WINLOGO @@ -47,46 +45,27 @@ typedef struct HANDLE hInstance; HWND hMainWnd; HWND hFindReplaceDlg; + HWND hEdit; HICON hMainIcon; HICON hDefaultIcon; - HMENU hMainMenu; - HMENU hFileMenu; - HMENU hEditMenu; - HMENU hSearchMenu; - HMENU hLanguageMenu; - HMENU hHelpMenu; - LPCSTR lpszIniFile; LPCSTR lpszIcoFile; - UINT wStringTableOffset; BOOL bWrapLongLines; - CHAR szFindText[MAX_PATHNAME_LEN]; - CHAR szReplaceText[MAX_PATHNAME_LEN]; - CHAR szFileName[MAX_PATHNAME_LEN]; - CHAR szMarginTop[MAX_PATHNAME_LEN]; - CHAR szMarginBottom[MAX_PATHNAME_LEN]; - CHAR szMarginLeft[MAX_PATHNAME_LEN]; - CHAR szMarginRight[MAX_PATHNAME_LEN]; - CHAR szHeader[MAX_PATHNAME_LEN]; - CHAR szFooter[MAX_PATHNAME_LEN]; + CHAR szFindText[MAX_PATH]; + CHAR szFileName[MAX_PATH]; + CHAR szFileTitle[MAX_PATH]; + CHAR szFilter[2 * MAX_STRING_LEN + 100]; + CHAR szMarginTop[MAX_PATH]; + CHAR szMarginBottom[MAX_PATH]; + CHAR szMarginLeft[MAX_PATH]; + CHAR szMarginRight[MAX_PATH]; + CHAR szHeader[MAX_PATH]; + CHAR szFooter[MAX_PATH]; FINDREPLACE find; - WORD nCommdlgFindReplaceMsg; - CHAR Buffer[12000]; } NOTEPAD_GLOBALS; extern NOTEPAD_GLOBALS Globals; -/* function prototypes */ - -void TrashBuffer(void); -void LoadBufferFromFile(LPCSTR lpFileName); - -/* class names */ - -/* Resource names */ -extern CHAR STRING_MENU_Xx[]; -extern CHAR STRING_PAGESETUP_Xx[]; - #else /* RC_INVOKED */ #endif diff --git a/programs/notepad/notepad.rc b/programs/notepad/notepad.rc deleted file mode 100644 index c964feedafc..00000000000 --- a/programs/notepad/notepad.rc +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Notepad (notepad.rc) - * - * Copyright 1997,98 Marcel Baur - * - * 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 - */ - -/* Main Menu */ - -CONCAT(MENU_, LANGUAGE_ID) MENU -{ - POPUP MENU_FILE { - MENUITEM MENU_FILE_NEW, NP_FILE_NEW - MENUITEM MENU_FILE_OPEN, NP_FILE_OPEN - MENUITEM MENU_FILE_SAVE, NP_FILE_SAVE - MENUITEM MENU_FILE_SAVEAS, NP_FILE_SAVEAS - MENUITEM MENU_FILE_PRINT, NP_FILE_PRINT - MENUITEM MENU_FILE_PAGESETUP, NP_FILE_PAGESETUP - MENUITEM MENU_FILE_PRINTSETUP, NP_FILE_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM MENU_FILE_EXIT, NP_FILE_EXIT - } - POPUP MENU_EDIT { - MENUITEM MENU_EDIT_UNDO, NP_EDIT_UNDO - MENUITEM SEPARATOR - MENUITEM MENU_EDIT_CUT, NP_EDIT_CUT - MENUITEM MENU_EDIT_COPY, NP_EDIT_COPY - MENUITEM MENU_EDIT_PASTE, NP_EDIT_PASTE - MENUITEM MENU_EDIT_DELETE, NP_EDIT_DELETE - MENUITEM SEPARATOR - MENUITEM MENU_EDIT_SELECTALL, NP_EDIT_SELECTALL - MENUITEM MENU_EDIT_TIMEDATE, NP_EDIT_TIMEDATE - MENUITEM SEPARATOR - MENUITEM MENU_EDIT_WRAP, NP_EDIT_WRAP - } - POPUP MENU_SEARCH { - MENUITEM MENU_SEARCH_SEARCH, NP_SEARCH_SEARCH - MENUITEM MENU_SEARCH_NEXT, NP_SEARCH_NEXT - } - POPUP MENU_LANGUAGE { - /* Dummy item, will be removed */ - MENUITEM SEPARATOR - } - POPUP MENU_HELP { - MENUITEM MENU_HELP_CONTENTS, NP_HELP_CONTENTS - MENUITEM MENU_HELP_SEARCH, NP_HELP_SEARCH - MENUITEM MENU_HELP_HELP_ON_HELP, NP_HELP_ON_HELP - MENUITEM SEPARATOR - - POPUP MENU_INFO { - MENUITEM MENU_INFO_LICENSE, NP_HELP_LICENSE - MENUITEM MENU_INFO_NO_WARRANTY, NP_HELP_NO_WARRANTY - MENUITEM MENU_INFO_ABOUT_WINE, NP_HELP_ABOUT_WINE - } - } - -} - -/* Dialog `Page setup' */ - -CONCAT(DIALOG_PAGESETUP_, LANGUAGE_ID) DIALOG 0, 0, 225, 95 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "Helv" -CAPTION DIALOG_PAGESETUP_CAPTION -{ -LTEXT DIALOG_PAGESETUP_HEAD, NP_PAGESETUP_HEAD_TXT, 10, 07, 40, 15 -EDITTEXT NP_PAGESETUP_HEAD, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT DIALOG_PAGESETUP_TAIL, NP_PAGESETUP_TAIL_TXT, 10, 24, 40, 15 -EDITTEXT NP_PAGESETUP_TAIL, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX DIALOG_PAGESETUP_MARGIN, NP_PAGESETUP_MARGIN, 10, 43,160, 45 -LTEXT DIALOG_PAGESETUP_LEFT, NP_PAGESETUP_LEFT_TXT, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ NP_PAGESETUP_LEFT, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT DIALOG_PAGESETUP_TOP, NP_PAGESETUP_TOP_TXT, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ NP_PAGESETUP_TOP, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT DIALOG_PAGESETUP_RIGHT, NP_PAGESETUP_RIGHT_TXT, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ NP_PAGESETUP_RIGHT, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT DIALOG_PAGESETUP_BOTTOM, NP_PAGESETUP_BOTTOM_TXT,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ NP_PAGESETUP_BOTTOM, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - - -DEFPUSHBUTTON DIALOG_OK, IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON DIALOG_CANCEL, IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON DIALOG_HELP, NP_HELP, 180, 39, 40, 15, WS_TABSTOP -} - - -/* Strings */ - -#define STRING_LANGUAGE_ID STRINGIFY(LANGUAGE_ID) -#define STRING_LANGUAGE_MENU_ITEM LANGUAGE_MENU_ITEM - -STRINGTABLE -{ -ADDSTRING(LANGUAGE_ID) -ADDSTRING(LANGUAGE_MENU_ITEM) -ADDSTRING(NOTEPAD) -ADDSTRING(TEXT_FILES_TXT) -ADDSTRING(ALL_FILES) -ADDSTRING(ERROR) -ADDSTRING(WARNING) -ADDSTRING(INFO) -ADDSTRING(TOOLARGE) -ADDSTRING(NOTEXT) -ADDSTRING(DOESNOTEXIST) -ADDSTRING(NOTSAVED) -ADDSTRING(NOTFOUND) -ADDSTRING(OUT_OF_MEMORY) -ADDSTRING(UNTITLED) -ADDSTRING(PAGESETUP_HEADERVALUE) -ADDSTRING(PAGESETUP_FOOTERVALUE) -ADDSTRING(PAGESETUP_LEFTVALUE) -ADDSTRING(PAGESETUP_RIGHTVALUE) -ADDSTRING(PAGESETUP_TOPVALUE) -ADDSTRING(PAGESETUP_BOTTOMVALUE) -} - - -/* Undefine all language-specific strings */ - -#undef LANGUAGE_ID -#undef LANGUAGE_NUMBER -#undef LANGUAGE_MENU_ITEM - -#undef MENU_FILE -#undef MENU_FILE_NEW -#undef MENU_FILE_OPEN -#undef MENU_FILE_SAVE -#undef MENU_FILE_SAVEAS -#undef MENU_FILE_PRINT -#undef MENU_FILE_PAGESETUP -#undef MENU_FILE_PRINTSETUP -#undef MENU_FILE_EXIT -#undef MENU_EDIT -#undef MENU_EDIT_UNDO -#undef MENU_EDIT_CUT -#undef MENU_EDIT_COPY -#undef MENU_EDIT_PASTE -#undef MENU_EDIT_DELETE -#undef MENU_EDIT_SELECTALL -#undef MENU_EDIT_TIMEDATE -#undef MENU_EDIT_WRAP -#undef MENU_SEARCH -#undef MENU_SEARCH_SEARCH -#undef MENU_SEARCH_NEXT -#undef MENU_LANGUAGE -#undef MENU_HELP -#undef MENU_HELP_CONTENTS -#undef MENU_HELP_SEARCH -#undef MENU_HELP_HELP_ON_HELP -#undef MENU_INFO -#undef MENU_INFO_LICENSE -#undef MENU_INFO_NO_WARRANTY -#undef MENU_INFO_ABOUT_WINE - -#undef DIALOG_OK -#undef DIALOG_CANCEL -#undef DIALOG_BROWSE -#undef DIALOG_HELP -#undef DIALOG_PAGESETUP_CAPTION -#undef DIALOG_PAGESETUP_HEAD -#undef DIALOG_PAGESETUP_TAIL -#undef DIALOG_PAGESETUP_MARGIN -#undef DIALOG_PAGESETUP_LEFT -#undef DIALOG_PAGESETUP_RIGHT -#undef DIALOG_PAGESETUP_TOP -#undef DIALOG_PAGESETUP_BOTTOM - -#undef STRING_LANGUAGE_ID -#undef STRING_LANGUAGE_MENU_ITEM -#undef STRING_PAGESETUP_HEADERVALUE -#undef STRING_PAGESETUP_FOOTERVALUE -#undef STRING_PAGESETUP_LEFTVALUE -#undef STRING_PAGESETUP_RIGHTVALUE -#undef STRING_PAGESETUP_TOPVALUE -#undef STRING_PAGESETUP_BOTTOMVALUE -#undef STRING_NOTEPAD -#undef STRING_ERROR -#undef STRING_WARNING -#undef STRING_INFO -#undef STRING_UNTITLED -#undef STRING_ALL_FILES -#undef STRING_TEXT_FILES_TXT -#undef STRING_TOOLARGE -#undef STRING_NOTEXT -#undef STRING_DOESNOTEXIST -#undef STRING_NOTSAVED -#undef STRING_NOTFOUND -#undef STRING_OUT_OF_MEMORY diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h index fec06740ff3..37a65f5a693 100644 --- a/programs/notepad/notepad_res.h +++ b/programs/notepad/notepad_res.h @@ -1,7 +1,8 @@ /* - * Notepad (String defines) + * Constants, used in resources. * * Copyright 2002 Sylvain Petreolle + * Copyright 2002 Andriy Palamarchuk * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +19,39 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define MAIN_MENU 0x10F +#define MAIN_MENU 0x201 +#define DIALOG_PAGESETUP 0x202 + +/* Commands */ +#define CMD_NEW 0x100 +#define CMD_OPEN 0x101 +#define CMD_SAVE 0x102 +#define CMD_SAVE_AS 0x103 +#define CMD_PRINT 0x104 +#define CMD_PAGE_SETUP 0x105 +#define CMD_PRINTER_SETUP 0x106 +#define CMD_EXIT 0x108 + +#define CMD_UNDO 0x110 +#define CMD_CUT 0x111 +#define CMD_COPY 0x112 +#define CMD_PASTE 0x113 +#define CMD_DELETE 0x114 +#define CMD_SELECT_ALL 0x116 +#define CMD_TIME_DATE 0x117 +#define CMD_WRAP 0x119 + +#define CMD_SEARCH 0x120 +#define CMD_SEARCH_NEXT 0x121 + +#define CMD_HELP_CONTENTS 0x130 +#define CMD_HELP_SEARCH 0x131 +#define CMD_HELP_ON_HELP 0x132 +#define CMD_LICENSE 0x135 +#define CMD_NO_WARRANTY 0x136 +#define CMD_ABOUT_WINE 0x137 + +/* Strings */ #define STRING_PAGESETUP_HEADERVALUE 0x160 #define STRING_PAGESETUP_FOOTERVALUE 0x161 #define STRING_PAGESETUP_LEFTVALUE 0x162 diff --git a/programs/notepad/search.c b/programs/notepad/search.c deleted file mode 100644 index f5b8698100c..00000000000 --- a/programs/notepad/search.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Notepad (search.c) - * Copyright (C) 1999 by Marcel Baur - * - * 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 - * - * This file features Heuristic Boyer-Moore Text Search - * - * Always: - Buf is the Buffer containing the whole text - * ======= - SP is the Search Pattern, which has to be found in Buf. - * - */ - -#include - - #define CHARSETSIZE 255 - - int delta[CHARSETSIZE]; - - /* rightmostpos: return rightmost position of ch in szSP (or -1) */ - int rightmostpos(char ch, LPSTR szSP, int nSPLen) { - int i = nSPLen; - while ((i>0) & (szSP[i]!=ch)) i--; - return(i); - } - - /* setup_delta: setup delta1 cache */ - void setup_delta(LPSTR szSP, int nSPLen) { - int i; - - for (i=0; i delta[(int)szBuf[i]]) { - i+= (nSPLen-j+1); - } else { - i+= delta[(int)szBuf[i]]; - } - } - } while (j>0 && i<=nBufLen); - return(i+1); - } -