Update translations of wordpad by syncin to wine 0.9.54

svn path=/trunk/; revision=32036
This commit is contained in:
Daniel Reimer 2008-01-28 15:08:37 +00:00
parent 015995a0a4
commit c0808d2c1c
13 changed files with 194 additions and 130 deletions

View file

@ -119,7 +119,7 @@ static HLPFILE_PAGE *HLPFILE_PageByNumber(HLPFILE* hlpfile, UINT wNum)
* As of today, we only return the page... we should also return * As of today, we only return the page... we should also return
* a paragraph, and then, while opening a new page, compute the * a paragraph, and then, while opening a new page, compute the
* y-offset of the paragraph to be shown and scroll the window * y-offset of the paragraph to be shown and scroll the window
* accordinly * accordingly
*/ */
/****************************************************************** /******************************************************************
* HLPFILE_PageByOffset * HLPFILE_PageByOffset

View file

@ -22,31 +22,31 @@ IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Datei" POPUP "&Datei"
BEGIN BEGIN
MENUITEM "&Neu\tCtrl+N", ID_FILE_NEW MENUITEM "&Neu\tStrg+N", ID_FILE_NEW
MENUITEM "&Öffnen...\tCtrl+O", ID_FILE_OPEN MENUITEM "Ö&ffnen...\tStrg+O", ID_FILE_OPEN
MENUITEM "&Speichern\tCtrl+S", ID_FILE_SAVE MENUITEM "&Speichern\tStrg+S", ID_FILE_SAVE
MENUITEM "Speichern &unter...", ID_FILE_SAVEAS MENUITEM "Speichern &unter...", ID_FILE_SAVEAS
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Print . . .\tCtrl+P", ID_PRINT MENUITEM "&Drucken...\tStrg+P", ID_PRINT
MENUITEM "Print previe&w . . .", ID_PREVIEW MENUITEM "Seitenansi&cht", ID_PREVIEW
MENUITEM "Pag&e setup . . .", ID_PRINTSETUP MENUITEM "Seite ein&richten...", ID_PRINTSETUP
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Beenden", ID_FILE_EXIT MENUITEM "&Beenden", ID_FILE_EXIT
END END
POPUP "&Bearbeiten" POPUP "&Bearbeiten"
BEGIN BEGIN
MENUITEM "Rü&ckgängig\tCtrl+Z", ID_EDIT_UNDO MENUITEM "&Rückgängig\tStrg+Z", ID_EDIT_UNDO
MENUITEM "&Wiederholen\tCtrl+Y", ID_EDIT_REDO MENUITEM "&Wiederholen\tStrg+Y", ID_EDIT_REDO
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Aus&schneiden\tCtrl+X", ID_EDIT_CUT MENUITEM "&Ausschneiden\tStrg+X", ID_EDIT_CUT
MENUITEM "&Kopieren\tCtrl+C", ID_EDIT_COPY MENUITEM "&Kopieren\tStrg+C", ID_EDIT_COPY
MENUITEM "&Einfügen\tCtrl+V", ID_EDIT_PASTE MENUITEM "&Einfügen\tStrg+V", ID_EDIT_PASTE
MENUITEM "&Löschen\tDEL", ID_EDIT_CLEAR MENUITEM "&Löschen\tEntf", ID_EDIT_CLEAR
MENUITEM "&Alles markieren\tCtrl+A", ID_EDIT_SELECTALL MENUITEM "Alles &markieren\tStrg+A", ID_EDIT_SELECTALL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Find . . .\tCrtl+F", ID_FIND MENUITEM "&Suchen...\tStrg+F", ID_FIND
MENUITEM "Find &next\tF3", ID_FIND_NEXT MENUITEM "&Weitersuchen\tF3", ID_FIND_NEXT
MENUITEM "&Replace . . .\tCtrl+H", ID_REPLACE MENUITEM "Erset&zen...\tStrg+H", ID_REPLACE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Schreibgeschü&tzt", ID_EDIT_READONLY MENUITEM "Schreibgeschü&tzt", ID_EDIT_READONLY
MENUITEM "&Geändert", ID_EDIT_MODIFIED MENUITEM "&Geändert", ID_EDIT_MODIFIED
@ -60,33 +60,34 @@ BEGIN
MENUITEM "&Get text", ID_EDIT_GETTEXT MENUITEM "&Get text", ID_EDIT_GETTEXT
END END
END END
POPUP "&View" POPUP "&Ansicht"
BEGIN BEGIN
MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Symbolleiste", ID_TOGGLE_TOOLBAR
MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR MENUITEM "&Formatierungsleiste", ID_TOGGLE_FORMATBAR
MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM "L&ineal", ID_TOGGLE_RULER
MENUITEM "Status&leiste", ID_TOGGLE_STATUSBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Options . . .", ID_VIEWPROPERTIES MENUITEM "&Optionen...", ID_VIEWPROPERTIES
END END
POPUP "&Insert" POPUP "&Einfügen"
BEGIN BEGIN
MENUITEM "&Date and time . . .", ID_DATETIME MENUITEM "&Datum und Uhrzeit...", ID_DATETIME
END END
POPUP "F&ormat" POPUP "Forma&t"
BEGIN BEGIN
MENUITEM "&Font . . .", ID_FONTSETTINGS MENUITEM "Sch&riftart...", ID_FONTSETTINGS
MENUITEM "&Bullet points" ID_BULLET MENUITEM "Auf&zählungszeichen" ID_BULLET
MENUITEM "&Paragraph . . ." ID_PARAFORMAT MENUITEM "&Absatz..." ID_PARAFORMAT
MENUITEM "&Tabs . . ." ID_TABSTOPS MENUITEM "&Tabsstopps..." ID_TABSTOPS
POPUP "&Hintergrund" POPUP "&Hintergrund"
BEGIN BEGIN
MENUITEM "&System\tCtrl+1", ID_BACK_1 MENUITEM "&System\tStrg+1", ID_BACK_1
MENUITEM "&PostIt-Notiz\tCtrl+2", ID_BACK_2 MENUITEM "&PostIt-Notiz\tStrg+2", ID_BACK_2
END END
END END
POPUP "&Help" POPUP "&?"
BEGIN BEGIN
MENUITEM "&About Wine Wordpad" ID_ABOUT MENUITEM "Ü&ber Wine Wordpad" ID_ABOUT
END END
END END
@ -98,63 +99,63 @@ BEGIN
MENUITEM "&Kopieren", ID_EDIT_COPY MENUITEM "&Kopieren", ID_EDIT_COPY
MENUITEM "&Einfügen", ID_EDIT_PASTE MENUITEM "&Einfügen", ID_EDIT_PASTE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Bullet points" ID_BULLET MENUITEM "Auf&zählungszeichen" ID_BULLET
MENUITEM "&Paragraph . . ." ID_PARAFORMAT MENUITEM "&Absatz..." ID_PARAFORMAT
END END
END END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Date and time" CAPTION "Datum und Uhrzeit"
FONT 10, "MS Sans Serif" FONT 10, "MS Sans Serif"
BEGIN BEGIN
LTEXT "Available formats",0,3,2,100,15 LTEXT "Verfügbare Formate",0,3,2,100,15
LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT
PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&OK",IDOK,87,12,40,12
PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 PUSHBUTTON "A&bbrechen",IDCANCEL,87,26,40,12
END END
IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "New" CAPTION "Neu"
FONT 10, "MS Sans Serif" FONT 10, "MS Sans Serif"
BEGIN BEGIN
LTEXT "New document type",0,3,2,100,15 LTEXT "Neuer Dokumenttyp",0,3,2,100,15
LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "&OK",IDOK,97,12,40,12
PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 PUSHBUTTON "A&bbrechen",IDCANCEL,97,26,40,12
END END
IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
Caption "Paragraph format" Caption "Absatz"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
GROUPBOX "Indentation", 0, 10, 10, 120, 68 GROUPBOX "Einzug", 0, 10, 10, 120, 68
LTEXT "Left", 0, 15, 22, 40, 13 LTEXT "Links", 0, 15, 22, 40, 13
EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
LTEXT "Right", 0, 15, 40, 40, 13 LTEXT "Rechts", 0, 15, 40, 40, 13
EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
LTEXT "First line", 0, 15, 58, 40, 13 LTEXT "Erste Zeile", 0, 15, 58, 40, 13
EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
LTEXT "Alignment", 0, 15, 87, 40, 13 LTEXT "Ausrichtung", 0, 15, 87, 40, 13
COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15
END END
IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
Caption "Tabs" Caption "Tabstopps"
FONT 8, "MS SHell DLg" FONT 8, "MS SHell DLg"
BEGIN BEGIN
GROUPBOX "Tab stops", 0, 10, 10, 120, 90 GROUPBOX "Tabstoppposition", 0, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15 DEFPUSHBUTTON "&Festlegen", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15 PUSHBUTTON "&Löschen", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15
PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15 PUSHBUTTON "&Alle löschen", ID_TAB_EMPTY, 137, 51, 50, 15
END END
IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
@ -162,56 +163,57 @@ STYLE DS_SYSMODAL
Caption "" Caption ""
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 GROUPBOX "Zeilenumbruch", 0, 10, 10, 130, 85
RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25, 117, 15 RADIOBUTTON "&Am Fenster umbrechen", IDC_PAGEFMT_WW, 18, 25, 117, 15
RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15 RADIOBUTTON "A&m Lineal umbrechen", IDC_PAGEFMT_WM, 18, 45, 117, 15
GROUPBOX "Toolbars", 0, 150, 10, 120, 85 GROUPBOX "Symbolleisten", 0, 150, 10, 120, 85
CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Symbolleiste", IDC_PAGEFMT_TB, 160, 20, 80, 15
CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Formatierungsleiste", IDC_PAGEFMT_FB, 160, 38, 80, 15
CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 CHECKBOX "L&ineal", IDC_PAGEFMT_RU, 160, 56, 80, 15
CHECKBOX "Status&leiste", IDC_PAGEFMT_SB, 160, 74, 80, 15
LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
STRING_RICHTEXT_FILES_RTF, "Rich-Text-Format (*.rtf)" STRING_RICHTEXT_FILES_RTF, "RTF-Format (*.rtf)"
STRING_TEXT_FILES_TXT, "Textdateien (*.txt)" STRING_TEXT_FILES_TXT, "Textdokumente (*.txt)"
STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "Unicode-Textdokumente (*.txt)"
STRING_ALL_FILES, "Alle Dokumente (*.*)" STRING_ALL_FILES, "Alle Dokumente (*.*)"
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
STRING_ALIGN_LEFT, "Left" STRING_ALIGN_LEFT, "Links"
STRING_ALIGN_RIGHT, "Right" STRING_ALIGN_RIGHT, "Rechts"
STRING_ALIGN_CENTER, "Center" STRING_ALIGN_CENTER, "Zentriert"
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
STRING_NEWFILE_RICHTEXT, "Rich text document" STRING_NEWFILE_RICHTEXT, "RTF-Dokument"
STRING_NEWFILE_TXT, "Text document" STRING_NEWFILE_TXT, "Textdokument"
STRING_NEWFILE_TXT_UNICODE, "Unicode text document" STRING_NEWFILE_TXT_UNICODE, "Unicode-Textdokument"
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" STRING_PRINTER_FILES_PRN, "Druckerdateien (*.PRN)"
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
STRING_VIEWPROPS_TITLE, "Options" STRING_VIEWPROPS_TITLE, "Optionen"
STRING_VIEWPROPS_TEXT, "Text" STRING_VIEWPROPS_TEXT, "Text"
STRING_VIEWPROPS_RICHTEXT, "Rich text" STRING_VIEWPROPS_RICHTEXT, "Rich Text"
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
STRING_PREVIEW_PRINT, "Print" STRING_PREVIEW_PRINT, "&Drucken"
STRING_PREVIEW_NEXTPAGE, "Next page" STRING_PREVIEW_NEXTPAGE, "&Nächste"
STRING_PREVIEW_PREVPAGE, "Previous page" STRING_PREVIEW_PREVPAGE, "&Vorherige"
STRING_PREVIEW_CLOSE, "Close" STRING_PREVIEW_CLOSE, "&Schließen"
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
@ -221,13 +223,13 @@ END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
STRING_DEFAULT_FILENAME, "Document" STRING_DEFAULT_FILENAME, "Dokument"
STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" STRING_PROMPT_SAVE_CHANGES, "Änderungen an '%s' speichern?"
STRING_SEARCH_FINISHED, "Finished searching the document." STRING_SEARCH_FINISHED, "Wordpad hat das Durchsuchen des Dokuments beendet."
STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." STRING_LOAD_RICHED_FAILED, "Die RichEdit-Bibliothek konnte nicht geladen werden."
STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ STRING_SAVE_LOSEFORMATTING, "Sie sind dabei, die Datei als Textdatei zu speichern. " \
"which will cause all formatting to be lost. " \ "Dadurch geht die Formatierung verloren. " \
"Are you sure that you wish to do this?" "Möchten Sie den Vorgang trotzdem fortsetzen?"
STRING_INVALID_NUMBER, "Invalid number format" STRING_INVALID_NUMBER, "Diese Maßeinheit ist nicht zulässig."
STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstützt."
END END

View file

@ -64,6 +64,7 @@ BEGIN
BEGIN BEGIN
MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR
MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR
MENUITEM "&Ruler", ID_TOGGLE_RULER
MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Options . . .", ID_VIEWPROPERTIES MENUITEM "&Options . . .", ID_VIEWPROPERTIES
@ -168,7 +169,8 @@ BEGIN
GROUPBOX "Toolbars", 0, 150, 10, 120, 85 GROUPBOX "Toolbars", 0, 150, 10, 120, 85
CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
END END

View file

@ -64,6 +64,7 @@ BEGIN
BEGIN BEGIN
MENUITEM "&Barre d'outils", ID_TOGGLE_TOOLBAR MENUITEM "&Barre d'outils", ID_TOGGLE_TOOLBAR
MENUITEM "&Barre de format", ID_TOGGLE_FORMATBAR MENUITEM "&Barre de format", ID_TOGGLE_FORMATBAR
MENUITEM "&Ruler", ID_TOGGLE_RULER
MENUITEM "&Barre d'état", ID_TOGGLE_STATUSBAR MENUITEM "&Barre d'état", ID_TOGGLE_STATUSBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Options...", ID_VIEWPROPERTIES MENUITEM "&Options...", ID_VIEWPROPERTIES
@ -168,7 +169,8 @@ BEGIN
GROUPBOX "Barres d'outils", 0, 150, 10, 120, 85 GROUPBOX "Barres d'outils", 0, 150, 10, 120, 85
CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 160, 20, 80, 15
CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 160, 38, 80, 15
CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 160, 56, 80, 15 CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 160, 74, 80, 15
LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
END END

View file

@ -64,6 +64,7 @@ BEGIN
BEGIN BEGIN
MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR
MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR
MENUITEM "&Ruler", ID_TOGGLE_RULER
MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Options . . .", ID_VIEWPROPERTIES MENUITEM "&Options . . .", ID_VIEWPROPERTIES
@ -168,7 +169,8 @@ BEGIN
GROUPBOX "Toolbars", 0, 150, 10, 120, 85 GROUPBOX "Toolbars", 0, 150, 10, 120, 85
CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
END END

View file

@ -66,6 +66,7 @@ BEGIN
BEGIN BEGIN
MENUITEM "도구바(&T)", ID_TOGGLE_TOOLBAR MENUITEM "도구바(&T)", ID_TOGGLE_TOOLBAR
MENUITEM "형식바(&F)", ID_TOGGLE_FORMATBAR MENUITEM "형식바(&F)", ID_TOGGLE_FORMATBAR
MENUITEM "&Ruler", ID_TOGGLE_RULER
MENUITEM "상태바(&S)", ID_TOGGLE_STATUSBAR MENUITEM "상태바(&S)", ID_TOGGLE_STATUSBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM " 옵션(&O) . . .", ID_VIEWPROPERTIES MENUITEM " 옵션(&O) . . .", ID_VIEWPROPERTIES
@ -170,7 +171,8 @@ BEGIN
GROUPBOX " 도구바", 0, 150, 10, 120, 85 GROUPBOX " 도구바", 0, 150, 10, 120, 85
CHECKBOX "도구바(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "도구바(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15
CHECKBOX "형식바(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "형식바(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15
CHECKBOX "상태바(&S)", IDC_PAGEFMT_SB, 160, 56, 80, 15 CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
CHECKBOX "상태바(&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15
LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
END END

View file

@ -64,6 +64,7 @@ BEGIN
BEGIN BEGIN
MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR
MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR
MENUITEM "&Ruler", ID_TOGGLE_RULER
MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Options . . .", ID_VIEWPROPERTIES MENUITEM "&Options . . .", ID_VIEWPROPERTIES
@ -168,7 +169,8 @@ BEGIN
GROUPBOX "Toolbars", 0, 150, 10, 120, 85 GROUPBOX "Toolbars", 0, 150, 10, 120, 85
CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
END END

View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2006-2007 by Alexander N. Sørnes <alex@thehandofagony.com> * Copyright 2006-2008 by Alexander N. Sørnes <alex@thehandofagony.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -64,6 +64,7 @@ BEGIN
BEGIN BEGIN
MENUITEM "Verk&tøylinje", ID_TOGGLE_TOOLBAR MENUITEM "Verk&tøylinje", ID_TOGGLE_TOOLBAR
MENUITEM "&Formatlinje", ID_TOGGLE_FORMATBAR MENUITEM "&Formatlinje", ID_TOGGLE_FORMATBAR
MENUITEM "&Linjal", ID_TOGGLE_RULER
MENUITEM "&Statuslinje", ID_TOGGLE_STATUSBAR MENUITEM "&Statuslinje", ID_TOGGLE_STATUSBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Alternativer . . .", ID_VIEWPROPERTIES MENUITEM "&Alternativer . . .", ID_VIEWPROPERTIES
@ -168,7 +169,8 @@ BEGIN
GROUPBOX "Verktøylinjer", 0, 150, 10, 120, 85 GROUPBOX "Verktøylinjer", 0, 150, 10, 120, 85
CHECKBOX "&Verktøylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Verktøylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15
CHECKBOX "&Formatlinje", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Formatlinje", IDC_PAGEFMT_FB, 160, 38, 80, 15
CHECKBOX "&Statuslinje", IDC_PAGEFMT_SB, 160, 56, 80, 15 CHECKBOX "&Linjal", IDC_PAGEFMT_RU, 160, 56, 80, 15
CHECKBOX "&Statuslinje", IDC_PAGEFMT_SB, 160, 74, 80, 15
LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
END END

View file

@ -65,6 +65,7 @@ BEGIN
BEGIN BEGIN
MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR
MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR
MENUITEM "&Ruler", ID_TOGGLE_RULER
MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Options . . .", ID_VIEWPROPERTIES MENUITEM "&Options . . .", ID_VIEWPROPERTIES
@ -169,7 +170,8 @@ BEGIN
GROUPBOX "Toolbars", 0, 150, 10, 120, 85 GROUPBOX "Toolbars", 0, 150, 10, 120, 85
CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
END END

View file

@ -27,11 +27,11 @@ BEGIN
MENUITEM "&Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE MENUITEM "&Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE
MENUITEM "Ñîõðàíèòü &êàê...", ID_FILE_SAVEAS MENUITEM "Ñîõðàíèòü &êàê...", ID_FILE_SAVEAS
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Ïå÷àòü . . .\tCtrl+P", ID_PRINT MENUITEM "&Ïå÷àòü . . .\tCtrl+P", ID_PRINT
MENUITEM "Ïðåä&âàðèòåëüíûé ïðîñìîòð . . .", ID_PREVIEW MENUITEM "Ïðåä&âàðèòåëüíûé ïðîñìîòð . . .", ID_PREVIEW
MENUITEM "&Ìàêåò ñòðàíèöû . . .", ID_PRINTSETUP MENUITEM "&Ìàêåò ñòðàíèöû . . .", ID_PRINTSETUP
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Â&ûõîä", ID_FILE_EXIT MENUITEM "Â&ûõîä", ID_FILE_EXIT
END END
POPUP "&Ïðàâêà" POPUP "&Ïðàâêà"
BEGIN BEGIN
@ -41,11 +41,11 @@ BEGIN
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT
MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY
MENUITEM "&Âñòàâèòü\tCtrl+V", ID_EDIT_PASTE MENUITEM "&Âñòàâèòü\tCtrl+V", ID_EDIT_PASTE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Íàéòè . . .\tCrtl+F", ID_FIND MENUITEM "&Íàéòè . . .\tCrtl+F", ID_FIND
MENUITEM "Íà&éòè äàëåå\tF3", ID_FIND_NEXT MENUITEM "Íà&éòè äàëåå\tF3", ID_FIND_NEXT
MENUITEM "&Çàìåíèòü . . .\tCtrl+H", ID_REPLACE MENUITEM "&Çàìåíèòü . . .\tCtrl+H", ID_REPLACE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Òîëüêî äëÿ ÷òåíèÿ", ID_EDIT_READONLY MENUITEM "&Òîëüêî äëÿ ÷òåíèÿ", ID_EDIT_READONLY
MENUITEM "&Èçìåíåí", ID_EDIT_MODIFIED MENUITEM "&Èçìåíåí", ID_EDIT_MODIFIED
@ -59,24 +59,25 @@ BEGIN
MENUITEM "Ï&îëó÷èòü òåêñò", ID_EDIT_GETTEXT MENUITEM "Ï&îëó÷èòü òåêñò", ID_EDIT_GETTEXT
END END
END END
POPUP "&View" POPUP "&Âèä"
BEGIN BEGIN
MENUITEM "Ïàíåëü &èíñòðóìåíòîâ", ID_TOGGLE_TOOLBAR MENUITEM "Ïàíåëü &èíñòðóìåíòîâ", ID_TOGGLE_TOOLBAR
MENUITEM "Ï&àíåëü ôîðìàòèðîâàíèÿ", ID_TOGGLE_FORMATBAR MENUITEM "Ï&àíåëü ôîðìàòèðîâàíèÿ", ID_TOGGLE_FORMATBAR
MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_TOGGLE_STATUSBAR MENUITEM "&Ëèíåéêà", ID_TOGGLE_RULER
MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_TOGGLE_STATUSBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Ïàðàìåòðû . . .", ID_VIEWPROPERTIES MENUITEM "&Ïàðàìåòðû . . .", ID_VIEWPROPERTIES
END END
POPUP "Âñò&àâêà" POPUP "Âñò&àâêà"
BEGIN BEGIN
MENUITEM "&Äàòà è âðåìÿ . . .", ID_DATETIME MENUITEM "&Äàòà è âðåìÿ . . .", ID_DATETIME
END END
POPUP "Ôîð&ìàò" POPUP "Ôîð&ìàò"
BEGIN BEGIN
MENUITEM "&Øðèôò . . .", ID_FONTSETTINGS MENUITEM "&Øðèôò . . .", ID_FONTSETTINGS
MENUITEM "&Ìàðêåð" ID_BULLET MENUITEM "&Ìàðêåð" ID_BULLET
MENUITEM "&Àáçàö . . ." ID_PARAFORMAT MENUITEM "&Àáçàö . . ." ID_PARAFORMAT
MENUITEM "&Òàáóëÿöèÿ . . ." ID_TABSTOPS MENUITEM "&Òàáóëÿöèÿ . . ." ID_TABSTOPS
POPUP "&Ôîí" POPUP "&Ôîí"
BEGIN BEGIN
MENUITEM "&Ñèñòåìíûé\tCtrl+1", ID_BACK_1 MENUITEM "&Ñèñòåìíûé\tCtrl+1", ID_BACK_1
@ -95,10 +96,10 @@ BEGIN
BEGIN BEGIN
MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT
MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY
MENUITEM "Âñò&àâèòü", ID_EDIT_PASTE MENUITEM "Âñò&àâèòü", ID_EDIT_PASTE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Ìàðêåð" ID_BULLET MENUITEM "&Ìàðêåð" ID_BULLET
MENUITEM "&Àáçàö . . ." ID_PARAFORMAT MENUITEM "&Àáçàö . . ." ID_PARAFORMAT
END END
END END
@ -167,7 +168,8 @@ BEGIN
GROUPBOX "Ïàíåëè", 0, 150, 10, 120, 85 GROUPBOX "Ïàíåëè", 0, 150, 10, 120, 85
CHECKBOX "&Èíñòðóìåíòîâ", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Èíñòðóìåíòîâ", IDC_PAGEFMT_TB, 160, 20, 80, 15
CHECKBOX "&Ôîðìàòèðîâàíèÿ", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Ôîðìàòèðîâàíèÿ", IDC_PAGEFMT_FB, 160, 38, 80, 15
CHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_PAGEFMT_SB, 160, 56, 80, 15 CHECKBOX "&Ëèíåéêà", IDC_PAGEFMT_RU, 160, 56, 80, 15
CHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_PAGEFMT_SB, 160, 74, 80, 15
LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
END END
@ -176,7 +178,7 @@ BEGIN
STRING_RICHTEXT_FILES_RTF, "Ôàéëû RTF (*.rtf)" STRING_RICHTEXT_FILES_RTF, "Ôàéëû RTF (*.rtf)"
STRING_TEXT_FILES_TXT, "Òåêñòîâûå äîêóìåíòû (*.txt)" STRING_TEXT_FILES_TXT, "Òåêñòîâûå äîêóìåíòû (*.txt)"
STRING_TEXT_FILES_UNICODE_TXT, "Äîêóìåíòû Unicode (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "Äîêóìåíòû Unicode (*.txt)"
STRING_ALL_FILES, "Âñå äîêóìíòû (*.*)" STRING_ALL_FILES, "Âñå äîêóìåíòû (*.*)"
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

View file

@ -67,6 +67,7 @@ BEGIN
BEGIN BEGIN
MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR
MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR
MENUITEM "&Ruler", ID_TOGGLE_RULER
MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Options . . .", ID_VIEWPROPERTIES MENUITEM "&Options . . .", ID_VIEWPROPERTIES
@ -171,7 +172,8 @@ BEGIN
GROUPBOX "Toolbars", 0, 150, 10, 120, 85 GROUPBOX "Toolbars", 0, 150, 10, 120, 85
CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
END END

View file

@ -2,7 +2,7 @@
* Wordpad implementation * Wordpad implementation
* *
* Copyright 2004 by Krzysztof Foltman * Copyright 2004 by Krzysztof Foltman
* Copyright 2007 by Alexander N. Sørnes <alex@thehandofagony.com> * Copyright 2007-2008 by Alexander N. Sørnes <alex@thehandofagony.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -600,7 +600,7 @@ static void set_toolbar_state(int bandId, BOOL show)
SendMessageW(hwndReBar, RB_SETBANDINFO, index, (LPARAM)&rbbinfo); SendMessageW(hwndReBar, RB_SETBANDINFO, index, (LPARAM)&rbbinfo);
} }
if(bandId == BANDID_TOOLBAR || bandId == BANDID_FORMATBAR) if(bandId == BANDID_TOOLBAR || bandId == BANDID_FORMATBAR || bandId == BANDID_RULER)
store_bar_state(bandId, show); store_bar_state(bandId, show);
} }
@ -618,6 +618,7 @@ static void set_bar_states(void)
set_toolbar_state(BANDID_FONTLIST, is_bar_visible(BANDID_FORMATBAR)); set_toolbar_state(BANDID_FONTLIST, is_bar_visible(BANDID_FORMATBAR));
set_toolbar_state(BANDID_SIZELIST, is_bar_visible(BANDID_FORMATBAR)); set_toolbar_state(BANDID_SIZELIST, is_bar_visible(BANDID_FORMATBAR));
set_toolbar_state(BANDID_FORMATBAR, is_bar_visible(BANDID_FORMATBAR)); set_toolbar_state(BANDID_FORMATBAR, is_bar_visible(BANDID_FORMATBAR));
set_toolbar_state(BANDID_RULER, is_bar_visible(BANDID_RULER));
set_statusbar_state(is_bar_visible(BANDID_STATUSBAR)); set_statusbar_state(is_bar_visible(BANDID_STATUSBAR));
update_window(); update_window();
@ -912,7 +913,9 @@ static INT_PTR CALLBACK formatopts_proc(HWND hWnd, UINT message, WPARAM wParam,
CheckDlgButton(hWnd, IDC_PAGEFMT_TB, TRUE); CheckDlgButton(hWnd, IDC_PAGEFMT_TB, TRUE);
if(barState[ps->lParam] & (1 << BANDID_FORMATBAR)) if(barState[ps->lParam] & (1 << BANDID_FORMATBAR))
CheckDlgButton(hWnd, IDC_PAGEFMT_FB, TRUE); CheckDlgButton(hWnd, IDC_PAGEFMT_FB, TRUE);
if(barState[ps->lParam] & (BANDID_STATUSBAR)) if(barState[ps->lParam] & (1 << BANDID_RULER))
CheckDlgButton(hWnd, IDC_PAGEFMT_RU, TRUE);
if(barState[ps->lParam] & (1 << BANDID_STATUSBAR))
CheckDlgButton(hWnd, IDC_PAGEFMT_SB, TRUE); CheckDlgButton(hWnd, IDC_PAGEFMT_SB, TRUE);
} }
break; break;
@ -928,6 +931,7 @@ static INT_PTR CALLBACK formatopts_proc(HWND hWnd, UINT message, WPARAM wParam,
case IDC_PAGEFMT_TB: case IDC_PAGEFMT_TB:
case IDC_PAGEFMT_FB: case IDC_PAGEFMT_FB:
case IDC_PAGEFMT_RU:
case IDC_PAGEFMT_SB: case IDC_PAGEFMT_SB:
CheckDlgButton(hWnd, LOWORD(wParam), CheckDlgButton(hWnd, LOWORD(wParam),
!IsDlgButtonChecked(hWnd, LOWORD(wParam))); !IsDlgButtonChecked(hWnd, LOWORD(wParam)));
@ -960,6 +964,11 @@ static INT_PTR CALLBACK formatopts_proc(HWND hWnd, UINT message, WPARAM wParam,
else else
barState[id] &= ~(1 << BANDID_FORMATBAR); barState[id] &= ~(1 << BANDID_FORMATBAR);
if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_RU))
barState[id] |= (1 << BANDID_RULER);
else
barState[id] &= ~(1 << BANDID_RULER);
if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_SB)) if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_SB))
barState[id] |= (1 << BANDID_STATUSBAR); barState[id] |= (1 << BANDID_STATUSBAR);
else else
@ -1182,7 +1191,7 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace)
static int current_units_to_twips(float number) static int current_units_to_twips(float number)
{ {
int twips = (int)(number * 567); int twips = (int)(number * TWIPS_PER_CM);
return twips; return twips;
} }
@ -1195,7 +1204,7 @@ static void append_current_units(LPWSTR buffer)
static void number_with_units(LPWSTR buffer, int number) static void number_with_units(LPWSTR buffer, int number)
{ {
float converted = (float)number / 567; float converted = (float)number / TWIPS_PER_CM;
char string[MAX_STRING_LEN]; char string[MAX_STRING_LEN];
sprintf(string, "%.2f ", converted); sprintf(string, "%.2f ", converted);
@ -1547,7 +1556,7 @@ static int context_menu(LPARAM lParam)
static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam)
{ {
HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd; HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd, hRulerWnd;
HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);
HANDLE hDLL; HANDLE hDLL;
TBADDBITMAP ab; TBADDBITMAP ab;
@ -1651,6 +1660,16 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam)
SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb);
hRulerWnd = CreateWindowExW(0, WC_STATICW, NULL, WS_VISIBLE | WS_CHILD,
0, 0, 200, 10, hReBarWnd, (HMENU)IDC_RULER, hInstance, NULL);
rbb.hwndChild = hRulerWnd;
rbb.wID = BANDID_RULER;
rbb.fStyle |= RBBS_BREAK;
SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb);
hDLL = LoadLibraryW(wszRichEditDll); hDLL = LoadLibraryW(wszRichEditDll);
if(!hDLL) if(!hDLL)
{ {
@ -2133,6 +2152,11 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
update_window(); update_window();
break; break;
case ID_TOGGLE_RULER:
set_toolbar_state(BANDID_RULER, !is_bar_visible(BANDID_RULER));
update_window();
break;
case ID_DATETIME: case ID_DATETIME:
{ {
HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);
@ -2216,6 +2240,8 @@ static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam, LPARAM lParam )
CheckMenuItem(hMenu, ID_TOGGLE_STATUSBAR, MF_BYCOMMAND|IsWindowVisible(hwndStatus) ? CheckMenuItem(hMenu, ID_TOGGLE_STATUSBAR, MF_BYCOMMAND|IsWindowVisible(hwndStatus) ?
MF_CHECKED : MF_UNCHECKED); MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(hMenu, ID_TOGGLE_RULER, MF_BYCOMMAND|(is_bar_visible(BANDID_RULER)) ? MF_CHECKED : MF_UNCHECKED);
gt.flags = GTL_NUMCHARS; gt.flags = GTL_NUMCHARS;
gt.codepage = 1200; gt.codepage = 1200;
textLength = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); textLength = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0);
@ -2241,6 +2267,7 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam )
HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR);
HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR); HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR);
HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR);
HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER);
int rebarHeight = 0; int rebarHeight = 0;
int rebarRows = 2; int rebarRows = 2;
@ -2274,6 +2301,8 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam )
MoveWindow(hwndEditor, 0, rebarHeight, rc.right, rc.bottom-nStatusSize-rebarHeight, TRUE); MoveWindow(hwndEditor, 0, rebarHeight, rc.right, rc.bottom-nStatusSize-rebarHeight, TRUE);
} }
redraw_ruler(hRulerWnd);
return DefWindowProcW(hWnd, WM_SIZE, wParam, lParam); return DefWindowProcW(hWnd, WM_SIZE, wParam, lParam);
} }
@ -2364,6 +2393,9 @@ int CALLBACK wWinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPWSTR szCmdP
WNDCLASSW wc; WNDCLASSW wc;
MSG msg; MSG msg;
RECT rc; RECT rc;
UINT_PTR hPrevRulerProc;
HWND hRulerWnd;
POINTL EditPoint;
static const WCHAR wszAccelTable[] = {'M','A','I','N','A','C','C','E','L', static const WCHAR wszAccelTable[] = {'M','A','I','N','A','C','C','E','L',
'T','A','B','L','E','\0'}; 'T','A','B','L','E','\0'};
@ -2395,6 +2427,11 @@ int CALLBACK wWinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPWSTR szCmdP
get_default_printer_opts(); get_default_printer_opts();
target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);
hRulerWnd = GetDlgItem(GetDlgItem(hMainWnd, IDC_REBAR), IDC_RULER);
SendMessageW(GetDlgItem(hMainWnd, IDC_EDITOR), EM_POSFROMCHAR, (WPARAM)&EditPoint, 0);
hPrevRulerProc = SetWindowLongPtrW(hRulerWnd, GWLP_WNDPROC, (UINT_PTR)ruler_proc);
SendMessageW(hRulerWnd, WM_USER, (WPARAM)&EditPoint, hPrevRulerProc);
HandleCommandLine(GetCommandLineW()); HandleCommandLine(GetCommandLineW());
while(GetMessageW(&msg,0,0,0)) while(GetMessageW(&msg,0,0,0))

View file

@ -1,6 +1,6 @@
/* /*
* Copyright 2004 by Krzysztof Foltman * Copyright 2004 by Krzysztof Foltman
* Copyright 2007 by Alexander N. Sørnes <alex@thehandofagony.com> * Copyright 2007-2008 by Alexander N. Sørnes <alex@thehandofagony.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -19,6 +19,8 @@
#define MAX_STRING_LEN 255 #define MAX_STRING_LEN 255
#define TWIPS_PER_CM 567
#define ID_FILE_EXIT 1000 #define ID_FILE_EXIT 1000
#define ID_FILE_OPEN 1001 #define ID_FILE_OPEN 1001
#define ID_FILE_SAVE 1002 #define ID_FILE_SAVE 1002
@ -75,6 +77,7 @@
#define ID_TOGGLE_TOOLBAR 1500 #define ID_TOGGLE_TOOLBAR 1500
#define ID_TOGGLE_FORMATBAR 1501 #define ID_TOGGLE_FORMATBAR 1501
#define ID_TOGGLE_STATUSBAR 1502 #define ID_TOGGLE_STATUSBAR 1502
#define ID_TOGGLE_RULER 1503
#define PREVIEW_BUTTONS 4 #define PREVIEW_BUTTONS 4
@ -106,10 +109,11 @@
#define IDC_PAGEFMT_TB 100 #define IDC_PAGEFMT_TB 100
#define IDC_PAGEFMT_FB 101 #define IDC_PAGEFMT_FB 101
#define IDC_PAGEFMT_SB 102 #define IDC_PAGEFMT_RU 102
#define IDC_PAGEFMT_WW 103 #define IDC_PAGEFMT_SB 103
#define IDC_PAGEFMT_WM 104 #define IDC_PAGEFMT_WW 104
#define IDC_PAGEFMT_ID 105 #define IDC_PAGEFMT_WM 105
#define IDC_PAGEFMT_ID 106
#define ID_DATETIME 1600 #define ID_DATETIME 1600
#define ID_PARAFORMAT 1601 #define ID_PARAFORMAT 1601
@ -133,6 +137,7 @@
#define IDC_TABSTOPS 2012 #define IDC_TABSTOPS 2012
#define IDC_FONTLIST 2013 #define IDC_FONTLIST 2013
#define IDC_SIZELIST 2014 #define IDC_SIZELIST 2014
#define IDC_RULER 2015
#define IDD_DATETIME 2100 #define IDD_DATETIME 2100
#define IDD_NEWFILE 2101 #define IDD_NEWFILE 2101
@ -199,6 +204,8 @@ LRESULT print_preview(HWND);
void get_default_printer_opts(void); void get_default_printer_opts(void);
void registry_set_pagemargins(HKEY); void registry_set_pagemargins(HKEY);
void registry_read_pagemargins(HKEY); void registry_read_pagemargins(HKEY);
LRESULT CALLBACK ruler_proc(HWND, UINT, WPARAM, LPARAM);
void redraw_ruler(HWND);
int reg_formatindex(WPARAM); int reg_formatindex(WPARAM);
void registry_read_filelist(HWND); void registry_read_filelist(HWND);